# HG changeset patch
# User drewp@bigasterisk.com
# Date 1725670492 25200
# Node ID 1fca0cea3bfee3999bddb423c621092c1785ce57
# Parent  7041fae9549f90b29b159618242fdaab872ebc50
refactor upsertEvents

diff -r 7041fae9549f -r 1fca0cea3bfe calsync/sync_event.go
--- a/calsync/sync_event.go	Fri Sep 06 17:54:35 2024 -0700
+++ b/calsync/sync_event.go	Fri Sep 06 17:54:52 2024 -0700
@@ -119,12 +119,13 @@
 
 func (r *calEventsReader) updateInitialRange() error {
 	events, nextSyncToken, err := r.gc.ListEventsInRange(r.cal, r.t1, r.t2)
-	r.syncToken = nextSyncToken
 	if err != nil {
 		return err
 	}
-	for _, ev := range events {
-		r.mc.UpsertOneEvent(convert.MongoEventFromGoogleEvent(&ev, time.Now() /*todo*/))
+	r.syncToken = nextSyncToken
+	err = r.upsertEvents(events)
+	if err != nil {
+		return err
 	}
 
 	return r.mc.DeleteEventsUpdatedBefore(r.cal, r.t1)
@@ -136,9 +137,20 @@
 		return fmt.Errorf("ListEventUpdates: %v", err)
 	}
 	r.syncToken = nextSyncToken
-	for _, ev := range events {
-		r.mc.UpsertOneEvent(convert.MongoEventFromGoogleEvent(&ev, time.Now() /*todo*/))
+	err = r.upsertEvents(events)
+	if err != nil {
+		return fmt.Errorf("upsertEvents: %v", err)
 	}
 
 	return nil
 }
+
+func (r *calEventsReader) upsertEvents(events []gcalclient.CalendarEvent) error {
+	for _, ev := range events {
+		err := r.mc.UpsertOneEvent(convert.MongoEventFromGoogleEvent(&ev, time.Now() /*todo*/))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}