Fix proper target for derived transactions

Signed-off-by: Andrey Sobolev <[email protected]>
hcengineering · Jul 19, 2024 · 03829b9 · 03829b9
1 parent 24cbce0
commit 03829b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/server-plugins/notification-resources/src/index.ts b/server-plugins/notification-resources/src/index.ts
@@ -363,9 +363,11 @@ export async function pushInboxNotifications (
       lastUpdateTimestamp: shouldUpdateTimestamp ? modifiedOn : undefined
     })
     await control.apply([createContextTx])
-    control.operationContext.derived.targets['docNotifyContext' + createContextTx._id] = (it) => {
-      if (it._id === createContextTx._id) {
-        return [account.email]
+    if (target.account?.email !== undefined) {
+      control.operationContext.derived.targets['docNotifyContext' + createContextTx._id] = (it) => {
+        if (it._id === createContextTx._id) {
+          return [target.account?.email as string]
+        }
       }
     }
     docNotifyContextId = createContextTx.objectId
@@ -375,12 +377,15 @@ export async function pushInboxNotifications (
         lastUpdateTimestamp: modifiedOn
       })
       await control.apply([updateTx])
-      control.operationContext.derived.targets['docNotifyContext' + updateTx._id] = (it) => {
-        if (it._id === updateTx._id) {
-          return [account.email]
+      if (target.account?.email !== undefined) {
+        control.operationContext.derived.targets['docNotifyContext' + updateTx._id] = (it) => {
+          if (it._id === updateTx._id) {
+            return [target.account?.email as string]
+          }
         }
       }
     }
+
     docNotifyContextId = context._id
   }
 
@@ -817,7 +822,7 @@ export async function createCollabDocInfo (
       notifyContexts,
       docMessages
     )
-    const ids = new Set(res.map((it) => it._id))
+    const ids = new Set(targetRes.map((it) => it._id))
     if (info.account?.email !== undefined) {
       const id = generateId() as string
       control.operationContext.derived.targets[id] = (it) => {

diff --git a/tests/sanity/package.json b/tests/sanity/package.json
@@ -22,7 +22,7 @@
     "uitest": "cross-env LOCAL_URL=http://localhost:3003/ DEV_URL= playwright test -c ./tests/playwright.config.ts",
     "staging-uitest": "cross-env PLATFORM_URI=https://front.hc.engineering/ playwright test -c ./tests/playwright.config.ts --grep @staging",
     "dev-uitest": "cross-env PLATFORM_URI=http://localhost:8080 PLATFORM_TRANSACTOR=ws://localhost:3333 SETTING=storage-dev.json SETTING_SECOND=storageSecond-dev.json DEV_URL=http://localhost:8080/account playwright test -c ./tests/playwright.config.ts",
-    "debug": "playwright test -c ./tests/playwright.config.ts --debug --headed",
+    "debug": "cross-env LOCAL_URL=http://localhost:3003/ DEV_URL= playwright test -c ./tests/playwright.config.ts --debug --headed",
     "dev-debug": "cross-env PLATFORM_URI=http://localhost:8080 PLATFORM_TRANSACTOR=ws://localhost:3333 SETTING=storage-dev.json SETTING_SECOND=storageSecond-dev.json playwright test -c ./tests/playwright.config.ts --debug --headed",
     "codegen": "playwright codegen --load-storage storage.json http://localhost:8083/workbench/sanity-ws/",
     "dev-codegen": "cross-env playwright codegen --load-storage storage-dev.json http://localhost:8080/workbench/sanity-ws/",