Add migration to restrict users without workspaces (twentyhq#5369)

- update set null ON DELETE constraint to RESTRICT - update missing updates
synapsenet-arena · May 13, 2024 · 8576127 · 8576127
1 parent 1ac8abb
commit 8576127
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/...er/src/database/typeorm/core/migrations/1715593226719-updateInconsistentUserConstraint.ts b/...er/src/database/typeorm/core/migrations/1715593226719-updateInconsistentUserConstraint.ts
@@ -0,0 +1,43 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateInconsistentUserConstraint1715593226719
+  implements MigrationInterface
+{
+  name = 'UpdateInconsistentUserConstraint1715593226719';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" DROP CONSTRAINT "FK_2ec910029395fa7655621c88908"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "status" TYPE text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "interval" TYPE text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "subscriptionStatus" TYPE text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ADD CONSTRAINT "FK_2ec910029395fa7655621c88908" FOREIGN KEY ("defaultWorkspaceId") REFERENCES "core"."workspace"("id") ON DELETE RESTRICT ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" DROP CONSTRAINT "FK_2ec910029395fa7655621c88908"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "subscriptionStatus" TYPE character varying`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "interval" TYPE character varying`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingSubscription" ALTER COLUMN "status" TYPE character varying`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" ADD CONSTRAINT "FK_2ec910029395fa7655621c88908" FOREIGN KEY ("defaultWorkspaceId") REFERENCES "core"."workspace"("id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/token.service.spec.ts
@@ -160,6 +160,9 @@ describe('TokenService', () => {
       };
       const mockUser = { id: '1', email: 'user@example.com' };
 
+      const mockedNewDate = new Date();
+
+      jest.spyOn(global, 'Date').mockImplementation(() => mockedNewDate);
       jest
         .spyOn(appTokenRepository, 'findOne')
         .mockResolvedValue(mockToken as AppToken);
@@ -173,7 +176,7 @@ describe('TokenService', () => {
         where: {
           value: hashedToken,
           type: AppTokenType.PasswordResetToken,
-          expiresAt: MoreThan(new Date()),
+          expiresAt: MoreThan(mockedNewDate),
           revokedAt: IsNull(),
         },
       });

diff --git a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
@@ -71,7 +71,7 @@ export class User {
 
   @Field(() => Workspace, { nullable: false })
   @ManyToOne(() => Workspace, (workspace) => workspace.users, {
-    onDelete: 'SET NULL',
+    onDelete: 'RESTRICT',
   })
   defaultWorkspace: Relation<Workspace>;