branchCreated sub

specklesystems · Oct 25, 2024 · cedc1be · cedc1be
1 parent 678c753
commit cedc1be
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/packages/server/modules/activitystream/services/branchActivity.ts b/packages/server/modules/activitystream/services/branchActivity.ts
@@ -38,8 +38,7 @@ export const addBranchCreatedActivityFactory =
         info: { branch },
         message: `Branch created: ${branch.name} (${branch.id})`
       }),
-      // @deprecated
-      pubsub.publish(BranchPubsubEvents.BranchCreated, {
+      publish(BranchPubsubEvents.BranchCreated, {
         branchCreated: { ...branch },
         streamId: branch.streamId
       }),

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

diff --git a/packages/server/modules/core/graph/resolvers/branchesNew.ts b/packages/server/modules/core/graph/resolvers/branchesNew.ts
@@ -1,4 +1,4 @@
-import { authorizeResolver } from '@/modules/shared'
+import { authorizeResolver, BranchPubsubEvents } from '@/modules/shared'
 import {
   createBranchAndNotifyFactory,
   updateBranchAndNotifyFactory,
@@ -30,7 +30,7 @@ import { legacyGetUserFactory } from '@/modules/core/repositories/users'
 import { Resolvers } from '@/modules/core/graph/generated/graphql'
 import { getPaginatedStreamBranchesFactory } from '@/modules/core/services/branch/retrieval'
 import { saveActivityFactory } from '@/modules/activitystream/repositories'
-import { publish } from '@/modules/shared/utils/subscriptions'
+import { filteredSubscribe, publish } from '@/modules/shared/utils/subscriptions'
 
 const markBranchStreamUpdated = markBranchStreamUpdatedFactory({ db })
 const getStream = getStreamFactory({ db })
@@ -137,5 +137,22 @@ export = {
       const deleted = await deleteBranchAndNotify(args.branch, context.userId!)
       return deleted
     }
+  },
+  Subscription: {
+    branchCreated: {
+      subscribe: filteredSubscribe(
+        BranchPubsubEvents.BranchCreated,
+        async (payload, variables, context) => {
+          await authorizeResolver(
+            context.userId,
+            payload.streamId,
+            Roles.Stream.Reviewer,
+            context.resourceAccessRules
+          )
+
+          return payload.streamId === variables.streamId
+        }
+      )
+    }
   }
 } as Resolvers
diff --git a/packages/server/modules/shared/utils/subscriptions.ts b/packages/server/modules/shared/utils/subscriptions.ts
@@ -39,7 +39,8 @@ import {
   StreamUpdateInput,
   ProjectUpdateInput,
   SubscriptionStreamUpdatedArgs,
-  SubscriptionStreamDeletedArgs
+  SubscriptionStreamDeletedArgs,
+  SubscriptionBranchCreatedArgs
 } from '@/modules/core/graph/generated/graphql'
 import { Merge } from 'type-fest'
 import {
@@ -54,6 +55,7 @@ import {
   ProjectAutomationsUpdatedMessageGraphQLReturn
 } from '@/modules/automate/helpers/graphTypes'
 import { CommentRecord } from '@/modules/comments/helpers/types'
+import { BranchRecord } from '@/modules/core/helpers/types'
 
 /**
  * GraphQL Subscription PubSub instance
@@ -301,6 +303,10 @@ type SubscriptionTypeMap = {
     payload: { streamDeleted: { streamId: string }; streamId: string }
     variables: SubscriptionStreamDeletedArgs
   }
+  [BranchSubscriptions.BranchCreated]: {
+    payload: { branchCreated: BranchRecord; streamId: string }
+    variables: SubscriptionBranchCreatedArgs
+  }
 } & { [k in SubscriptionEvent]: { payload: unknown; variables: unknown } }
 
 type SubscriptionEvent =
@@ -311,6 +317,7 @@ type SubscriptionEvent =
   | StreamSubscriptions
   | UserSubscriptions
   | ViewerSubscriptions
+  | BranchSubscriptions
 
 /**
  * Publish a GQL subscription event