Extract trigger for pushes

models/notification/src/index.ts

@@ -239,6 +239,9 @@ export class TInboxNotification extends TDoc implements InboxNotification {
   @Prop(TypeBoolean(), core.string.Boolean)
     archived!: boolean
 
+  objectId!: Ref<Doc>
+  objectClass!: Ref<Class<Doc>>
+
   declare space: Ref<PersonSpace>
 
   title?: IntlString

models/notification/src/migration.ts

@@ -247,6 +247,43 @@ export async function migrateSettings (client: MigrationClient): Promise<void> {
   )
 }
 
+export async function migrateNotificationsObject (client: MigrationClient): Promise<void> {
+  while (true) {
+    const notifications = await client.find<InboxNotification>(
+      DOMAIN_NOTIFICATION,
+      { objectId: { $exists: false }, docNotifyContext: { $exists: true } },
+      { limit: 500 }
+    )
+
+    if (notifications.length === 0) return
+
+    const contextIds = Array.from(new Set(notifications.map((n) => n.docNotifyContext)))
+    const contexts = await client.find<DocNotifyContext>(DOMAIN_DOC_NOTIFY, { _id: { $in: contextIds } })
+
+    for (const context of contexts) {
+      await client.update(
+        DOMAIN_NOTIFICATION,
+        { docNotifyContext: context._id, objectId: { $exists: false } },
+        { objectId: context.objectId, objectClass: context.objectClass }
+      )
+    }
+
+    const toDelete: Ref<InboxNotification>[] = []
+
+    for (const notification of notifications) {
+      const context = contexts.find((c) => c._id === notification.docNotifyContext)
+
+      if (context === undefined) {
+        toDelete.push(notification._id)
+      }
+    }
+
+    if (toDelete.length > 0) {
+      await client.deleteMany(DOMAIN_NOTIFICATION, { _id: { $in: toDelete } })
+    }
+  }
+}
+
 export const notificationOperation: MigrateOperation = {
   async migrate (client: MigrationClient): Promise<void> {
     await tryMigrate(client, notificationId, [
@@ -429,6 +466,10 @@ export const notificationOperation: MigrateOperation = {
         func: async (client) => {
           await client.update(DOMAIN_DOC_NOTIFY, { space: core.space.Space }, { space: core.space.Workspace })
         }
+      },
+      {
+        state: 'migrate-notifications-object',
+        func: migrateNotificationsObject
       }
     ])
   },

models/server-notification/src/index.ts

@@ -103,4 +103,13 @@ export function createModel (builder: Builder): void {
       mixin: contact.mixin.Employee
     }
   })
+
+  builder.createDoc(serverCore.class.Trigger, core.space.Model, {
+    trigger: serverNotification.trigger.PushNotificationsHandler,
+    isAsync: true,
+    txMatch: {
+      _class: core.class.TxCreateDoc,
+      objectClass: notification.class.InboxNotification
+    }
+  })
 }

plugins/notification/src/index.ts

@@ -235,6 +235,8 @@ export interface InboxNotification extends Doc<PersonSpace> {
   isViewed: boolean
 
   docNotifyContext: Ref<DocNotifyContext>
+  objectId: Ref<Doc>
+  objectClass: Ref<Class<Doc>>
 
   // For browser notifications
   title?: IntlString

server-plugins/activity-resources/src/references.ts

@@ -151,6 +151,8 @@ export async function getPersonNotificationTxes (
     messageHtml: reference.message,
     mentionedIn: reference.attachedDocId ?? reference.srcDocId,
     mentionedInClass: reference.attachedDocClass ?? reference.srcDocClass,
+    objectId: reference.srcDocId,
+    objectClass: reference.srcDocClass,
     user: receiver[0]._id,
     isViewed: false,
     archived: false
@@ -238,24 +240,18 @@ export async function getPersonNotificationTxes (
         modifiedOn: originTx.modifiedOn,
         modifiedBy: sender._id
       }
-      const subscriptions = await control.findAll(control.ctx, notification.class.PushSubscription, {
-        user: receiverInfo._id
-      })
 
       const msg = control.hierarchy.isDerived(data.mentionedInClass, activity.class.ActivityMessage)
         ? (await control.findAll(control.ctx, data.mentionedInClass, { _id: data.mentionedIn }))[0]
         : undefined
       await applyNotificationProviders(
         notificationData,
         notifyResult,
-        reference.srcDocId,
-        reference.srcDocClass,
         control,
         res,
         doc,
         receiverInfo,
         senderInfo,
-        subscriptions,
         notification.class.MentionInboxNotification,
         msg as ActivityMessage
       )