chore(activitystream): IoC 1 refactor addStreamInviteDeclined

packages/server/modules/activitystream/domain/operations.ts

@@ -7,7 +7,7 @@ import {
   StreamActivityRecord,
   StreamScopeActivity
 } from '@/modules/activitystream/helpers/types'
-import { StreamAclRecord } from '@/modules/core/helpers/types'
+import { StreamAclRecord, StreamRecord } from '@/modules/core/helpers/types'
 
 export type GetActivity = (
   streamId: string,
@@ -154,3 +154,10 @@ export type AddStreamCommentMentionActivity = (params: {
   commentId: string
   threadId: string
 }) => Promise<void>
+
+export type AddStreamInviteDeclinedActivity = (params: {
+  streamId: string
+  inviteTargetId: string
+  inviterId: string
+  stream: StreamRecord
+}) => Promise<void>

packages/server/modules/activitystream/services/streamActivity.ts

@@ -1,6 +1,7 @@
 import { ActionTypes, ResourceTypes } from '@/modules/activitystream/helpers/types'
 import { StreamRoles } from '@/modules/core/helpers/mainConstants'
 import {
+  PublishSubscription,
   pubsub,
   StreamSubscriptions as StreamPubsubEvents
 } from '@/modules/shared/utils/subscriptions'
@@ -382,32 +383,44 @@ export async function addStreamInviteSentOutActivity(params: {
 /**
  * Save "user declined an invite" activity item
  */
-export async function addStreamInviteDeclinedActivity(params: {
-  streamId: string
-  inviteTargetId: string
-  inviterId: string
-  stream: StreamRecord
-}) {
-  const { streamId, inviteTargetId, inviterId, stream } = params
-  await Promise.all([
-    saveActivityFactory({ db })({
-      streamId,
-      resourceType: ResourceTypes.Stream,
-      resourceId: streamId,
-      actionType: ActionTypes.Stream.InviteDeclined,
-      userId: inviteTargetId,
-      message: `User ${inviteTargetId} declined to join the stream ${streamId}`,
-      info: { targetId: inviteTargetId, inviterId }
-    }),
-    publish(ProjectSubscriptions.ProjectUpdated, {
-      projectUpdated: {
-        id: streamId,
-        type: ProjectUpdatedMessageType.Updated,
-        project: stream
-      }
-    })
-  ])
-}
+export const addStreamInviteDeclinedActivityFactory =
+  ({
+    saveActivity,
+    publish
+  }: {
+    saveActivity: SaveActivity
+    publish: PublishSubscription
+  }) =>
+  async ({
+    streamId,
+    inviteTargetId,
+    inviterId,
+    stream
+  }: {
+    streamId: string
+    inviteTargetId: string
+    inviterId: string
+    stream: StreamRecord
+  }) => {
+    await Promise.all([
+      saveActivity({
+        streamId,
+        resourceType: ResourceTypes.Stream,
+        resourceId: streamId,
+        actionType: ActionTypes.Stream.InviteDeclined,
+        userId: inviteTargetId,
+        message: `User ${inviteTargetId} declined to join the stream ${streamId}`,
+        info: { targetId: inviteTargetId, inviterId }
+      }),
+      publish(ProjectSubscriptions.ProjectUpdated, {
+        projectUpdated: {
+          id: streamId,
+          type: ProjectUpdatedMessageType.Updated,
+          project: stream
+        }
+      })
+    ])
+  }
 
 /**
  * Save "user mentioned in stream comment" activity item

packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts

@@ -58,7 +58,7 @@ import {
   processFinalizedProjectInviteFactory,
   validateProjectInviteBeforeFinalizationFactory
 } from '@/modules/serverinvites/services/coreFinalization'
-import { addStreamInviteDeclinedActivity } from '@/modules/activitystream/services/streamActivity'
+import { addStreamInviteDeclinedActivityFactory } from '@/modules/activitystream/services/streamActivity'
 import { addOrUpdateStreamCollaborator } from '@/modules/core/services/streams/streamAccessService'
 import {
   createUserEmailFactory,
@@ -71,6 +71,8 @@ import { requestNewEmailVerificationFactory } from '@/modules/emails/services/ve
 import { deleteOldAndInsertNewVerificationFactory } from '@/modules/emails/repositories'
 import { renderEmail } from '@/modules/emails/services/emailRendering'
 import { sendEmail } from '@/modules/emails/services/sending'
+import { publish } from '@/modules/shared/utils/subscriptions'
+import { saveActivityFactory } from '@/modules/activitystream/repositories'
 
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail: findEmailFactory({ db }),
@@ -287,7 +289,10 @@ export = {
           }),
           processInvite: processFinalizedProjectInviteFactory({
             getProject: getStream,
-            addInviteDeclinedActivity: addStreamInviteDeclinedActivity,
+            addInviteDeclinedActivity: addStreamInviteDeclinedActivityFactory({
+              saveActivity: saveActivityFactory({ db }),
+              publish
+            }),
             addProjectRole: addOrUpdateStreamCollaborator
           }),
           deleteInvitesByTarget: deleteInvitesByTargetFactory({ db }),
@@ -429,7 +434,10 @@ export = {
           }),
           processInvite: processFinalizedProjectInviteFactory({
             getProject: getStream,
-            addInviteDeclinedActivity: addStreamInviteDeclinedActivity,
+            addInviteDeclinedActivity: addStreamInviteDeclinedActivityFactory({
+              saveActivity: saveActivityFactory({ db }),
+              publish
+            }),
             addProjectRole: addOrUpdateStreamCollaborator
           }),
           deleteInvitesByTarget: deleteInvitesByTargetFactory({ db }),

packages/server/modules/serverinvites/services/coreFinalization.ts

@@ -1,4 +1,4 @@
-import { addStreamInviteDeclinedActivity } from '@/modules/activitystream/services/streamActivity'
+import { AddStreamInviteDeclinedActivity } from '@/modules/activitystream/domain/operations'
 import { StreamInvalidAccessError } from '@/modules/core/errors/stream'
 import { isResourceAllowed } from '@/modules/core/helpers/token'
 import { getStream } from '@/modules/core/repositories/streams'
@@ -75,7 +75,7 @@ export const validateProjectInviteBeforeFinalizationFactory =
 
 type ProcessFinalizedProjectInviteFactoryDeps = {
   getProject: typeof getStream
-  addInviteDeclinedActivity: typeof addStreamInviteDeclinedActivity
+  addInviteDeclinedActivity: AddStreamInviteDeclinedActivity
   addProjectRole: typeof addOrUpdateStreamCollaborator
 }