branchUpdated sub

specklesystems · Oct 25, 2024 · 64d2888 · 64d2888
1 parent cedc1be
commit 64d2888
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/packages/server/modules/activitystream/services/branchActivity.ts b/packages/server/modules/activitystream/services/branchActivity.ts
@@ -75,8 +75,7 @@ export const addBranchUpdatedActivityFactory =
         info: { old: oldBranch, new: update },
         message: `Branch metadata changed for branch ${update.id}`
       }),
-      // @deprecated
-      pubsub.publish(BranchPubsubEvents.BranchUpdated, {
+      publish(BranchPubsubEvents.BranchUpdated, {
         branchUpdated: { ...update },
         streamId,
         branchId: update.id

diff --git a/packages/server/modules/core/graph/resolvers/branches.js b/packages/server/modules/core/graph/resolvers/branches.js
@@ -11,33 +11,11 @@ const { Roles } = require('@speckle/shared')
  */
 
 // subscription events
-const BRANCH_UPDATED = BranchPubsubEvents.BranchUpdated
 const BRANCH_DELETED = BranchPubsubEvents.BranchDeleted
 
 /** @type {import('@/modules/core/graph/generated/graphql').Resolvers} */
 module.exports = {
   Subscription: {
-    branchUpdated: {
-      subscribe: withFilter(
-        () => pubsub.asyncIterator([BRANCH_UPDATED]),
-        async (payload, variables, context) => {
-          await authorizeResolver(
-            context.userId,
-            payload.streamId,
-            Roles.Stream.Reviewer,
-            context.resourceAccessRules
-          )
-
-          const streamMatch = payload.streamId === variables.streamId
-          if (streamMatch && variables.branchId) {
-            return payload.branchId === variables.branchId
-          }
-
-          return streamMatch
-        }
-      )
-    },
-
     branchDeleted: {
       subscribe: withFilter(
         () => pubsub.asyncIterator([BRANCH_DELETED]),

diff --git a/packages/server/modules/core/graph/resolvers/branchesNew.ts b/packages/server/modules/core/graph/resolvers/branchesNew.ts
@@ -153,6 +153,26 @@ export = {
           return payload.streamId === variables.streamId
         }
       )
+    },
+    branchUpdated: {
+      subscribe: filteredSubscribe(
+        BranchPubsubEvents.BranchUpdated,
+        async (payload, variables, context) => {
+          await authorizeResolver(
+            context.userId,
+            payload.streamId,
+            Roles.Stream.Reviewer,
+            context.resourceAccessRules
+          )
+
+          const streamMatch = payload.streamId === variables.streamId
+          if (streamMatch && variables.branchId) {
+            return payload.branchId === variables.branchId
+          }
+
+          return streamMatch
+        }
+      )
     }
   }
 } as Resolvers
diff --git a/packages/server/modules/shared/utils/subscriptions.ts b/packages/server/modules/shared/utils/subscriptions.ts
@@ -40,7 +40,10 @@ import {
   ProjectUpdateInput,
   SubscriptionStreamUpdatedArgs,
   SubscriptionStreamDeletedArgs,
-  SubscriptionBranchCreatedArgs
+  SubscriptionBranchCreatedArgs,
+  SubscriptionBranchUpdatedArgs,
+  BranchUpdateInput,
+  UpdateModelInput
 } from '@/modules/core/graph/generated/graphql'
 import { Merge } from 'type-fest'
 import {
@@ -307,6 +310,14 @@ type SubscriptionTypeMap = {
     payload: { branchCreated: BranchRecord; streamId: string }
     variables: SubscriptionBranchCreatedArgs
   }
+  [BranchSubscriptions.BranchUpdated]: {
+    payload: {
+      branchUpdated: BranchUpdateInput | UpdateModelInput
+      streamId: string
+      branchId: string
+    }
+    variables: SubscriptionBranchUpdatedArgs
+  }
 } & { [k in SubscriptionEvent]: { payload: unknown; variables: unknown } }
 
 type SubscriptionEvent =