From 4ed1eb581a02efc2e7d3a3305601153a4daa6bba Mon Sep 17 00:00:00 2001 From: Subham Sharma <83713146+subhamengine@users.noreply.github.com> Date: Sat, 21 Sep 2024 10:07:55 +0530 Subject: [PATCH] Set a unique constraint on email table in users #7180 (#7184) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Link to issue - https://github.com/twentyhq/twenty/issues/7180 File changed - twenty/packages/twenty-server/src/engine/core-modules/user/user.entity.ts --------- Co-authored-by: subham sharma Co-authored-by: Félix Malfait --- .../1726849473832-addUniqueConstraintOnUsers.ts | 14 ++++++++++++++ .../src/engine/core-modules/user/user.entity.ts | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/twenty-server/src/database/typeorm/core/migrations/1726849473832-addUniqueConstraintOnUsers.ts diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/1726849473832-addUniqueConstraintOnUsers.ts b/packages/twenty-server/src/database/typeorm/core/migrations/1726849473832-addUniqueConstraintOnUsers.ts new file mode 100644 index 000000000..203a930a8 --- /dev/null +++ b/packages/twenty-server/src/database/typeorm/core/migrations/1726849473832-addUniqueConstraintOnUsers.ts @@ -0,0 +1,14 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddUniqueConstraintOnUsers1726849473832 implements MigrationInterface { + name = 'AddUniqueConstraintOnUsers1726849473832' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "core"."user" ADD CONSTRAINT "UQ_USER_EMAIL" UNIQUE ("email", "deletedAt")`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "core"."user" DROP CONSTRAINT "UQ_USER_EMAIL"`); + } + +} 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 index 56e99de42..01f809821 100644 --- a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts +++ b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts @@ -9,7 +9,8 @@ import { OneToMany, PrimaryGeneratedColumn, Relation, - UpdateDateColumn, + Unique, + UpdateDateColumn } from 'typeorm'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; @@ -27,6 +28,7 @@ registerEnumType(OnboardingStatus, { @Entity({ name: 'user', schema: 'core' }) @ObjectType('User') +@Unique('UQ_USER_EMAIL', ['email', 'deletedAt']) export class User { @IDField(() => UUIDScalarType) @PrimaryGeneratedColumn('uuid')