add new emails in suspended workspace cleaning job (#9834)

From: Felix from Twenty <[email protected]> Subject: Action needed to prevent workspace deletion <img width="400" alt="Screenshot 2025-01-24 at 16 31 35" src="https://github.com/user-attachments/assets/8350a499-6815-4b00-a4fb-615b2a3b60e0" /> From: Felix from Twenty <[email protected]> Subject: Your workspace has been deleted <img width="456" alt="Screenshot 2025-01-24 at 16 33 15" src="https://github.com/user-attachments/assets/7e392e7c-519c-4b38-ae8c-ab3c9dd72c24" /> closes [284](twentyhq/core-team-issues#284) & [285](twentyhq/core-team-issues#285) - [parent issue](twentyhq/core-team-issues#179) --------- Co-authored-by: etiennejouan <[email protected]>
twentyhq · Jan 24, 2025 · aacbf11 · aacbf11
1 parent 07dec36
commit aacbf11
Show file tree

Hide file tree

Showing 13 changed files with 186 additions and 494 deletions.
diff --git a/packages/twenty-emails/src/emails/clean-inactive-workspaces.email.tsx b/packages/twenty-emails/src/emails/clean-inactive-workspaces.email.tsx
diff --git a/packages/twenty-emails/src/emails/clean-suspended-workspace.email.tsx b/packages/twenty-emails/src/emails/clean-suspended-workspace.email.tsx
@@ -0,0 +1,41 @@
+import { BaseEmail } from 'src/components/BaseEmail';
+import { CallToAction } from 'src/components/CallToAction';
+import { MainText } from 'src/components/MainText';
+import { Title } from 'src/components/Title';
+
+type CleanSuspendedWorkspaceEmailProps = {
+  inactiveDaysBeforeDelete: number;
+  userName: string;
+  workspaceDisplayName: string | undefined;
+};
+
+export const CleanSuspendedWorkspaceEmail = ({
+  inactiveDaysBeforeDelete,
+  userName,
+  workspaceDisplayName,
+}: CleanSuspendedWorkspaceEmailProps) => {
+  const helloString = userName?.length > 1 ? `Hello ${userName}` : 'Hello';
+
+  return (
+    <BaseEmail width={333}>
+      <Title value="Deleted Workspace 🥺" />
+      <MainText>
+        {helloString},
+        <br />
+        <br />
+        Your workspace <b>{workspaceDisplayName}</b> has been deleted as your
+        subscription expired {inactiveDaysBeforeDelete} days ago.
+        <br />
+        <br />
+        All data in this workspace has been permanently deleted.
+        <br />
+        <br />
+        If you wish to use Twenty again, you can create a new workspace.
+      </MainText>
+      <CallToAction
+        href="https://app.twenty.com/"
+        value="Create a new workspace"
+      />
+    </BaseEmail>
+  );
+};
diff --git a/packages/twenty-emails/src/emails/delete-inactive-workspaces.email.tsx b/packages/twenty-emails/src/emails/delete-inactive-workspaces.email.tsx
diff --git a/packages/twenty-emails/src/emails/warn-suspended-workspace.email.tsx b/packages/twenty-emails/src/emails/warn-suspended-workspace.email.tsx
@@ -0,0 +1,49 @@
+import { BaseEmail } from 'src/components/BaseEmail';
+import { CallToAction } from 'src/components/CallToAction';
+import { MainText } from 'src/components/MainText';
+import { Title } from 'src/components/Title';
+
+type WarnSuspendedWorkspaceEmailProps = {
+  daysSinceInactive: number;
+  inactiveDaysBeforeDelete: number;
+  userName: string;
+  workspaceDisplayName: string | undefined;
+};
+
+export const WarnSuspendedWorkspaceEmail = ({
+  daysSinceInactive,
+  inactiveDaysBeforeDelete,
+  userName,
+  workspaceDisplayName,
+}: WarnSuspendedWorkspaceEmailProps) => {
+  const daysLeft = inactiveDaysBeforeDelete - daysSinceInactive;
+  const dayOrDays = daysLeft > 1 ? 'days' : 'day';
+  const remainingDays = daysLeft > 0 ? `${daysLeft} ` : '';
+
+  const helloString = userName?.length > 1 ? `Hello ${userName}` : 'Hello';
+
+  return (
+    <BaseEmail width={333}>
+      <Title value="Suspended Workspace 😴" />
+      <MainText>
+        {helloString},
+        <br />
+        <br />
+        It appears that your workspace <b>{workspaceDisplayName}</b> has been
+        suspended for {daysSinceInactive} days.
+        <br />
+        <br />
+        The workspace will be deactivated in {remainingDays} {dayOrDays}, and
+        all its data will be deleted.
+        <br />
+        <br />
+        If you wish to continue using Twenty, please update your subscription
+        within the next {remainingDays} {dayOrDays}.
+      </MainText>
+      <CallToAction
+        href="https://app.twenty.com/settings/billing"
+        value="Update your subscription"
+      />
+    </BaseEmail>
+  );
+};
diff --git a/packages/twenty-emails/src/index.ts b/packages/twenty-emails/src/index.ts
@@ -1,6 +1,6 @@
-export * from './emails/clean-inactive-workspaces.email';
-export * from './emails/delete-inactive-workspaces.email';
+export * from './emails/clean-suspended-workspace.email';
 export * from './emails/password-reset-link.email';
 export * from './emails/password-update-notify.email';
 export * from './emails/send-email-verification-link.email';
 export * from './emails/send-invite-link.email';
+export * from './emails/warn-suspended-workspace.email';
diff --git a/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts b/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts
@@ -20,7 +20,6 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
-import { CleanInactiveWorkspaceJob } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.job';
 import { CleanSuspendedWorkspacesJob } from 'src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.job';
 import { CleanWorkspaceDeletionWarningUserVarsJob } from 'src/engine/workspace-manager/workspace-cleaner/jobs/clean-workspace-deletion-warning-user-vars.job';
 import { CalendarEventParticipantManagerModule } from 'src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module';
@@ -59,7 +58,6 @@ import { WorkflowModule } from 'src/modules/workflow/workflow.module';
     FavoriteModule,
   ],
   providers: [
-    CleanInactiveWorkspaceJob,
     CleanSuspendedWorkspacesJob,
     EmailSenderJob,
     DataSeedDemoWorkspaceJob,

diff --git a/.../engine/workspace-manager/workspace-cleaner/commands/clean-inactive-workspaces.command.ts b/.../engine/workspace-manager/workspace-cleaner/commands/clean-inactive-workspaces.command.ts
diff --git a/...kspace-manager/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command.ts b/...kspace-manager/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command.ts
diff --git a/...rkspace-manager/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command.ts b/...rkspace-manager/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command.ts
diff --git a/...engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern.ts b/...engine/workspace-manager/workspace-cleaner/crons/clean-inactive-workspace.cron.pattern.ts