rez_core 2.1.111 → 2.1.113

package/package.json

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

package/src/app.module.ts

@@ -14,6 +14,7 @@ import { FilterModule } from './module/filter/filter.module';
 import { LeadModule } from './module/lead/lead.module';
 import { LayoutPreferenceModule } from './module/layout_preference/layout_preference.module';
 import { WorkflowModule } from './module/workflow/workflow.module';
+import { ResolverModule } from './module/resolver/resolver.module';
 
 @Module({
   imports: [
@@ -32,6 +33,7 @@ import { WorkflowModule } from './module/workflow/workflow.module';
     LeadModule,
     LayoutPreferenceModule,
     WorkflowModule,
+    ResolverModule,
   ],
 })
 export class AppModule {}

package/src/core.module.ts

@@ -13,6 +13,8 @@ import { FilterModule } from './module/filter/filter.module';
 import { AuthModule } from './module/auth/auth.module';
 import { LeadModule } from './module/lead/lead.module';
 import { LayoutPreferenceModule } from './module/layout_preference/layout_preference.module';
+import { WorkflowModule } from './module/workflow/workflow.module';
+import { ResolverModule } from './module/resolver/resolver.module';
 
 @Global()
 @Module({})
@@ -33,6 +35,8 @@ export class CoreModule {
       AuthModule,
       LeadModule,
       LayoutPreferenceModule,
+      WorkflowModule,
+      ResolverModule,
     ];
 
     const exportsArray = [
@@ -46,6 +50,8 @@ export class CoreModule {
       FilterModule,
       LeadModule,
       LayoutPreferenceModule,
+      WorkflowModule,
+      ResolverModule,
     ];
 
     if (isSso) {

package/src/module/listmaster/controller/list-master.controller.ts

@@ -50,23 +50,23 @@ export class ListMasterController {
     );
   }
 
-  @Post('/getResolvedListMasterItems/:type')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getResolvedListMasterItems(
-    @Body() entityData: any,
-    @Param('type') type: string,
-    @Req() req: Request & { user: any },
-  ) {
-    const loggedInUser = req.user.userData;
-    const entityType = type;
+  // @Post('/getResolvedListMasterItems/:type')
+  // @UseGuards(JwtAuthGuard)
+  // @HttpCode(HttpStatus.OK)
+  // async getResolvedListMasterItems(
+  //   @Body() entityData: any,
+  //   @Param('type') type: string,
+  //   @Req() req: Request & { user: any },
+  // ) {
+  //   const loggedInUser = req.user.userData;
+  //   const entityType = type;
 
-    return await this.listMasterItemService.getResolvedListMasterItems(
-      loggedInUser,
-      entityData,
-      entityType,
-    );
-  }
+  //   return await this.listMasterItemService.getResolvedListMasterItems(
+  //     loggedInUser,
+  //     entityData,
+  //     entityType,
+  //   );
+  // }
 
   @Get('/getListMasterItems/:type')
   @UseGuards(JwtAuthGuard)

package/src/module/listmaster/service/list-master-item.service.ts

@@ -18,7 +18,7 @@ export class ListMasterItemService extends EntityServiceImpl {
     private readonly listMasterRepo: ListMasterItemsRepository,
     @Inject(forwardRef(() => EntityServiceImpl))
     private readonly entityServiceImpl: EntityServiceImpl,
-    private readonly attributeMasterService: AttributeMasterService,
+    protected readonly attributeMasterService: AttributeMasterService,
   ) {
     super();
   }
@@ -213,66 +213,65 @@ export class ListMasterItemService extends EntityServiceImpl {
   //   return resolvedEntityData;
   // }
 
-  async getResolvedListMasterItems(
-    loggedInUser: UserData,
-    entityData: any,
-    entityType: string,
-  ): Promise<any> {
-    const attributeItems =
-      await this.attributeMasterService.findAttributesByMappedEntityType(
-        entityType,
-        loggedInUser,
-      );
-
-    const resolvedEntityData = { ...entityData };
-
-    for (const attr of attributeItems) {
-      const field = attr.attribute_key;
-      const codeValue = entityData[field];
-
-      if (!codeValue) continue;
-
-      // ---------- ENTITY data_source_type ----------
-      if (attr.data_source_type === 'entity') {
-        if (Array.isArray(codeValue)) {
-          const resolvedValues: string[] = [];
-          for (const code of codeValue) {
-            const item = await super.getEntityData(
-              attr.datasource_list,
-              code,
-              loggedInUser,
-            );
-            resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
-          }
-          resolvedEntityData[field] = resolvedValues;
-        } else {
-          const item = await super.getEntityData(
-            attr.datasource_list,
-            codeValue,
-            loggedInUser,
-          );
-          resolvedEntityData[field] =
-            item?.[attr.data_source_attribute] ?? codeValue;
-        }
-      }
-
-      // ---------- MASTER data_source_type ----------
-      else if (attr.data_source_type === 'master') {
-        if (Array.isArray(codeValue)) {
-          const resolvedValues: string[] = [];
-          for (const code of codeValue) {
-            const item = await this.listItemsRepo.findById(code);
-            resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
-          }
-          resolvedEntityData[field] = resolvedValues;
-        } else {
-          const item = await this.listItemsRepo.findById(codeValue);
-          resolvedEntityData[field] =
-            item?.[attr.data_source_attribute] ?? codeValue;
-        }
-      }
-    }
-
-    return resolvedEntityData;
-  }
+  // async getResolvedListMasterItems(
+  //   loggedInUser: UserData,
+  //   entityData: any,
+  //   entityType: string,
+  // ): Promise<any> {
+  //   // const resolvedEntityData = super.getResolvedData(
+  //   //   loggedInUser,
+  //   //   entityData,
+  //   //   entityType,
+  //   // );
+  //   // const attributeItems =
+  //   //   await this.attributeMasterService.findAttributesByMappedEntityType(
+  //   //     entityType,
+  //   //     loggedInUser,
+  //   //   );
+  //   // const resolvedEntityData = { ...entityData };
+  //   // for (const attr of attributeItems) {
+  //   //   const field = attr.attribute_key;
+  //   //   const codeValue = entityData[field];
+  //   //   if (!codeValue) continue;
+  //   //   // ---------- ENTITY data_source_type ----------
+  //   //   if (attr.data_source_type === 'entity') {
+  //   //     if (Array.isArray(codeValue)) {
+  //   //       const resolvedValues: string[] = [];
+  //   //       for (const code of codeValue) {
+  //   //         const item = await super.getEntityData(
+  //   //           attr.datasource_list,
+  //   //           code,
+  //   //           loggedInUser,
+  //   //         );
+  //   //         resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+  //   //       }
+  //   //       resolvedEntityData[field] = resolvedValues;
+  //   //     } else {
+  //   //       const item = await super.getEntityData(
+  //   //         attr.datasource_list,
+  //   //         codeValue,
+  //   //         loggedInUser,
+  //   //       );
+  //   //       resolvedEntityData[field] =
+  //   //         item?.[attr.data_source_attribute] ?? codeValue;
+  //   //     }
+  //   //   }
+  //   //   // ---------- MASTER data_source_type ----------
+  //   //   else if (attr.data_source_type === 'master') {
+  //   //     if (Array.isArray(codeValue)) {
+  //   //       const resolvedValues: string[] = [];
+  //   //       for (const code of codeValue) {
+  //   //         const item = await this.listItemsRepo.findById(code);
+  //   //         resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+  //   //       }
+  //   //       resolvedEntityData[field] = resolvedValues;
+  //   //     } else {
+  //   //       const item = await this.listItemsRepo.findById(codeValue);
+  //   //       resolvedEntityData[field] =
+  //   //         item?.[attr.data_source_attribute] ?? codeValue;
+  //   //     }
+  //   //   }
+  //   // }
+  //   // return resolvedEntityData;
+  // }
 }

package/src/module/master/service/master.service.ts

@@ -161,9 +161,8 @@ export class MasterService {
       const entityMasterData =
         await this.entityMasterService.getEntityByTableName(table);
 
-      if (!entityMasterData || !entityMasterData.mapped_entity_type) {
-        console.error('Entity master data or mapped entity type is missing');
-        return;
+      if (!entityMasterData) {
+        throw new Error(`Entity master not found for table: ${table}`);
       }
 
       const attributes =

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

@@ -21,6 +21,8 @@ import {
 } from '../../../constant/global.constant';
 import { EntityValidationService } from './entity-validation.service';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { ListMasterItemService } from 'src/module/listmaster/service/list-master-item.service';
+import { AttributeMasterService } from './attribute-master.service';
 
 @Injectable()
 export class EntityServiceImpl implements EntityService<BaseEntity> {
@@ -33,8 +35,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   @Inject() protected readonly loggingService: LoggingService;
   @Inject()
   protected readonly entityValidationService: EntityValidationService;
-  // @Inject('ListMasterService')
-  // private readonly listMasterService: ListMasterService;
+  protected readonly attributeMasterService: AttributeMasterService;
 
   async createEntity(
     entityData: BaseEntity,

package/src/module/resolver/controller/resolver.controller.ts

@@ -0,0 +1,35 @@
+import {
+  Body,
+  Controller,
+  HttpCode,
+  HttpStatus,
+  Param,
+  Post,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { ResolverService } from '../service/resolver.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller()
+export class ResolverController {
+  constructor(private readonly resolverService: ResolverService) {}
+
+  @Post('getResolvedData/:type')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getResolvedListMasterItems(
+    @Body() entityData: any,
+    @Param('type') type: string,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    const entityType = type;
+
+    return await this.resolverService.getResolvedData(
+      loggedInUser,
+      entityData,
+      entityType,
+    );
+  }
+}

package/src/module/resolver/resolver.module.ts

@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+import { ResolverService } from './service/resolver.service';
+import { ResolverController } from './controller/resolver.controller';
+import { EntityModule } from '../meta/entity.module';
+
+@Module({
+  imports: [EntityModule],
+  controllers: [ResolverController],
+  providers: [ResolverService],
+  exports: [ResolverService],
+})
+export class ResolverModule {}

package/src/module/resolver/service/resolver.service.ts

@@ -0,0 +1,84 @@
+import { DataSource } from 'typeorm';
+import { Injectable } from '@nestjs/common';
+import { UserData } from 'src/module/user/entity/user.entity';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+
+@Injectable()
+export class ResolverService extends EntityServiceImpl {
+  constructor(private readonly dataSource: DataSource) {
+    super();
+  }
+
+  async getResolvedData(
+    loggedInUser: UserData,
+    entityData: any,
+    entityType: string,
+  ): Promise<any> {
+    const attributeItems = await this.dataSource.query(
+      `SELECT * FROM cr_attribute_master WHERE mapped_entity_type = ? AND organization_id = ?`,
+      [entityType, loggedInUser.organization_id],
+    );
+
+    const resolvedEntityData = { ...entityData };
+
+    for (const attr of attributeItems) {
+      const field = attr.attribute_key;
+      const codeValue = entityData[field];
+
+      if (!codeValue) continue;
+
+      // -------- ENTITY data_source_type --------
+      if (attr.data_source_type === 'entity') {
+        if (Array.isArray(codeValue)) {
+          const resolvedValues: string[] = [];
+
+          for (const code of codeValue) {
+            const item = await super.getEntityData(
+              attr.datasource_list,
+              code,
+              loggedInUser,
+            );
+            resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+          }
+
+          resolvedEntityData[field] = resolvedValues;
+        } else {
+          const item = await super.getEntityData(
+            attr.datasource_list,
+            codeValue,
+            loggedInUser,
+          );
+          resolvedEntityData[field] =
+            item?.[attr.data_source_attribute] ?? codeValue;
+        }
+      }
+
+      // -------- MASTER data_source_type --------
+      else if (attr.data_source_type === 'master') {
+        if (Array.isArray(codeValue)) {
+          const resolvedValues: string[] = [];
+
+          for (const code of codeValue) {
+            const [item] = await this.dataSource.query(
+              `SELECT * FROM cr_list_master_items WHERE id = ? AND organization_id = ?`,
+              [code, loggedInUser.organization_id],
+            );
+            resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+          }
+
+          resolvedEntityData[field] = resolvedValues;
+        } else {
+          const [item] = await this.dataSource.query(
+            `SELECT * FROM cr_list_master_items WHERE id = ? AND organization_id = ?`,
+            [codeValue, loggedInUser.organization_id],
+          );
+
+          resolvedEntityData[field] =
+            item?.[attr.data_source_attribute] ?? codeValue;
+        }
+      }
+    }
+
+    return resolvedEntityData;
+  }
+}