Fix calendar migration (#8531)

Signed-off-by: Denis Bykhov <[email protected]>

Author: BykhovDenis

common/scripts/version.txt

@@ -1 +1 @@
-"0.7.72"
+"0.7.75"

models/calendar/src/migration.ts

@@ -296,8 +296,8 @@ async function fillUser (client: MigrationClient): Promise<void> {
     const calendar = map.get(event.calendar)
     if (calendar !== undefined) {
       await client.update(
-        DOMAIN_CALENDAR,
-        { _id: calendar._id },
+        DOMAIN_EVENT,
+        { _id: event._id },
         { user: event.createdBy !== core.account.System ? event.createdBy : calendar.createdBy }
       )
     }
@@ -360,7 +360,7 @@ export const calendarOperation: MigrateOperation = {
         func: migrateSocialIdsToAccountUuids
       },
       {
-        state: 'fill-user',
+        state: 'fill-user-v2',
         mode: 'upgrade',
         func: fillUser
       }

models/process/src/migration.ts

@@ -76,7 +76,7 @@ async function migrateStateFuncs (client: MigrationUpgradeClient): Promise<void>
       }
     }
     const endAction = state.endAction
-    if (endAction != null) {
+    if (endAction?.params != null) {
       for (const key of Object.keys(endAction.params)) {
         const value = (endAction.params as any)[key]
         const context = getContext(value)

server-plugins/calendar-resources/src/index.ts

@@ -290,12 +290,13 @@ async function eventForNewParticipants (
     if (socialStrings.includes(event.createdBy ?? event.modifiedBy)) continue
 
     const primarySocialString = pickPrimarySocialId(socialIds)._id
+    const user = primarySocialString
     const calendar = getCalendar(calendars, socialStrings)
     if (calendar === undefined) continue
     const innerTx = control.txFactory.createTxCreateDoc(
       _class,
       space,
-      { ...data, calendar, access },
+      { ...data, calendar, access, user },
       undefined,
       undefined,
       primarySocialString
@@ -363,12 +364,13 @@ async function onEventCreate (ctx: TxCreateDoc<Event>, control: TriggerControl):
     const socialStrings = socialIds.map((si) => si._id)
     if (socialStrings.includes(event.createdBy ?? event.modifiedBy)) continue
     const primarySocialString = pickPrimarySocialId(socialIds)._id
+    const user = primarySocialString
     const calendar = getCalendar(calendars, socialStrings)
     if (calendar === undefined) continue
     const innerTx = control.txFactory.createTxCreateDoc(
       _class,
       space,
-      { ...data, calendar, access },
+      { ...data, calendar, access, user },
       undefined,
       undefined,
       primarySocialString