add constraint

src/modules/content/dtos/category.dto.ts

@@ -12,10 +12,10 @@ import {
 } from 'class-validator';
 import { toNumber } from 'lodash';
 
-import { IsDataExist } from '@/modules/core/constraints/data.exist.constraint';
-import { IsTreeUnique } from '@/modules/core/constraints/tree.unique.constraint';
-import { IsTreeUniqueExist } from '@/modules/core/constraints/tree.unique.exist.constraint';
 import { DtoValidation } from '@/modules/core/decorator/dto.validation.decorator';
+import { IsDataExist } from '@/modules/database/constraints/data.exist.constraint';
+import { IsTreeUnique } from '@/modules/database/constraints/tree.unique.constraint';
+import { IsTreeUniqueExist } from '@/modules/database/constraints/tree.unique.exist.constraint';
 import { PaginateOptions } from '@/modules/database/types';
 
 import { CategoryEntity } from '../entities';

src/modules/content/dtos/comment.dto.ts

@@ -12,8 +12,8 @@ import {
 } from 'class-validator';
 import { toNumber } from 'lodash';
 
-import { IsDataExist } from '@/modules/core/constraints/data.exist.constraint';
 import { DtoValidation } from '@/modules/core/decorator/dto.validation.decorator';
+import { IsDataExist } from '@/modules/database/constraints/data.exist.constraint';
 import { PaginateOptions } from '@/modules/database/types';
 
 import { CommentEntity, PostEntity } from '../entities';

src/modules/content/dtos/post.dto.ts

@@ -17,9 +17,9 @@ import {
 import { isNil, toNumber } from 'lodash';
 
 import { PostOrder } from '@/modules/content/constants';
-import { IsDataExist } from '@/modules/core/constraints/data.exist.constraint';
 import { DtoValidation } from '@/modules/core/decorator/dto.validation.decorator';
 import { toBoolean } from '@/modules/core/helpers';
+import { IsDataExist } from '@/modules/database/constraints/data.exist.constraint';
 import { PaginateOptions } from '@/modules/database/types';
 
 import { CategoryEntity, TagEntity } from '../entities';

src/modules/content/dtos/tag.dto.ts

@@ -11,8 +11,8 @@ import {
 } from 'class-validator';
 import { toNumber } from 'lodash';
 
-import { IsUnique } from '@/modules/core/constraints/unique.constraint';
-import { IsUniqueExist } from '@/modules/core/constraints/unique.exist.constraint';
+import { IsUnique } from '@/modules/database/constraints/unique.constraint';
+import { IsUniqueExist } from '@/modules/database/constraints/unique.exist.constraint';
 import { DtoValidation } from '@/modules/core/decorator/dto.validation.decorator';
 import { PaginateOptions } from '@/modules/database/types';
 

src/modules/database/constraints/index.ts

@@ -0,0 +1,5 @@
+export * from './data.exist.constraint';
+export * from './tree.unique.constraint';
+export * from './tree.unique.exist.constraint';
+export * from './unique.constraint';
+export * from './unique.exist.constraint';

src/modules/database/constraints/tree.unique.constraint.ts

@@ -12,6 +12,8 @@ import { DataSource, ObjectType } from 'typeorm';
 type Condition = {
     entity: ObjectType<any>;
 
+    parentKey?: string;
+
     property?: string;
 };
 
@@ -23,6 +25,7 @@ export class TreeUniqueConstraint implements ValidatorConstraintInterface {
     async validate(value: any, args: ValidationArguments) {
         // 获取要验证的模型和字段
         const config: Omit<Condition, 'entity'> = {
+            parentKey: 'parent',
             property: args.property,
         };
         const condition = ('entity' in args.constraints[0]
@@ -34,12 +37,21 @@ export class TreeUniqueConstraint implements ValidatorConstraintInterface {
         if (!condition.entity) {
             return false;
         }
+        if (isNil(value)) {
+            return true;
+        }
+        const argsObj = args.object as any;
         try {
             // 查询是否存在数据,如果已经存在则验证失败
-            const repo = this.dataSource.getRepository(condition.entity);
-            return isNil(
-                await repo.findOne({ where: { [condition.property]: value }, withDeleted: true }),
-            );
+            const repo = this.dataSource.getTreeRepository(condition.entity);
+            const collections = await repo.find({
+                where: {
+                    parent: !argsObj[condition.parentKey]
+                        ? null
+                        : { id: argsObj[condition.parentKey] },
+                },
+            });
+            return collections.every((item) => item[condition.property] !== value);
         } catch (err) {
             // 如果数据库操作异常则验证失败
             return false;

src/modules/database/constraints/tree.unique.exist.constraint.ts

@@ -6,8 +6,8 @@ import {
     ValidatorConstraint,
     ValidatorConstraintInterface,
 } from 'class-validator';
-import { isNil, merge } from 'lodash';
-import { DataSource, Not, ObjectType } from 'typeorm';
+import { merge } from 'lodash';
+import { DataSource, ObjectType } from 'typeorm';
 
 type Condition = {
     entity: ObjectType<any>;
@@ -38,25 +38,35 @@ export class TreeUniqueExistContraint implements ValidatorConstraintInterface {
         if (!condition.entity) {
             return false;
         }
+        if (!condition.ignoreKey) {
+            condition.ignoreKey = condition.ignore;
+        }
+        const argsObj = args.object as any;
         // 在传入的dto数据中获取需要忽略的字段的值
-        const ignoreValue = (args.object as any)[
-            isNil(condition.ignoreKey) ? condition.ignore : condition.ignoreKey
-        ];
-        // 如果忽略字段不存在则验证失败
-        if (ignoreValue === undefined) {
+        const ignoreValue = argsObj[condition.ignore];
+        const findValue = argsObj[condition.ignoreKey];
+        if (!ignoreValue || !findValue) {
             return false;
         }
+
         // 通过entity获取repository
         const repo = this.dataSource.getRepository(condition.entity);
         // 查询忽略字段之外的数据是否对queryProperty的值唯一
-        return isNil(
-            await repo.findOne({
-                where: {
-                    [condition.property]: value,
-                    [condition.ignore]: Not(ignoreValue),
-                },
-                withDeleted: true,
-            }),
+        const item = await repo.findOne({
+            where: {
+                [condition.ignoreKey]: findValue,
+            },
+            relations: ['parent'],
+        });
+        if (!item) {
+            return false;
+        }
+        const rows = await repo.find({
+            where: { parent: item.parent ? { id: item.parent.id } : null },
+            withDeleted: true,
+        });
+        return !rows.find(
+            (row) => row[condition.property] === value && row[condition.ignore] !== ignoreValue,
         );
     }
 

src/modules/database/database.module.ts

@@ -5,11 +5,13 @@ import { DataSource, ObjectType } from 'typeorm';
 
 import { CUSTOM_REPOSITORY_METADATA } from '@/modules/database/constants';
 
-import { DataExistConstraint } from '../core/constraints/data.exist.constraint';
-import { TreeUniqueConstraint } from '../core/constraints/tree.unique.constraint';
-import { TreeUniqueExistContraint } from '../core/constraints/tree.unique.exist.constraint';
-import { UniqueConstraint } from '../core/constraints/unique.constraint';
-import { UniqueExistConstraint } from '../core/constraints/unique.exist.constraint';
+import {
+    DataExistConstraint,
+    TreeUniqueConstraint,
+    TreeUniqueExistContraint,
+    UniqueConstraint,
+    UniqueExistConstraint,
+} from './constraints';
 
 @Module({})
 export class DatabaseModule {