rez_core 2.2.86 → 2.2.88

package/package.json

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

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

@@ -10,11 +10,15 @@ import {
 import { EntityTableService } from '../service/entity-table.service';
 import { Response } from 'express';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
+import { PopulateMetaService } from '../service/populate-meta.service';
 
 @Controller('meta')
 @UseGuards(JwtAuthGuard)
 export class MetaController {
-  constructor(private readonly entityTableService: EntityTableService) {}
+  constructor(
+    private readonly entityTableService: EntityTableService,
+    private readonly populateMetaService: PopulateMetaService,
+  ) {}
 
   @Post('get-table-data')
   async getTableMetaData(
@@ -36,4 +40,16 @@ export class MetaController {
       message: 'Data fetch successfully!',
     });
   }
+
+  @Post('populate')
+  async populateMetaData(
+    @Query('organization_id') organizationId: number,
+    @Res() response: Response,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    const result =
+      await this.populateMetaService.populateMetaData(organizationId);
+    return response.status(HttpStatus.OK).json(result);
+  }
 }

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

@@ -52,7 +52,11 @@ export class PopulateMetaService {
   // }
 
   async populateMetaData(organization_id: number) {
-    const metadataTables = ['cr_entity_master', 'cr_attribute_master'];
+    const metadataTables = [
+      'cr_entity_master',
+      'cr_attribute_master',
+      'cr_view_master',
+    ];
     const entityTypeToNewIdMap = new Map<string, number>();
 
     // Step 1: Insert basic metadata tables

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

@@ -80,13 +80,15 @@ export class ActionController {
     @Body('stage_id') stage_id: number,
     @Body('mapped_entity_id') mapped_entity_id: number,
     @Body('mapped_entity_type') mapped_entity_type: string,
+    @Body('action_id') action_id: number,
   ) {
     const loggedInUser = req.user.userData;
     const result = this.actionDataService.resubmitAction(
       loggedInUser,
-      stage_id,
-      mapped_entity_id,
       mapped_entity_type,
+      mapped_entity_id,
+      stage_id,
+      action_id,
     );
     return result;
   }

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

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { ActionDataEntity } from '../entity/action-data.entity';
 import { DataSource, LessThan, Repository } from 'typeorm';
@@ -45,6 +45,8 @@ export class ActionDataRepository extends EntityServiceImpl {
           user_id: loggedInUser.id,
           action_id: act.id,
           sequence: act.sequence,
+          name: act.name,
+          organization_id: loggedInUser.organization_id,
           mapped_entity_id,
           mapped_entity_type,
           is_current: isFirst ? 'Y' : null,
@@ -124,9 +126,10 @@ export class ActionDataRepository extends EntityServiceImpl {
 
   async resubmitAction(
     organization_id: number,
-    stage_id: number,
-    mapped_entity_id: number,
     mapped_entity_type: string,
+    mapped_entity_id: number,
+    stage_id: number,
+    action_id: number,
   ) {
     // Get the current active action
     const currentAction = await this.actionDataRepo.findOne({
@@ -135,6 +138,7 @@ export class ActionDataRepository extends EntityServiceImpl {
         stage_id,
         mapped_entity_id,
         mapped_entity_type,
+        action_id,
         is_current: 'Y',
       },
     });
@@ -165,6 +169,7 @@ export class ActionDataRepository extends EntityServiceImpl {
     currentAction.is_current = null as any;
     currentAction.modified_date = new Date();
     currentAction.modified_by = organization_id;
+    currentAction.start_time = null as any;
     currentAction.resubmit_count = (currentAction.resubmit_count ?? 0) + 1;
 
     await this.actionDataRepo.update(currentAction.id, currentAction);
@@ -173,6 +178,8 @@ export class ActionDataRepository extends EntityServiceImpl {
     previousAction.is_current = 'Y';
     previousAction.modified_date = new Date();
     previousAction.modified_by = organization_id;
+    previousAction.end_time = null as any; // Reset end time
+    previousAction.is_done = true;
     await this.actionDataRepo.update(previousAction.id, previousAction);
 
     // reverse the status of tasks for the previous action

package/src/module/workflow/repository/task.repository.ts

@@ -54,6 +54,7 @@ export class TaskRepository {
           stage_id: act.stage_id,
           user_id: loggedInUser.id,
           action_id: act.id,
+          organization_id: loggedInUser.organization_id,
           name: act.name,
           sequence: act.sequence,
           is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,

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

@@ -45,16 +45,18 @@ export class ActionDataService extends EntityServiceImpl {
 
   async resubmitAction(
     loggedInUser: UserData,
-    stage_id: number,
-    mapped_entity_id: number,
     mapped_entity_type: string,
+    mapped_entity_id: number,
+    stage_id: number,
+    action_id: number,
   ) {
     const { organization_id } = loggedInUser;
     return this.actionDataRepo.resubmitAction(
       organization_id,
-      stage_id,
-      mapped_entity_id,
       mapped_entity_type,
+      mapped_entity_id,
+      stage_id,
+      action_id,
     );
   }
 }

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

@@ -97,23 +97,21 @@ export class ActionService extends EntityServiceImpl {
       }
     }
 
-    // ➕ Step 5: Resource mapping for form (if form is sent)
-    if (actionData.form && actionData.form.length > 0) {
-      for (const formId of actionData.form) {
-        const resourceMapping = {
-          stg_act_mapping_id: stageActionMappingData.id,
-          form_id: formId,
-          type: 'form',
-          entity_type: 'ARMS',
-          form_entity_type: 'LEAD',
-        } as any;
+    await this.dataSource.query(
+      `DELETE FROM cr_wf_action_resources_mapping WHERE stg_act_mapping_id = ? AND type = 'form'`,
+      [stageActionMappingData.id],
+    );
 
-        if (entityData?.organization_id) {
-          resourceMapping.organization_id = entityData.organization_id;
-        }
+    if (actionData.form) {
+      const resourceMapping = {
+        stg_act_mapping_id: stageActionMappingData.id,
+        organization_id: entityData.organization_id,
+        form_id: actionData.form,
+        type: 'form',
+        entity_type: 'ARMS',
+      } as any;
 
-        await super.createEntity(resourceMapping, loggedInUser);
-      }
+      await super.createEntity(resourceMapping, loggedInUser);
     }
 
     return actionData;

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

@@ -272,6 +272,16 @@ export class PopulateWorkflowService extends EntityServiceImpl {
 
         console.log(`Matched new mandatory item:`, matchedNewMandatory);
 
+        const formActionCategory = await this.dataSource.query(
+          `SELECT id FROM cr_wf_action_category WHERE id = ? and is_form = 1`,
+          [row.action_category],
+        );
+
+        //get view master form
+        const formViewMaster = await this.dataSource.query(
+          `SELECT id FROM cr_view_master WHERE code = "LEAD_FORM"`,
+        );
+
         // Step 4: Use the matched new item's id (if found)
         await this.actionService.createEntity(
           {
@@ -282,6 +292,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
             action_requirement: matchedNewMandatory?.id ?? null,
             level_id: organization_id,
             entity_type: 'ACTN',
+            form: formActionCategory.length > 0 ? formViewMaster[0]?.id : null,
           },
           loggedInUser,
         );

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

@@ -252,6 +252,11 @@ export class TaskService extends EntityServiceImpl {
       task.task_status = task.status
         ? statusMap.get(String(task.status)) || null
         : null;
+
+      task.action_name =
+        task.action_id === '0' || task.action_id === 0
+          ? 'Generic'
+          : task.action_name;
     }
 
     // Normalize is_mandatory to '0'/'1' as string