rez_core 3.1.51 → 3.1.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "3.1.51",
+  "version": "3.1.54",
   "description": "",
   "author": "",
   "private": false,

package/src/module/integration/service/integration-entity-mapper.service.ts

@@ -11,7 +11,7 @@ export class IntegrationEntityMapperService {
   }
 
   async findByDid(did: string) {
-    return this.integrationEntityMapperRepo.findOne({
+    return await this.integrationEntityMapperRepo.findOne({
       where: { did },
     });
   }

package/src/module/mapper/controller/field-mapper.controller.ts

@@ -37,6 +37,13 @@ export class FieldMapperController {
     return this.fieldMapperService.createFieldMappers(dtos, loggedInUser);
   }
 
+  @Post('bulk-update')
+  @HttpCode(HttpStatus.OK)
+  async updateBulk(@Req() req: any, @Body() dtos: FieldMapperDto[]) {
+    const loggedInUser = req.user.userData;
+    return this.fieldMapperService.updateFieldMappers(dtos, loggedInUser);
+  }
+
   @Get('getFields/:mapperId')
   async getFieldsByMapper(@Param('mapperId') mapperId: number) {
     return this.fieldMapperService.getMapperFields(mapperId);

package/src/module/mapper/dto/field-mapper.dto.ts

@@ -1,4 +1,5 @@
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
+import { FieldLovMapper } from '../entity/field-lovs.entity';
 
 export class FieldMapperDto extends BaseEntity {
   mapper_id: string;
@@ -9,6 +10,6 @@ export class FieldMapperDto extends BaseEntity {
   mapped_entity_type: string;
   filter_code?: string;
   filter_json?: any;
-
+  field_lovs?: FieldLovMapper[];
 }
 

package/src/module/mapper/entity/field-mapper.entity.ts

@@ -18,10 +18,10 @@ export class FieldMapper extends BaseEntity {
   @Column({ name: 'source_attribute', type: 'varchar', length: 30 })
   source_attribute: string;
 
-  @Column({ name: 'destination_attribute', type: 'varchar', length: 30 })
+  @Column({ name: 'attribute_key', type: 'varchar', length: 30 })
   attribute_key: string;
 
-  @Column({ name: 'destination_entity_type', type: 'varchar', length: 30 })
+  @Column({ name: 'mapper_entity_type', type: 'varchar', length: 30 })
   mapper_entity_type: string;
 
   @Column({ name: 'mapped_entity_type', type: 'varchar', length: 30, nullable: true })
@@ -33,4 +33,6 @@ export class FieldMapper extends BaseEntity {
   @Column({ name: 'is_lov_present', type: 'tinyint', nullable: true, default: 0 })
   is_lov_present: number;
 
+  @Column({name: 'seq', type: 'int', nullable: true})
+  seq: number;
 }

package/src/module/mapper/repository/field-lovs.repository.ts

@@ -8,6 +8,10 @@ export class FieldLovsRepository {
   constructor(@InjectRepository(FieldLovMapper) private readonly fieldLovMapperRepository: Repository<FieldLovMapper>) {
   }
 
+  async saveBulk(dtos: FieldLovMapper[]) {
+    return await this.fieldLovMapperRepository.save(dtos)
+  }
+
   async findByMapperFieldIdAndSourceAttributeValue(mapper_field_id: number, source_attribute_value: string) {
     return await this.fieldLovMapperRepository.findOne({
       where: { mapper_field_id, source_attribute_value },

package/src/module/mapper/service/field-mapper.service.ts

@@ -23,6 +23,9 @@ export class FieldMapperService extends EntityServiceImpl {
   }
 
   async createEntity(dto: FieldMapperDto, loggedInUser: UserData) {
+    if (dto.field_lovs) {
+      await this.fieldLovsRepository.saveBulk(dto.field_lovs);
+    }
     return super.createEntity(dto, loggedInUser);
   }
 
@@ -41,7 +44,16 @@ export class FieldMapperService extends EntityServiceImpl {
     let result: BaseEntity[] = [];
     for (const dto of dtos) {
       const fieldMapper = await super.createEntity(dto, loggedInUser);
-      result.push(fieldMapper)
+      result.push(fieldMapper);
+    }
+    return result;
+  }
+
+  async updateFieldMappers(dtos: FieldMapperDto[], loggedInUser: UserData) {
+    let result: BaseEntity[] = [];
+    for (const dto of dtos) {
+      const fieldMapper = await super.updateEntity(dto, loggedInUser);
+      result.push(fieldMapper);
     }
     return result;
   }
@@ -50,7 +62,6 @@ export class FieldMapperService extends EntityServiceImpl {
     return await this.fieldMapperRepository.findByMapperId(mapperId);
   }
 
-
   async resolveData(
     mapper_id: number,
     parent_type: string,
@@ -58,9 +69,8 @@ export class FieldMapperService extends EntityServiceImpl {
     userData: UserData,
   ) {
     const fieldMappers =
-      await this.fieldMapperRepository.findByMapperIdAndMappedEntityType(
+      await this.fieldMapperRepository.findByMapperId(
         mapper_id,
-        parent_type,
       );
 
     const result: Record<string, any> = {};
@@ -94,11 +104,11 @@ export class FieldMapperService extends EntityServiceImpl {
       ) {
         // Step 1: get related target entity ids
         const relations = await this.datasource.query(
-          `SELECT target_entity_id 
-           FROM cr_entity_relation_data 
-           WHERE source_entity_type = ? 
-             AND source_entity_id = ? 
-             AND target_entity_type = ? 
+          `SELECT target_entity_id
+           FROM cr_entity_relation_data
+           WHERE source_entity_type = ?
+             AND source_entity_id = ?
+             AND target_entity_type = ?
              AND organization_id = ?`,
           [
             parent_type,
@@ -115,7 +125,7 @@ export class FieldMapperService extends EntityServiceImpl {
             // Step 2a: filtered fetch with IN clause using applyFilterWrapper
             inMemory[entityType][filterCode] = inMemory[entityType][
               filterCode
-            ] = await this.filterService.applyFilterWrapper({
+              ] = await this.filterService.applyFilterWrapper({
               entity_type: entityType,
               savedFilterCode: filterCode,
               quickFilter: [
@@ -144,7 +154,7 @@ export class FieldMapperService extends EntityServiceImpl {
       // Fetch mapped attribute values
       const entityData = inMemory[entityType][filterCode];
       if (entityData) {
-        let value = entityData[field.mapper_entity_type];
+        let value = entityData[field.attribute_key];
 
         if (field.is_lov_present) {
           if (field.action === 'LOOKUP') {

package/src/module/meta/controller/meta.controller.ts

@@ -1,4 +1,5 @@
 import {
+  Body,
   Controller,
   HttpStatus,
   Post,
@@ -79,4 +80,17 @@ export class MetaController {
     const result = await this.entityMaster.getOperationList(loggedInUser);
     return result;
   }
+
+  @Post('getattributesoftypedate')
+  async getAttributesOfTypeDate(
+    @Req() req: Request & { user: any },
+    @Body('entity_type') entity_type: string,
+  ) {
+    const loggedInUser = req.user.userData;
+    const result = await this.entityMaster.getAttributesOfTypeDate(
+      entity_type,
+      loggedInUser,
+    );
+    return result;
+  }
 }

package/src/module/meta/repository/entity-master.repository.ts

@@ -42,4 +42,20 @@ export class EntityMasterRepository {
 
     return { text, number, date, select, multiselect, year };
   }
+
+  async getAttributesOfTypeDate(entity_type, loggedInUser) {
+    const organization_id = loggedInUser.organization_id;
+
+    const attributes = await this.dataSource.query(
+      `SELECT * FROM cr_attribute_master WHERE mapped_entity_type = ? AND data_type = 'DATE' AND organization_id = ?`,
+      [entity_type, organization_id],
+    );
+
+    const attributeList = attributes.map((attr) => ({
+      label: attr.name,
+      value: attr.attribute_key,
+    }));
+
+    return attributeList;
+  }
 }

package/src/module/meta/service/entity-master.service.ts

@@ -154,4 +154,11 @@ export class EntityMasterService {
   async getOperationList(loggedInUser: any) {
     return await this.entityMasterRepo.getOperationList(loggedInUser);
   }
+
+  async getAttributesOfTypeDate(entityType: string, loggedInUser: any) {
+    return await this.entityMasterRepo.getAttributesOfTypeDate(
+      entityType,
+      loggedInUser,
+    );
+  }
 }

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}