houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix soft delete unique constraints to allow reusing unique values after deletion (#13615)

Browse Source 
Closes [#1297](https://github.com/twentyhq/core-team-issues/issues/1297)
This commit is contained in:
Abdul Rahman
2025-08-05 11:27:02 +05:30
committed by GitHub
parent ade7f8b6ae
commit b2452e83ad
5 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/metadata-modules/agent/agent.entity.ts
+4 -2
View File
@@ -8,7 +8,6 @@ import {
ManyToOne,
OneToMany,
PrimaryGeneratedColumn,
Unique,
UpdateDateColumn,
} from 'typeorm';
@@ -22,7 +21,10 @@ import { AgentHandoffEntity } from './agent-handoff.entity';
@Entity('agent')
@Index('IDX_AGENT_ID_DELETED_AT', ['id', 'deletedAt'])
@Unique('IDX_AGENT_NAME_WORKSPACE_ID_UNIQUE', ['name', 'workspaceId'])
@Index('IDX_AGENT_NAME_WORKSPACE_ID_UNIQUE', ['name', 'workspaceId'], {
unique: true,
where: '"deletedAt" IS NULL',
})
export class AgentEntity {
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/metadata-modules/view/view-field.entity.ts
+8 -5
View File
@@ -9,7 +9,6 @@ import {
ManyToOne,
PrimaryGeneratedColumn,
Relation,
Unique,
UpdateDateColumn,
} from 'typeorm';
@@ -20,10 +19,14 @@ import { View } from 'src/engine/metadata-modules/view/view.entity';
@Entity({ name: 'viewField', schema: 'core' })
@Index('IDX_VIEW_FIELD_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
@Unique('IDX_VIEW_FIELD_FIELD_METADATA_ID_VIEW_ID_UNIQUE', [
'fieldMetadataId',
'viewId',
])
@Index(
'IDX_VIEW_FIELD_FIELD_METADATA_ID_VIEW_ID_UNIQUE',
['fieldMetadataId', 'viewId'],
{
unique: true,
where: '"deletedAt" IS NULL',
},
)
export class ViewField {
@IDField(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
packages/twenty-server/src/engine/metadata-modules/view/view-sort.entity.ts
+8 -5
View File
@@ -11,7 +11,6 @@ import {
ManyToOne,
PrimaryGeneratedColumn,
Relation,
Unique,
UpdateDateColumn,
} from 'typeorm';
@@ -24,10 +23,14 @@ registerEnumType(ViewSortDirection, { name: 'ViewSortDirection' });
@Entity({ name: 'viewSort', schema: 'core' })
@Index('IDX_VIEW_SORT_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
@Unique('IDX_VIEW_SORT_FIELD_METADATA_ID_VIEW_ID_UNIQUE', [
'fieldMetadataId',
'viewId',
])
@Index(
'IDX_VIEW_SORT_FIELD_METADATA_ID_VIEW_ID_UNIQUE',
['fieldMetadataId', 'viewId'],
{
unique: true,
where: '"deletedAt" IS NULL',
},
)
export class ViewSort {
@IDField(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')