rez_core 4.0.19 → 4.0.21

package/package.json

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

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

@@ -65,6 +65,14 @@ export class PopulateMetaService {
     );
     const status = getStatus[0]?.id ? getStatus[0].id : 'ACTIVE';
 
+    let oneToManyId = await this.dataSource.query(
+      `SELECT id FROM frm_list_master_items WHERE value = 'ONE_TO_MANY' AND organization_id = ${organization_id}`,
+    )
+
+    let oneToOneId = await this.dataSource.query(
+      `SELECT id FROM frm_list_master_items WHERE value = 'ONE_TO_MANY' AND organization_id = ${organization_id}`,
+    )
+
     // Step 1: Insert basic metadata tables
     for (const table of metadataTables) {
       const factoryData = await this.dataSource.query(
@@ -99,7 +107,19 @@ export class PopulateMetaService {
             status: status,
           }),
         );
-      } else {
+      } 
+      else if (table === 'frm_entity_relation') {
+        transformedData = factoryData.map(
+          ({ id, created_date, modified_date, ...rest }) => ({
+          ...rest,
+            organization_id,
+            level_type: 'ORG',
+            level_id: organization_id,
+            status: status,
+            relation_id:rest.relation_type=="ONE_TO_ONE"?oneToOneId[0].id:oneToManyId[0].id
+          }),
+        );
+      }else {
         transformedData = factoryData.map(
           ({ id, created_date, modified_date, ...rest }) => ({
             ...rest,

package/src/module/workflow/controller/action-template-mapping.controller.ts

@@ -17,7 +17,7 @@ export class ActionTemplateMappingController {
     private readonly actionTemplateMappingService: ActionTemplateMappingService,
   ) {}
 
-  @Post('/get-template')
+  @Post('/get-template-by-mode')
   @HttpCode(HttpStatus.OK)
   async getTemplate(
     @Body() body: { stage_id: number; action_id: number; mode: number },
@@ -27,8 +27,8 @@ export class ActionTemplateMappingController {
     const result = this.actionTemplateMappingService.getTemplateByMode(
       body.stage_id,
       body.action_id,
-      body.mode,
       loggedInUser,
+      body.mode,
     );
     return result;
   }

package/src/module/workflow/repository/action-data.repository.ts

@@ -269,7 +269,7 @@ export class ActionDataRepository extends EntityServiceImpl {
 
       const { level_id } = loggedInUser;
 
-      const url = `${baseUrl}/entity/public/getById/${level_id}?entity_type=ORG&${queryParams}`;
+      const url = `${baseUrl}/organization/public/${level_id}?entity_type=ORGP&${queryParams}`;
 
       const response = await axios.get(url);
       console.log('Internal Entity API response:', response.data);
@@ -281,7 +281,7 @@ export class ActionDataRepository extends EntityServiceImpl {
       console.error('Internal Entity API call failed:', error.message);
     }
 
-    const org_slug = organizationData?.slug;
+    const org_slug = organizationData[0]?.slug;
 
     // fetch required var from config or env
     const profile = this.configService.get('PROFILE');

package/src/module/workflow/service/action-template-mapping.service.ts

@@ -1,3 +1,4 @@
+import { level } from 'winston';
 import { Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { DataSource } from 'typeorm';
@@ -10,8 +11,8 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
   async getTemplateByMode(
     stage_id: number,
     action_id: number,
-    mode: number,
     loggedInUser,
+    mode?: number,
   ) {
     const stageAction = await this.dataSource.query(
       `
@@ -24,6 +25,17 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
 
     const stgActMappingId = stageAction[0].id;
 
+    if (!mode) {
+      const getModeFromAction = await this.dataSource.query(
+        `
+        SELECT mode FROM frm_wf_action
+        WHERE id = ?
+        `,
+        [action_id],
+      );
+      mode = getModeFromAction[0]?.mode;
+    }
+
     const templates = await this.dataSource.query(
       `
       SELECT template_code FROM frm_wf_action_resources_mapping
@@ -31,12 +43,6 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       `,
       [stgActMappingId],
     );
-    const listMasterItemData = await this.dataSource.query(
-      `SELECT code FROM frm_list_master_items WHERE id = ?`,
-      [mode],
-    );
-
-    if (!listMasterItemData?.length) return [];
 
     const templateCodes = templates.map((t) => t.template_code);
     if (!templateCodes.length) return [];
@@ -45,9 +51,15 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       `
   SELECT id, name
   FROM frm_wf_comm_template
-  WHERE code IN (?) AND mode = ? AND organization_id = ?
+  WHERE code IN (?) AND mode = ? AND organization_id = ? AND level_type = ? AND level_id = ?
   `,
-      [templateCodes, listMasterItemData[0].code, loggedInUser.organization_id],
+      [
+        templateCodes,
+        mode,
+        loggedInUser.organization_id,
+        loggedInUser.level_type,
+        loggedInUser.level_id,
+      ],
     );
 
     return commTemplates;

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

@@ -191,7 +191,8 @@ export class ActionService extends EntityServiceImpl {
           entity_type: 'WFAR',
         } as any;
 
-        await super.createEntity(resourceMapping, loggedInUser);
+        const res = await super.createEntity(resourceMapping, loggedInUser);
+        console.log(res);
       }
     }