twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2025-01-02 09:14:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove Metadata SoftDelete and page limit size (#2237)

Browse Source 
* Remove Metadata SoftDelete and page limit size

* add cascade deletion

* add missing queryRunner release
This commit is contained in:
Weiko 2023-10-26 17:32:27 +02:00 committed by GitHub
parent b30233d582
commit c04e866de3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 108 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/metadata/data-source/data-source.service.ts
View File

@ -42,6 +42,8 @@ export class DataSourceService implements OnModuleInit, OnModuleDestroy {
await queryRunner.createSchema(schemaName, true);
await queryRunner.release();
return schemaName;
}

15
server/src/metadata/field-metadata/field-metadata.entity.ts
View File

@ -3,7 +3,6 @@ import { Field, ID, ObjectType } from '@nestjs/graphql';
import {
Column,
CreateDateColumn,
DeleteDateColumn,
Entity,
JoinColumn,
ManyToOne,
@ -35,11 +34,14 @@ export type FieldMetadataTargetColumnMap = {
})
@QueryOptions({
defaultResultSize: 10,
maxResultsSize: 100,
disableFilter: true,
disableSort: true,
})
@Unique('IndexOnNameAndWorkspaceIdUnique', ['name', 'objectId', 'workspaceId'])
@Unique('IndexOnNameObjectIdAndWorkspaceIdUnique', [
'name',
'objectId',
'workspaceId',
])
export class FieldMetadata {
@IDField(() => ID)
@PrimaryGeneratedColumn('uuid')
@ -92,7 +94,9 @@ export class FieldMetadata {
@Column({ nullable: false, name: 'workspace_id' })
workspaceId: string;
@ManyToOne(() => ObjectMetadata, (object) => object.fields)
@ManyToOne(() => ObjectMetadata, (object) => object.fields, {
onDelete: 'CASCADE',
})
@JoinColumn({ name: 'object_id' })
object: ObjectMetadata;
@ -103,7 +107,4 @@ export class FieldMetadata {
@Field()
@UpdateDateColumn({ name: 'updated_at' })
updatedAt: Date;
@DeleteDateColumn({ name: 'deleted_at' })
deletedAt?: Date;
}

27
server/src/metadata/field-metadata/services/field-metadata.service.ts
View File

@ -1,4 +1,5 @@
import {
BadRequestException,
ConflictException,
Injectable,
NotFoundException,
@ -7,6 +8,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
import { DeleteOneOptions } from '@ptc-org/nestjs-query-core';
import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
import {
@ -28,7 +30,30 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadata> {
private readonly tenantMigrationService: TenantMigrationService,
private readonly migrationRunnerService: MigrationRunnerService,
) {
super(fieldMetadataRepository, { useSoftDelete: true });
super(fieldMetadataRepository);
}
override async deleteOne(
id: string,
opts?: DeleteOneOptions<FieldMetadata> | undefined,
): Promise<FieldMetadata> {
const fieldMetadata = await this.fieldMetadataRepository.findOne({
where: { id },
});
if (!fieldMetadata) {
throw new NotFoundException('Field does not exist');
}
if (!fieldMetadata.isCustom) {
throw new BadRequestException("Standard fields can't be deleted");
}
if (fieldMetadata.isActive) {
throw new BadRequestException("Active fields can't be deleted");
}
return super.deleteOne(id, opts);
}
override async createOne(record: FieldMetadata): Promise<FieldMetadata> {

2
server/src/metadata/metadata.datasource.ts
View File

@ -13,6 +13,7 @@ import { AddSoftDelete1697474804403 } from './migrations/1697474804403-addSoftDe
import { RemoveSingularPluralFromFieldLabelAndName1697534910933 } from './migrations/1697534910933-removeSingularPluralFromFieldLabelAndName';
import { AddNameAndIsCustomToTenantMigration1697622715467 } from './migrations/1697622715467-addNameAndIsCustomToTenantMigration';
import { AddUniqueConstraintsOnFieldObjectMetadata1697630766924 } from './migrations/1697630766924-addUniqueConstraintsOnFieldObjectMetadata';
import { RemoveMetadataSoftDelete1698328717102 } from './migrations/1698328717102-removeMetadataSoftDelete';
config();
@ -37,6 +38,7 @@ export const typeORMMetadataModuleOptions: TypeOrmModuleOptions = {
RemoveSingularPluralFromFieldLabelAndName1697534910933,
AddNameAndIsCustomToTenantMigration1697622715467,
AddUniqueConstraintsOnFieldObjectMetadata1697630766924,
RemoveMetadataSoftDelete1698328717102,
],
};

37
server/src/metadata/migrations/1698328717102-removeMetadataSoftDelete.ts Normal file
View File

@ -0,0 +1,37 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
export class RemoveMetadataSoftDelete1698328717102
implements MigrationInterface
{
name = 'RemoveMetadataSoftDelete1698328717102';
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "metadata"."field_metadata" DROP CONSTRAINT "FK_38179b299795e48887fc99f937a"`,
);
await queryRunner.query(
`ALTER TABLE "metadata"."object_metadata" DROP COLUMN "deleted_at"`,
);
await queryRunner.query(
`ALTER TABLE "metadata"."field_metadata" DROP COLUMN "deleted_at"`,
);
await queryRunner.query(
`ALTER TABLE "metadata"."field_metadata" ADD CONSTRAINT "FK_38179b299795e48887fc99f937a" FOREIGN KEY ("object_id") REFERENCES "metadata"."object_metadata"("id") ON DELETE CASCADE ON UPDATE NO ACTION`,
);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "metadata"."field_metadata" DROP CONSTRAINT "FK_38179b299795e48887fc99f937a"`,
);
await queryRunner.query(
`ALTER TABLE "metadata"."field_metadata" ADD "deleted_at" TIMESTAMP`,
);
await queryRunner.query(
`ALTER TABLE "metadata"."object_metadata" ADD "deleted_at" TIMESTAMP`,
);
await queryRunner.query(
`ALTER TABLE "metadata"."field_metadata" ADD CONSTRAINT "FK_38179b299795e48887fc99f937a" FOREIGN KEY ("object_id") REFERENCES "metadata"."object_metadata"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
}
}

9
server/src/metadata/object-metadata/object-metadata.entity.ts
View File

@ -3,7 +3,6 @@ import { ObjectType, ID, Field } from '@nestjs/graphql';
import {
Column,
CreateDateColumn,
DeleteDateColumn,
Entity,
OneToMany,
PrimaryGeneratedColumn,
@ -32,7 +31,6 @@ import { BeforeCreateOneObject } from './hooks/before-create-one-object.hook';
})
@QueryOptions({
defaultResultSize: 10,
maxResultsSize: 100,
disableFilter: true,
disableSort: true,
})
@ -89,7 +87,9 @@ export class ObjectMetadata {
@Column({ nullable: false, name: 'workspace_id' })
workspaceId: string;
@OneToMany(() => FieldMetadata, (field) => field.object)
@OneToMany(() => FieldMetadata, (field) => field.object, {
cascade: true,
})
fields: FieldMetadata[];
@Field()
@ -99,7 +99,4 @@ export class ObjectMetadata {
@Field()
@UpdateDateColumn({ name: 'updated_at' })
updatedAt: Date;
@DeleteDateColumn({ name: 'deleted_at' })
deletedAt?: Date;
}

32
server/src/metadata/object-metadata/services/object-metadata.service.ts
View File

@ -1,8 +1,13 @@
import { Injectable } from '@nestjs/common';
import {
BadRequestException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
import { DeleteOneOptions } from '@ptc-org/nestjs-query-core';
import { TenantMigrationService } from 'src/metadata/tenant-migration/tenant-migration.service';
import { TenantMigrationTableAction } from 'src/metadata/tenant-migration/tenant-migration.entity';
@ -18,7 +23,30 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadata> {
private readonly tenantMigrationService: TenantMigrationService,
private readonly migrationRunnerService: MigrationRunnerService,
) {
super(objectMetadataRepository, { useSoftDelete: true });
super(objectMetadataRepository);
}
override async deleteOne(
id: string,
opts?: DeleteOneOptions<ObjectMetadata> | undefined,
): Promise<ObjectMetadata> {
const objectMetadata = await this.objectMetadataRepository.findOne({
where: { id },
});
if (!objectMetadata) {
throw new NotFoundException('Object does not exist');
}
if (!objectMetadata.isCustom) {
throw new BadRequestException("Standard Objects can't be deleted");
}
if (objectMetadata.isActive) {
throw new BadRequestException("Active objects can't be deleted");
}
return super.deleteOne(id, opts);
}
override async createOne(record: ObjectMetadata): Promise<ObjectMetadata> {