chore: move member leave as a event

toeverything · Jan 8, 2025 · 1fbb7cb · 1fbb7cb
1 parent c352bff
commit 1fbb7cb
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 36 deletions.
diff --git a/packages/backend/server/src/base/event/def.ts b/packages/backend/server/src/base/event/def.ts
@@ -17,6 +17,11 @@ export interface WorkspaceEvents {
     }>;
     ownerTransferred: Payload<{ email: string; workspaceId: Workspace['id'] }>;
     updated: Payload<{ workspaceId: Workspace['id']; count: number }>;
+    leave: Payload<{
+      ownerEmail: string;
+      inviteeName: string;
+      workspaceId: Workspace['id'];
+    }>;
     removed: Payload<{ workspaceId: Workspace['id']; userId: User['id'] }>;
   };
   deleted: Payload<Workspace['id']>;

diff --git a/packages/backend/server/src/core/workspaces/resolvers/service.ts b/packages/backend/server/src/core/workspaces/resolvers/service.ts
@@ -137,6 +137,26 @@ export class WorkspaceService {
     return true;
   }
 
+  async sendInviteEmail(inviteId: string) {
+    const target = await this.getInviteeEmailTarget(inviteId);
+
+    if (!target) {
+      return;
+    }
+
+    const owner = await this.permission.getWorkspaceOwner(target.workspace.id);
+
+    await this.mailer.sendMemberInviteMail(target.email, inviteId, {
+      workspace: target.workspace,
+      user: {
+        avatar: owner.avatarUrl || '',
+        name: owner.name || '',
+      },
+    });
+  }
+
+  // ================ Team ================
+
   async sendTeamWorkspaceUpgradedEmail(workspaceId: string) {
     const workspace = await this.getWorkspaceInfo(workspaceId);
     const owner = await this.permission.getWorkspaceOwner(workspaceId);
@@ -182,24 +202,6 @@ export class WorkspaceService {
     }
   }
 
-  async sendInviteEmail(inviteId: string) {
-    const target = await this.getInviteeEmailTarget(inviteId);
-
-    if (!target) {
-      return;
-    }
-
-    const owner = await this.permission.getWorkspaceOwner(target.workspace.id);
-
-    await this.mailer.sendMemberInviteMail(target.email, inviteId, {
-      workspace: target.workspace,
-      user: {
-        avatar: owner.avatarUrl || '',
-        name: owner.name || '',
-      },
-    });
-  }
-
   async sendReviewApproveEmail(inviteId: string) {
     const target = await this.getInviteeEmailTarget(inviteId);
     if (!target) return;
@@ -236,9 +238,17 @@ export class WorkspaceService {
     await this.mailer.sendOwnershipTransferredEmail(email, workspace);
   }
 
-  async sendMemberRemoved(email: string, ws: { id: string }) {
-    const workspace = await this.getWorkspaceInfo(ws.id);
-    await this.mailer.sendMemberRemovedEmail(email, workspace);
+  @OnEvent('workspace.members.leave')
+  async onMemberLeave({
+    ownerEmail,
+    inviteeName,
+    workspaceId,
+  }: EventPayload<'workspace.members.leave'>) {
+    const workspace = await this.getWorkspaceInfo(workspaceId);
+    await this.mailer.sendMemberLeaveEmail(ownerEmail, {
+      workspace,
+      inviteeName,
+    });
   }
 
   @OnEvent('workspace.members.removed')
@@ -248,7 +258,9 @@ export class WorkspaceService {
   }: EventPayload<'workspace.members.requestDeclined'>) {
     const user = await this.user.findUserById(userId);
     if (!user) return;
-    await this.sendMemberRemoved(user.email, { id: workspaceId });
+
+    const workspace = await this.getWorkspaceInfo(workspaceId);
+    await this.mailer.sendMemberRemovedEmail(user.email, workspace);
   }
 
   @OnEvent('workspace.subscription.notify')

diff --git a/packages/backend/server/src/core/workspaces/resolvers/team.ts b/packages/backend/server/src/core/workspaces/resolvers/team.ts
@@ -347,6 +347,14 @@ export class TeamWorkspaceResolver {
     await this.workspaceService.sendReviewRequestedEmail(inviteId);
   }
 
+  @OnEvent('workspace.members.requestApproved')
+  async onApproveRequest({
+    inviteId,
+  }: EventPayload<'workspace.members.requestApproved'>) {
+    // send approve mail
+    await this.workspaceService.sendReviewApproveEmail(inviteId);
+  }
+
   @OnEvent('workspace.members.requestDeclined')
   async onDeclineRequest({
     userId,
@@ -361,14 +369,6 @@ export class TeamWorkspaceResolver {
     );
   }
 
-  @OnEvent('workspace.members.requestApproved')
-  async onApproveRequest({
-    inviteId,
-  }: EventPayload<'workspace.members.requestApproved'>) {
-    // send approve mail
-    await this.workspaceService.sendReviewApproveEmail(inviteId);
-  }
-
   @OnEvent('workspace.members.roleChanged')
   async onRoleChanged({
     userId,

diff --git a/packages/backend/server/src/core/workspaces/resolvers/workspace.ts b/packages/backend/server/src/core/workspaces/resolvers/workspace.ts
@@ -20,7 +20,6 @@ import {
   DocNotFound,
   EventEmitter,
   InternalServerError,
-  MailService,
   MemberQuotaExceeded,
   RequestMutex,
   SpaceAccessDenied,
@@ -78,7 +77,6 @@ export class WorkspaceResolver {
 
   constructor(
     private readonly cache: Cache,
-    private readonly mailer: MailService,
     private readonly prisma: PrismaClient,
     private readonly permissions: PermissionService,
     private readonly quota: QuotaManagementService,
@@ -610,14 +608,14 @@ export class WorkspaceResolver {
     _workspaceName?: string
   ) {
     await this.permissions.checkWorkspace(workspaceId, user.id);
-    const { name: workspaceName } =
-      await this.workspaceService.getWorkspaceInfo(workspaceId);
+
     const owner = await this.permissions.getWorkspaceOwner(workspaceId);
 
     if (sendLeaveMail) {
-      await this.mailer.sendMemberLeaveEmail(owner.email, {
-        workspaceName,
+      this.event.emit('workspace.members.leave', {
+        ownerEmail: owner.email,
         inviteeName: user.name,
+        workspaceId,
       });
     }