rez_core 1.0.98 → 1.1.0

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.
@@ -4,6 +4,7 @@ import { EntityMasterService } from '../../meta/service/entity-master.service';
4
4
  import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
5
5
  import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
6
6
  import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
7
+ import { EntityValidationService } from 'src/module/meta/service/entity-validation.service';
7
8
  export declare class MasterService {
8
9
  private readonly entityManager;
9
10
  private readonly entityMasterService;
@@ -11,7 +12,8 @@ export declare class MasterService {
11
12
  private readonly excelUtil;
12
13
  private reflectionHelper;
13
14
  private readonly entityServiceImpl;
14
- constructor(entityManager: EntityManager, entityMasterService: EntityMasterService, attributeMasterService: AttributeMasterService, excelUtil: ExcelUtil, reflectionHelper: ReflectionHelper, entityServiceImpl: EntityServiceImpl);
15
+ protected readonly entityValidationService: EntityValidationService;
16
+ constructor(entityManager: EntityManager, entityMasterService: EntityMasterService, attributeMasterService: AttributeMasterService, excelUtil: ExcelUtil, reflectionHelper: ReflectionHelper, entityServiceImpl: EntityServiceImpl, entityValidationService: EntityValidationService);
15
17
  private readonly metaSheets;
16
18
  private readonly sequence;
17
19
  private readonly dataSequence;
@@ -26,5 +28,8 @@ export declare class MasterService {
26
28
  }>;
27
29
  private resolveParent;
28
30
  upsertData(tableName: string, uniqueFields: string[], data: any[]): Promise<void>;
29
- upsertViaService(entityType: string, data: any[], attributes: any[], uniqueFields: string[], loggedInUser: any, duplicateHandling: 'skip_duplicates' | 'overwrite_items'): Promise<void>;
31
+ upsertViaService(entityType: string, data: any[], attributes: any[], uniqueFields: string[], loggedInUser: any, duplicateHandling: 'skip_duplicates' | 'overwrite_items', errors: {
32
+ row: number;
33
+ errors: any[];
34
+ }[]): Promise<void>;
30
35
  }
@@ -17,14 +17,16 @@ const entity_master_service_1 = require("../../meta/service/entity-master.servic
17
17
  const attribute_master_service_1 = require("../../meta/service/attribute-master.service");
18
18
  const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
19
19
  const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
20
+ const entity_validation_service_1 = require("../../meta/service/entity-validation.service");
20
21
  let MasterService = class MasterService {
21
- constructor(entityManager, entityMasterService, attributeMasterService, excelUtil, reflectionHelper, entityServiceImpl) {
22
+ constructor(entityManager, entityMasterService, attributeMasterService, excelUtil, reflectionHelper, entityServiceImpl, entityValidationService) {
22
23
  this.entityManager = entityManager;
23
24
  this.entityMasterService = entityMasterService;
24
25
  this.attributeMasterService = attributeMasterService;
25
26
  this.excelUtil = excelUtil;
26
27
  this.reflectionHelper = reflectionHelper;
27
28
  this.entityServiceImpl = entityServiceImpl;
29
+ this.entityValidationService = entityValidationService;
28
30
  this.metaSheets = [
29
31
  'cr_entity_master',
30
32
  'cr_attribute_master',
@@ -178,6 +180,7 @@ let MasterService = class MasterService {
178
180
  };
179
181
  }
180
182
  async uploadEntityData(file, entityType, loggedInUser, duplicateHandling) {
183
+ const errors = [];
181
184
  const data = excelUtil_service_1.ExcelUtil.readExcel(file.buffer);
182
185
  const entityMaster = await this.entityMasterService.findByMappedEntityType(entityType);
183
186
  if (!entityMaster) {
@@ -195,22 +198,66 @@ let MasterService = class MasterService {
195
198
  if (uniqueFields.length === 0) {
196
199
  throw new Error(`No unique fields found for entityType: ${entityType}`);
197
200
  }
198
- for (const row of sheetData) {
201
+ for (const [i, row] of sheetData.entries()) {
199
202
  if (row.parent_type && row.parent_id) {
200
203
  await this.resolveParent(row);
201
204
  }
202
205
  for (const attr of attributes) {
203
206
  if (attr.data_source_type === 'entity' && row[attr.attribute_key]) {
204
- const refEntity = await this.entityMasterService.getEntityData(attr.datasource_list);
205
- const refData = await this.entityManager.query(`SELECT * FROM ${refEntity.db_table_name} WHERE code = ? LIMIT 1`, [row[attr.attribute_key]]);
206
- if (!refData.length) {
207
- throw new Error(`Reference entity not found for code: ${row[attr.attribute_key]}`);
207
+ try {
208
+ const refEntity = await this.entityMasterService.getEntityData(attr.datasource_list);
209
+ const refData = await this.entityManager.query(`SELECT * FROM ${refEntity.db_table_name} WHERE code = ? LIMIT 1`, [row[attr.attribute_key]]);
210
+ if (!refData.length) {
211
+ errors.push({
212
+ row: i + 1,
213
+ errors: [
214
+ {
215
+ field: attr.name,
216
+ message: `Reference entity not found for code: ${row[attr.attribute_key]}`,
217
+ },
218
+ ],
219
+ });
220
+ continue;
221
+ }
222
+ const existingError = errors.find((e) => e.row === i + 1);
223
+ if (refData[0].organization_id !== loggedInUser.organization_id) {
224
+ if (existingError) {
225
+ existingError.errors.push({
226
+ field: attr.name,
227
+ message: `Reference entity not found for code: ${row[attr.attribute_key]} does not belong to the organization`,
228
+ });
229
+ continue;
230
+ }
231
+ else {
232
+ errors.push({
233
+ row: i + 1,
234
+ errors: [
235
+ {
236
+ field: attr.name,
237
+ message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
238
+ },
239
+ ],
240
+ });
241
+ continue;
242
+ }
243
+ }
244
+ row[attr.attribute_key] = refData[0].id;
245
+ }
246
+ catch (err) {
247
+ errors.push({
248
+ row: i + 1,
249
+ errors: [
250
+ {
251
+ field: attr.name,
252
+ message: `Error fetching reference entity for ${attr.attribute_key}`,
253
+ },
254
+ ],
255
+ });
208
256
  }
209
- row[attr.attribute_key] = refData[0].id;
210
257
  }
211
258
  }
212
259
  }
213
- await this.upsertViaService(entityType, sheetData, attributes, uniqueFields, loggedInUser, duplicateHandling);
260
+ await this.upsertViaService(entityType, sheetData, attributes, uniqueFields, loggedInUser, duplicateHandling, errors);
214
261
  return { message: 'Entity data uploaded successfully' };
215
262
  }
216
263
  async resolveParent(row) {
@@ -264,7 +311,7 @@ let MasterService = class MasterService {
264
311
  }
265
312
  }
266
313
  }
267
- async upsertViaService(entityType, data, attributes, uniqueFields, loggedInUser, duplicateHandling) {
314
+ async upsertViaService(entityType, data, attributes, uniqueFields, loggedInUser, duplicateHandling, errors) {
268
315
  const entityMaster = await this.entityMasterService.findByMappedEntityType(entityType);
269
316
  if (!entityMaster)
270
317
  throw new Error(`Entity master not found for ${entityType}`);
@@ -272,6 +319,30 @@ let MasterService = class MasterService {
272
319
  const entityService = await this.reflectionHelper.getBean(serviceName);
273
320
  if (!entityService)
274
321
  throw new Error(`Entity service not found for ${entityType}`);
322
+ for (const [i, row] of data.entries()) {
323
+ row.entity_type = entityType;
324
+ row.organization_id = loggedInUser.organization_id;
325
+ const rowErrors = await this.entityValidationService.validateExcelEntityData(row, entityMaster);
326
+ const existingError = errors.find((e) => e.row === i + 1);
327
+ if (rowErrors?.length > 0) {
328
+ if (existingError) {
329
+ existingError.errors.push(...rowErrors);
330
+ }
331
+ else {
332
+ errors.push({
333
+ row: i + 1,
334
+ errors: rowErrors,
335
+ });
336
+ }
337
+ }
338
+ }
339
+ if (errors.length > 0) {
340
+ throw new common_1.BadRequestException({
341
+ status: false,
342
+ message: `Validation errors found in the uploaded data.`,
343
+ error: errors,
344
+ });
345
+ }
275
346
  for (const row of data) {
276
347
  const qb = this.entityManager
277
348
  .createQueryBuilder()
@@ -293,13 +364,10 @@ let MasterService = class MasterService {
293
364
  orgId: loggedInUser.organization_id,
294
365
  });
295
366
  const existing = await qb.limit(1).getRawOne();
296
- row.entity_type = entityType;
297
- row.organization_id = loggedInUser.organization_id;
298
367
  if (existing) {
299
- if (duplicateHandling === 'skip_duplicates') {
368
+ if (duplicateHandling === 'skip_duplicates')
300
369
  continue;
301
- }
302
- else if (duplicateHandling === 'overwrite_items') {
370
+ if (duplicateHandling === 'overwrite_items') {
303
371
  row.id = existing.id;
304
372
  await entityService.updateEntity(row, loggedInUser);
305
373
  }
@@ -318,6 +386,7 @@ exports.MasterService = MasterService = __decorate([
318
386
  attribute_master_service_1.AttributeMasterService,
319
387
  excelUtil_service_1.ExcelUtil,
320
388
  reflection_helper_service_1.ReflectionHelper,
321
- entity_service_impl_service_1.EntityServiceImpl])
389
+ entity_service_impl_service_1.EntityServiceImpl,
390
+ entity_validation_service_1.EntityValidationService])
322
391
  ], MasterService);
323
392
  //# sourceMappingURL=master.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,7 @@ export declare class AttributeMaster extends BaseEntity {
13
13
  db_datatype: string;
14
14
  category: string;
15
15
  is_unique: number;
16
+ regex: string;
16
17
  can_export: number;
17
18
  appcode: string;
18
19
  }
@@ -87,6 +87,10 @@ __decorate([
87
87
  (0, typeorm_1.Column)({ name: 'is_unique', nullable: true }),
88
88
  __metadata("design:type", Number)
89
89
  ], AttributeMaster.prototype, "is_unique", void 0);
90
+ __decorate([
91
+ (0, typeorm_1.Column)({ name: 'regex', nullable: true }),
92
+ __metadata("design:type", String)
93
+ ], AttributeMaster.prototype, "regex", void 0);
90
94
  __decorate([
91
95
  (0, typeorm_1.Column)({ name: 'can_export', nullable: true }),
92
96
  __metadata("design:type", Number)
@@ -1 +1 @@
1
- {"version":3,"file":"attribute-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/attribute-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAkD;AAClD,qCAAyC;AAGlC,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,+BAAU;CAiE9C,CAAA;AAjEY,0CAAe;AAE1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DAC7C;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDAC5B;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;qDACzD;AAQrB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE;KACX,CAAC;;yDACuB;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAC7C;AAQxB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,IAAI;KACf,CAAC;;sDACoB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC5B;AAQjB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,IAAI;KACf,CAAC;;oDACkB;AAQpB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE;KACX,CAAC;;sDACoB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;oDACzD;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;iDACzD;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC7B;0BAhEJ,eAAe;IAD3B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;GAC3B,eAAe,CAiE3B"}
1
+ {"version":3,"file":"attribute-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/attribute-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAkD;AAClD,qCAAyC;AAGlC,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,+BAAU;CAoE9C,CAAA;AApEY,0CAAe;AAE1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DAC7C;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDAC5B;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;qDACzD;AAQrB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE;KACX,CAAC;;yDACuB;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAC7C;AAQxB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,IAAI;KACf,CAAC;;sDACoB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC5B;AAQjB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,IAAI;KACf,CAAC;;oDACkB;AAQpB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE;KACX,CAAC;;sDACoB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;oDACzD;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;iDACzD;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;0BAnEL,eAAe;IAD3B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;GAC3B,eAAe,CAoE3B"}
@@ -13,4 +13,5 @@ export declare class BaseEntity {
13
13
  modified_date: Date;
14
14
  enterprise_id: number;
15
15
  organization_id: number;
16
+ appcode: string;
16
17
  }
@@ -87,4 +87,9 @@ __decorate([
87
87
  (0, class_transformer_1.Expose)(),
88
88
  __metadata("design:type", Number)
89
89
  ], BaseEntity.prototype, "organization_id", void 0);
90
+ __decorate([
91
+ (0, typeorm_1.Column)({ name: 'appcode', type: 'varchar', length: 100, nullable: true }),
92
+ (0, class_transformer_1.Expose)(),
93
+ __metadata("design:type", String)
94
+ ], BaseEntity.prototype, "appcode", void 0);
90
95
  //# sourceMappingURL=base-entity.entity.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"base-entity.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/base-entity.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyD;AACzD,yDAA2C;AAE3C,MAAa,UAAU;IACrB;QACE,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;IACjC,CAAC;CA6CF;AAhDD,gCAgDC;AAzCC;IAFC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC1C,IAAA,0BAAM,GAAE;;sCACE;AAGX;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7E,IAAA,0BAAM,GAAE;;+CACW;AAGpB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACtE,IAAA,0BAAM,GAAE;;wCACI;AAGb;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACxE,IAAA,0BAAM,GAAE;;0CACM;AAGf;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7E,IAAA,0BAAM,GAAE;;+CACW;AAGpB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7D,IAAA,0BAAM,GAAE;;6CACS;AAGlB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACtE,IAAA,0BAAM,GAAE;;wCACI;AAGb;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC9D,IAAA,0BAAM,GAAE;;8CACU;AAOnB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,0BAAM,GAAE;8BACK,IAAI;gDAAC;AAGnB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC/D,IAAA,0BAAM,GAAE;;+CACW;AAGpB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACnE,IAAA,0BAAM,GAAE;8BACM,IAAI;iDAAC;AAGpB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC9D,IAAA,0BAAM,GAAE;;iDACa;AAGtB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAChE,IAAA,0BAAM,GAAE;;mDACe"}
1
+ {"version":3,"file":"base-entity.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/base-entity.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyD;AACzD,yDAA2C;AAE3C,MAAa,UAAU;IACrB;QACE,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;IACjC,CAAC;CAgDF;AAnDD,gCAmDC;AA5CC;IAFC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC1C,IAAA,0BAAM,GAAE;;sCACE;AAGX;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7E,IAAA,0BAAM,GAAE;;+CACW;AAGpB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACtE,IAAA,0BAAM,GAAE;;wCACI;AAGb;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACxE,IAAA,0BAAM,GAAE;;0CACM;AAGf;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7E,IAAA,0BAAM,GAAE;;+CACW;AAGpB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7D,IAAA,0BAAM,GAAE;;6CACS;AAGlB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACtE,IAAA,0BAAM,GAAE;;wCACI;AAGb;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC9D,IAAA,0BAAM,GAAE;;8CACU;AAOnB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,0BAAM,GAAE;8BACK,IAAI;gDAAC;AAGnB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC/D,IAAA,0BAAM,GAAE;;+CACW;AAGpB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACnE,IAAA,0BAAM,GAAE;8BACM,IAAI;iDAAC;AAGpB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC9D,IAAA,0BAAM,GAAE;;iDACa;AAGtB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAChE,IAAA,0BAAM,GAAE;;mDACe;AAGxB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACxE,IAAA,0BAAM,GAAE;;2CACO"}
@@ -13,7 +13,9 @@ export declare class EntityValidationService {
13
13
  constructor(attributeMasterService: AttributeMasterService, reflectionHelper: ReflectionHelper, dataSource: DataSource);
14
14
  validateRequiredFields(entityData: Record<string, any>, attributeData: AttributeMaster[]): ValidationError[];
15
15
  validateUniqueFields(entityData: Record<string, any>, attributeData: AttributeMaster[], entityType: string, db_table_name: string): Promise<ValidationError[]>;
16
+ validateRegexFields(entityData: Record<string, any>, attributeData: AttributeMaster[]): Promise<ValidationError[]>;
16
17
  validateEntityData(entityData: Record<string, any>, entityMaster: any): Promise<ValidationError[]>;
18
+ validateExcelEntityData(entityData: Record<string, any>, entityMaster: any): Promise<ValidationError[]>;
17
19
  private hasValidValue;
18
20
  }
19
21
  export {};
@@ -23,8 +23,8 @@ let EntityValidationService = class EntityValidationService {
23
23
  validateRequiredFields(entityData, attributeData) {
24
24
  const errors = [];
25
25
  attributeData
26
- .filter(attr => attr.required)
27
- .forEach(attr => {
26
+ .filter((attr) => attr.required)
27
+ .forEach((attr) => {
28
28
  const value = entityData[attr.attribute_key];
29
29
  if (!this.hasValidValue(value)) {
30
30
  errors.push({
@@ -37,7 +37,7 @@ let EntityValidationService = class EntityValidationService {
37
37
  }
38
38
  async validateUniqueFields(entityData, attributeData, entityType, db_table_name) {
39
39
  const errors = [];
40
- for (const attr of attributeData.filter(a => a.is_unique)) {
40
+ for (const attr of attributeData.filter((a) => a.is_unique)) {
41
41
  const value = entityData[attr.attribute_key];
42
42
  if (this.hasValidValue(value)) {
43
43
  let qb = this.dataSource
@@ -62,11 +62,34 @@ let EntityValidationService = class EntityValidationService {
62
62
  }
63
63
  return errors;
64
64
  }
65
+ async validateRegexFields(entityData, attributeData) {
66
+ const errors = [];
67
+ for (const attr of attributeData.filter((a) => a.regex)) {
68
+ const value = entityData[attr.attribute_key];
69
+ if (this.hasValidValue(value)) {
70
+ const regex = new RegExp(attr.regex);
71
+ if (!regex.test(value)) {
72
+ errors.push({
73
+ field: attr.name,
74
+ message: `Field ${attr.name} does not match the required pattern.`,
75
+ });
76
+ }
77
+ }
78
+ }
79
+ return errors;
80
+ }
65
81
  async validateEntityData(entityData, entityMaster) {
66
82
  const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entityData.entity_type);
67
83
  const requiredErrors = this.validateRequiredFields(entityData, attributes);
68
84
  const uniqueErrors = await this.validateUniqueFields(entityData, attributes, entityData.entity_type, entityMaster.db_table_name);
69
- return [...requiredErrors, ...uniqueErrors];
85
+ const regexErros = await this.validateRegexFields(entityData, attributes);
86
+ return [...requiredErrors, ...uniqueErrors, ...regexErros];
87
+ }
88
+ async validateExcelEntityData(entityData, entityMaster) {
89
+ const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entityData.entity_type);
90
+ const requiredErrors = this.validateRequiredFields(entityData, attributes);
91
+ const regexErros = await this.validateRegexFields(entityData, attributes);
92
+ return [...requiredErrors, ...regexErros];
70
93
  }
71
94
  hasValidValue(value) {
72
95
  if (value === null || value === undefined)
@@ -1 +1 @@
1
- {"version":3,"file":"entity-validation.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-validation.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entity-validation.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-validation.service.ts"],"names":[],"mappings":"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"}