Delete groups when we scrub or delete a workspace

dust-tt · Jul 25, 2024 · 8bc8c8c · 8bc8c8c
1 parent 6d2ab76
commit 8bc8c8c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/front/lib/resources/group_resource.ts b/front/lib/resources/group_resource.ts
@@ -1,4 +1,4 @@
-import type { ModelId, Result } from "@dust-tt/types";
+import type { LightWorkspaceType, ModelId, Result } from "@dust-tt/types";
 import { Err, Ok } from "@dust-tt/types";
 import type {
   Attributes,
@@ -69,6 +69,18 @@ export class GroupResource extends BaseResource<GroupModel> {
     }
   }
 
+  static async deleteAllForWorkspace(
+    workspace: LightWorkspaceType,
+    transaction?: Transaction
+  ) {
+    return this.model.destroy({
+      where: {
+        workspaceId: workspace.id,
+      },
+      transaction,
+    });
+  }
+
   static async fetchById(
     auth: Authenticator,
     sId: string

diff --git a/front/poke/temporal/activities.ts b/front/poke/temporal/activities.ts
@@ -46,6 +46,7 @@ import { UserMetadata } from "@app/lib/models/user";
 import { MembershipInvitation, Workspace } from "@app/lib/models/workspace";
 import { ContentFragmentResource } from "@app/lib/resources/content_fragment_resource";
 import { FileResource } from "@app/lib/resources/file_resource";
+import { GroupResource } from "@app/lib/resources/group_resource";
 import { KeyResource } from "@app/lib/resources/key_resource";
 import { MembershipResource } from "@app/lib/resources/membership_resource";
 import { RunResource } from "@app/lib/resources/run_resource";
@@ -565,6 +566,7 @@ export async function deleteWorkspaceActivity({
       transaction: t,
     });
     await FileResource.deleteAllForWorkspace(workspace, t);
+    await GroupResource.deleteAllForWorkspace(workspace, t);
     logger.info(`[Workspace delete] Deleting Worskpace ${workspace.sId}`);
     await Workspace.destroy({
       where: {

diff --git a/front/temporal/scrub_workspace/activities.ts b/front/temporal/scrub_workspace/activities.ts
@@ -21,6 +21,7 @@ import {
   FREE_NO_PLAN_CODE,
   FREE_TEST_PLAN_CODE,
 } from "@app/lib/plans/plan_codes";
+import { GroupResource } from "@app/lib/resources/group_resource";
 import { MembershipResource } from "@app/lib/resources/membership_resource";
 import { UserResource } from "@app/lib/resources/user_resource";
 import { CustomerioServerSideTracking } from "@app/lib/tracking/customerio/server";
@@ -84,6 +85,7 @@ export async function scrubWorkspaceData({
   await deleteAllConversations(auth);
   await archiveAssistants(auth);
   await deleteDatasources(auth);
+  await deleteGroups(auth);
   await cleanupCustomerio(auth);
 }
 
@@ -154,6 +156,15 @@ async function deleteDatasources(auth: Authenticator) {
   }
 }
 
+async function deleteGroups(auth: Authenticator) {
+  const workspace = auth.workspace();
+  if (!workspace) {
+    throw new Error("No workspace found");
+  }
+  const w = renderLightWorkspaceType({ workspace });
+  await GroupResource.deleteAllForWorkspace(w);
+}
+
 async function cleanupCustomerio(auth: Authenticator) {
   const w = auth.workspace();