rez_core 1.0.79 → 1.0.80
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module/meta/service/entity-service-impl.service.d.ts +3 -1
- package/dist/module/meta/service/entity-service-impl.service.js +12 -0
- package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
- package/dist/module/meta/service/entity-validation.service.d.ts +5 -3
- package/dist/module/meta/service/entity-validation.service.js +21 -16
- package/dist/module/meta/service/entity-validation.service.js.map +1 -1
- package/dist/module/meta/service/media-data.service.d.ts +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/service/entity-service-impl.service.ts +15 -1
- package/src/module/meta/service/entity-validation.service.ts +23 -18
|
@@ -9,6 +9,7 @@ import { EntityListService } from './entity-list.service';
|
|
|
9
9
|
import { EntityManager } from 'typeorm';
|
|
10
10
|
import { EntityTableService } from './entity-table.service';
|
|
11
11
|
import { EntityTableColumnService } from './entity-table-column.service';
|
|
12
|
+
import { EntityValidationService } from './entity-validation.service';
|
|
12
13
|
export declare class EntityServiceImpl implements EntityService<BaseEntity> {
|
|
13
14
|
protected readonly entityMasterService: EntityMasterService;
|
|
14
15
|
protected readonly entityTableColumnService: EntityTableColumnService;
|
|
@@ -16,7 +17,8 @@ export declare class EntityServiceImpl implements EntityService<BaseEntity> {
|
|
|
16
17
|
protected readonly reflectionHelper: ReflectionHelper;
|
|
17
18
|
protected readonly entityListService: EntityListService;
|
|
18
19
|
protected readonly loggingService: LoggingService;
|
|
19
|
-
|
|
20
|
+
protected readonly entityValidationService: EntityValidationService;
|
|
21
|
+
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager): Promise<any>;
|
|
20
22
|
deleteEntity(entityType: string, entityId: number, loggedInUserData: UserData): void;
|
|
21
23
|
findByCode(entityType: string, code: string): Promise<BaseEntity>;
|
|
22
24
|
getEntityData(entityType: string, id: number): Promise<BaseEntity | null>;
|
|
@@ -22,12 +22,20 @@ const excel_helper_service_1 = require("../../../utils/service/excel-helper.serv
|
|
|
22
22
|
const entity_table_service_1 = require("./entity-table.service");
|
|
23
23
|
const entity_table_column_service_1 = require("./entity-table-column.service");
|
|
24
24
|
const global_constant_1 = require("../../../constant/global.constant");
|
|
25
|
+
const entity_validation_service_1 = require("./entity-validation.service");
|
|
25
26
|
let EntityServiceImpl = class EntityServiceImpl {
|
|
26
27
|
async createEntity(entityData, loggedInUser, manager) {
|
|
27
28
|
if (!entityData.entity_type) {
|
|
28
29
|
throw new common_1.BadRequestException(`EntityType is missing`);
|
|
29
30
|
}
|
|
30
31
|
const entityMaster = await this.entityMasterService.getEntityData(entityData.entity_type);
|
|
32
|
+
const validationErrors = await this.entityValidationService.validateEntityData(entityData, entityMaster);
|
|
33
|
+
if (validationErrors.length > 0) {
|
|
34
|
+
return {
|
|
35
|
+
success: false,
|
|
36
|
+
errors: validationErrors,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
31
39
|
const repo = manager
|
|
32
40
|
? manager.getRepository(entityMaster.entity_data_class)
|
|
33
41
|
: this.reflectionHelper.getRepoService(entityMaster.entity_data_class);
|
|
@@ -176,6 +184,10 @@ __decorate([
|
|
|
176
184
|
(0, common_1.Inject)(),
|
|
177
185
|
__metadata("design:type", loggingUtil_service_1.LoggingService)
|
|
178
186
|
], EntityServiceImpl.prototype, "loggingService", void 0);
|
|
187
|
+
__decorate([
|
|
188
|
+
(0, common_1.Inject)(),
|
|
189
|
+
__metadata("design:type", entity_validation_service_1.EntityValidationService)
|
|
190
|
+
], EntityServiceImpl.prototype, "entityValidationService", void 0);
|
|
179
191
|
exports.EntityServiceImpl = EntityServiceImpl = __decorate([
|
|
180
192
|
(0, common_1.Injectable)()
|
|
181
193
|
], EntityServiceImpl);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-service-impl.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-service-impl.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAyE;AAEzE,mEAA8D;AAC9D,gGAAoF;AAEpF,oFAA4E;AAE5E,+DAA0D;AAE1D,sEAA8D;AAC9D,yBAAyB;AACzB,6BAA6B;AAC7B,sFAA0E;AAE1E,iEAA4D;AAC5D,+EAAyE;AACzE,uEAA4E;
|
|
1
|
+
{"version":3,"file":"entity-service-impl.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-service-impl.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
|
|
2
2
|
import { AttributeMaster } from '../entity/attribute-master.entity';
|
|
3
3
|
import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
|
|
4
|
+
import { DataSource } from 'typeorm';
|
|
4
5
|
interface ValidationError {
|
|
5
6
|
field: string;
|
|
6
7
|
message: string;
|
|
@@ -8,10 +9,11 @@ interface ValidationError {
|
|
|
8
9
|
export declare class EntityValidationService {
|
|
9
10
|
private readonly attributeMasterService;
|
|
10
11
|
private readonly reflectionHelper;
|
|
11
|
-
|
|
12
|
+
private dataSource;
|
|
13
|
+
constructor(attributeMasterService: AttributeMasterService, reflectionHelper: ReflectionHelper, dataSource: DataSource);
|
|
12
14
|
validateRequiredFields(entityData: Record<string, any>, attributeData: AttributeMaster[]): ValidationError[];
|
|
13
|
-
validateUniqueFields(entityData: Record<string, any>, attributeData: AttributeMaster[], entityType: string): Promise<ValidationError[]>;
|
|
14
|
-
validateEntityData(entityData: Record<string, any
|
|
15
|
+
validateUniqueFields(entityData: Record<string, any>, attributeData: AttributeMaster[], entityType: string, db_table_name: string): Promise<ValidationError[]>;
|
|
16
|
+
validateEntityData(entityData: Record<string, any>, entityMaster: any): Promise<ValidationError[]>;
|
|
15
17
|
private hasValidValue;
|
|
16
18
|
}
|
|
17
19
|
export {};
|
|
@@ -13,50 +13,54 @@ exports.EntityValidationService = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const attribute_master_service_1 = require("./attribute-master.service");
|
|
15
15
|
const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
|
|
16
|
+
const typeorm_1 = require("typeorm");
|
|
16
17
|
let EntityValidationService = class EntityValidationService {
|
|
17
|
-
constructor(attributeMasterService, reflectionHelper) {
|
|
18
|
+
constructor(attributeMasterService, reflectionHelper, dataSource) {
|
|
18
19
|
this.attributeMasterService = attributeMasterService;
|
|
19
20
|
this.reflectionHelper = reflectionHelper;
|
|
21
|
+
this.dataSource = dataSource;
|
|
20
22
|
}
|
|
21
23
|
validateRequiredFields(entityData, attributeData) {
|
|
22
24
|
const errors = [];
|
|
23
25
|
attributeData
|
|
24
26
|
.filter(attr => attr.required)
|
|
25
27
|
.forEach(attr => {
|
|
26
|
-
const value = entityData[attr.
|
|
28
|
+
const value = entityData[attr.attribute_key];
|
|
27
29
|
if (!this.hasValidValue(value)) {
|
|
28
30
|
errors.push({
|
|
29
|
-
field: attr.
|
|
30
|
-
message: `Field
|
|
31
|
+
field: attr.name,
|
|
32
|
+
message: `Field ${attr.name} is required.`,
|
|
31
33
|
});
|
|
32
34
|
}
|
|
33
35
|
});
|
|
34
36
|
return errors;
|
|
35
37
|
}
|
|
36
|
-
async validateUniqueFields(entityData, attributeData, entityType) {
|
|
38
|
+
async validateUniqueFields(entityData, attributeData, entityType, db_table_name) {
|
|
37
39
|
const errors = [];
|
|
38
|
-
const repo = this.reflectionHelper.getRepoService(entityData.entity_type);
|
|
39
|
-
if (!repo) {
|
|
40
|
-
throw new Error(`Repository service not found for entityType: ${entityType}`);
|
|
41
|
-
}
|
|
42
40
|
for (const attr of attributeData.filter(a => a.is_unique)) {
|
|
43
|
-
const value = entityData[attr.
|
|
41
|
+
const value = entityData[attr.attribute_key];
|
|
44
42
|
if (this.hasValidValue(value)) {
|
|
45
|
-
const existing = await
|
|
43
|
+
const existing = await this.dataSource
|
|
44
|
+
.createQueryBuilder()
|
|
45
|
+
.select("*")
|
|
46
|
+
.from(db_table_name, db_table_name)
|
|
47
|
+
.where(`${db_table_name}.${attr.attribute_key} = :value`, { value })
|
|
48
|
+
.limit(1)
|
|
49
|
+
.getRawOne();
|
|
46
50
|
if (existing) {
|
|
47
51
|
errors.push({
|
|
48
|
-
field: attr.
|
|
49
|
-
message: `Field
|
|
52
|
+
field: attr.name,
|
|
53
|
+
message: `Field ${attr.name} must be unique. Value ${value} already exists.`,
|
|
50
54
|
});
|
|
51
55
|
}
|
|
52
56
|
}
|
|
53
57
|
}
|
|
54
58
|
return errors;
|
|
55
59
|
}
|
|
56
|
-
async validateEntityData(entityData) {
|
|
60
|
+
async validateEntityData(entityData, entityMaster) {
|
|
57
61
|
const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entityData.entity_type);
|
|
58
62
|
const requiredErrors = this.validateRequiredFields(entityData, attributes);
|
|
59
|
-
const uniqueErrors = await this.validateUniqueFields(entityData, attributes, entityData.entity_type);
|
|
63
|
+
const uniqueErrors = await this.validateUniqueFields(entityData, attributes, entityData.entity_type, entityMaster.db_table_name);
|
|
60
64
|
return [...requiredErrors, ...uniqueErrors];
|
|
61
65
|
}
|
|
62
66
|
hasValidValue(value) {
|
|
@@ -71,6 +75,7 @@ exports.EntityValidationService = EntityValidationService;
|
|
|
71
75
|
exports.EntityValidationService = EntityValidationService = __decorate([
|
|
72
76
|
(0, common_1.Injectable)(),
|
|
73
77
|
__metadata("design:paramtypes", [attribute_master_service_1.AttributeMasterService,
|
|
74
|
-
reflection_helper_service_1.ReflectionHelper
|
|
78
|
+
reflection_helper_service_1.ReflectionHelper,
|
|
79
|
+
typeorm_1.DataSource])
|
|
75
80
|
], EntityValidationService);
|
|
76
81
|
//# sourceMappingURL=entity-validation.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-validation.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-validation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAA0F;AAE1F,gGAA+E;
|
|
1
|
+
{"version":3,"file":"entity-validation.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-validation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAA0F;AAE1F,gGAA+E;AAC/E,qCAAqC;AAQ9B,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAClC,YACmB,sBAA8C,EAC9C,gBAAkC,EAC3C,UAAsB;QAFb,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,qBAAgB,GAAhB,gBAAgB,CAAkB;QAC3C,eAAU,GAAV,UAAU,CAAY;IAC7B,CAAC;IAKJ,sBAAsB,CACpB,UAA+B,EAC/B,aAAgC;QAEhC,MAAM,MAAM,GAAsB,EAAE,CAAC;QAErC,aAAa;aACV,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;aAC7B,OAAO,CAAC,IAAI,CAAC,EAAE;YACd,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,IAAI,CAAC,IAAI;oBAChB,OAAO,EAAE,SAAS,IAAI,CAAC,IAAI,eAAe;iBAC3C,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEL,OAAO,MAAM,CAAC;IAChB,CAAC;IAKD,KAAK,CAAC,oBAAoB,CACxB,UAA+B,EAC/B,aAAgC,EAChC,UAAkB,EAClB,aAAqB;QAErB,MAAM,MAAM,GAAsB,EAAE,CAAC;QAErC,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1D,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAE7C,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU;qBACnC,kBAAkB,EAAE;qBACpB,MAAM,CAAC,GAAG,CAAC;qBACX,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC;qBAClC,KAAK,CAAC,GAAG,aAAa,IAAI,IAAI,CAAC,aAAa,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC;qBACnE,KAAK,CAAC,CAAC,CAAC;qBACR,SAAS,EAAE,CAAC;gBAEf,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,CAAC;wBACV,KAAK,EAAE,IAAI,CAAC,IAAI;wBAChB,OAAO,EAAE,SAAS,IAAI,CAAC,IAAI,0BAA0B,KAAK,kBAAkB;qBAC7E,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAKD,KAAK,CAAC,kBAAkB,CACtB,UAA+B,EAC/B,YAAY;QAEZ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,gCAAgC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAE9G,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QAEhI,OAAO,CAAC,GAAG,cAAc,EAAE,GAAG,YAAY,CAAC,CAAC;IAC9C,CAAC;IAGO,aAAa,CAAC,KAAU;QAC9B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QACxD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAvFY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAGgC,iDAAsB;QAC5B,4CAAgB;QAC/B,oBAAU;GAJrB,uBAAuB,CAuFnC"}
|
|
@@ -13,7 +13,7 @@ export declare class MediaDataService extends EntityServiceImpl {
|
|
|
13
13
|
bucketName: string | undefined;
|
|
14
14
|
s3: S3;
|
|
15
15
|
generateMediaUploadDetails(fileName: string, mappedAttributeKey: string, mappedEntityType?: string, mappedEntityId?: number): Promise<{
|
|
16
|
-
id:
|
|
16
|
+
id: any;
|
|
17
17
|
path: string;
|
|
18
18
|
uploadUrl: string;
|
|
19
19
|
} | null>;
|