Skip to content

fix: prevent duplicate sidebar items when rescheduling events #3401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beqa-bumbeishvili wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent duplicate sidebar items when rescheduling events #3401

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions apps/desktop/src/services/apple-calendar/process/events/sync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ import type { ExistingEvent, IncomingEvent } from "../../fetch/types";
import { getSessionForEvent, isSessionEmpty } from "../utils";
import type { EventsSyncInput, EventsSyncOutput } from "./types";

function getEventKey(trackingId: string, startedAt?: string): string {
return startedAt ? `${trackingId}::${startedAt}` : trackingId;
function getEventKey(
trackingId: string,
startedAt?: string,
isRecurring?: boolean,
): string {
return isRecurring && startedAt ? `${trackingId}::${startedAt}` : trackingId;
}

export function syncEvents(
Expand All @@ -18,7 +22,10 @@ export function syncEvents(
};

const incomingEventMap = new Map(
incoming.map((e) => [getEventKey(e.tracking_id_event, e.started_at), e]),
incoming.map((e) => [
getEventKey(e.tracking_id_event, e.started_at, !!e.recurrence_series_id),
e,
]),
);
const handledEventKeys = new Set<string>();

Expand All @@ -36,7 +43,11 @@ export function syncEvents(

const trackingId = storeEvent.tracking_id_event;
const eventKey = trackingId
? getEventKey(trackingId, storeEvent.started_at ?? undefined)
? getEventKey(
trackingId,
storeEvent.started_at ?? undefined,
!!storeEvent.recurrence_series_id,
)
: undefined;
const matchingIncomingEvent = eventKey
? incomingEventMap.get(eventKey)
Expand Down Expand Up @@ -65,6 +76,7 @@ export function syncEvents(
? getEventKey(
rescheduledEvent.tracking_id_event,
rescheduledEvent.started_at,
!!rescheduledEvent.recurrence_series_id,
)
: undefined;

Expand Down Expand Up @@ -93,6 +105,7 @@ export function syncEvents(
const incomingEventKey = getEventKey(
incomingEvent.tracking_id_event,
incomingEvent.started_at,
!!incomingEvent.recurrence_series_id,
);
if (!handledEventKeys.has(incomingEventKey)) {
out.toAdd.push(incomingEvent);
Expand Down