rez_core 2.2.90 → 2.2.92

package/package.json

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

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

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

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

@@ -1,3 +1,4 @@
+import { DataSource } from 'typeorm';
 import {
   BadRequestException,
   forwardRef,
@@ -19,6 +20,7 @@ export class ListMasterItemService extends EntityServiceImpl {
     @Inject(forwardRef(() => EntityServiceImpl))
     private readonly entityServiceImpl: EntityServiceImpl,
     protected readonly attributeMasterService: AttributeMasterService,
+    private readonly dataSource: DataSource,
   ) {
     super();
   }
@@ -183,6 +185,19 @@ export class ListMasterItemService extends EntityServiceImpl {
     return `Item with name ${code} deleted successfully from type ${listType}`;
   }
 
+  async getListSourceType(
+    loggedInUser: UserData,
+    source: string,
+  ): Promise<any> {
+    const data = await this.dataSource.query(
+      `SELECT name AS label, type AS value
+     FROM cr_list_master
+     WHERE organization_id = ? AND source = ?`,
+      [loggedInUser.organization_id, source],
+    );
+    return data;
+  }
+
   // async getResolvedListMasterItems(
   //   loggedInUser: UserData,
   //   entityData: any,

package/src/module/workflow/service/action.service.ts

@@ -106,6 +106,7 @@ export class ActionService extends EntityServiceImpl {
       const resourceMapping = {
         stg_act_mapping_id: stageActionMappingData.id,
         organization_id: entityData.organization_id,
+        level_id: entityData.level_id,
         form_id: actionData.form,
         type: 'form',
         entity_type: 'ARMS',

package/src/module/workflow/service/populate-workflow.service.ts

@@ -279,7 +279,8 @@ export class PopulateWorkflowService extends EntityServiceImpl {
 
         //get view master form
         const formViewMaster = await this.dataSource.query(
-          `SELECT id FROM cr_view_master WHERE code = "LEAD_FORM"`,
+          `SELECT id FROM cr_view_master WHERE code = "LEAD_FORM" and organization_id = ?`,
+          [organization_id],
         );
 
         // Step 4: Use the matched new item's id (if found)