rez_core 3.1.122 → 3.1.124

package/package.json

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

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

@@ -59,6 +59,11 @@ export class PopulateMetaService {
     ];
     const entityTypeToNewIdMap = new Map<string, number>();
 
+    const getStatus = await this.dataSource.query(
+      `SELECT * FROM cr_list_master_items WHERE organization_id = ${organization_id} AND code = "STATUS_ACTIVE"`,
+    );
+    const status = getStatus[0]?.id ? getStatus[0].id : 'ACTIVE';
+
     // Step 1: Insert basic metadata tables
     for (const table of metadataTables) {
       const factoryData = await this.dataSource.query(
@@ -78,6 +83,7 @@ export class PopulateMetaService {
             level_id: organization_id,
             is_unique: rest.is_unique == 1 ? true : false,
             required: rest.required == 1 ? true : false,
+            status: status,
           }),
         );
       } else {
@@ -87,6 +93,7 @@ export class PopulateMetaService {
             organization_id,
             level_type: 'ORG',
             level_id: organization_id,
+            status: status,
           }),
         );
       }

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

@@ -119,29 +119,6 @@ export class PopulateWorkflowService extends EntityServiceImpl {
       }
     }
 
-    const defaultEntity = await this.dataSource.query(
-      `SELECT * FROM eth_entity WHERE organization_id = -1 AND level_type = 'ORG' AND level_id = -1 AND entity_type = 'ENT'`,
-    );
-
-    const defaultEntityData = defaultEntity[0];
-
-    defaultEntityData.organization_id = organization_id;
-    defaultEntityData.level_id = organization_id;
-
-    await this.dataSource.query(
-      `INSERT INTO eth_entity (entity_type, name, status, code, enterprise_id, organization_id, level_id, level_type) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
-      [
-        defaultEntityData.entity_type,
-        defaultEntityData.name,
-        defaultEntityData.status,
-        defaultEntityData.code,
-        defaultEntityData.enterprise_id,
-        organization_id,
-        organization_id,
-        defaultEntityData.level_type,
-      ],
-    );
-
     const workflowTables = [
       { table: 'cr_workflow', entityType: 'WRFW', service: 'workflowService' },
       {

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

@@ -64,8 +64,25 @@ export class WorkflowMetaService extends EntityServiceImpl {
     });
 
     if (!currentStage) {
-      // If no current stage found, return null
-      return null;
+      // Fetch the latest stage movement for the given entity
+      const latestMovement = await this.stageMovementRepo.findOne({
+        where: {
+          mapped_entity_type,
+          mapped_entity_id,
+        },
+        order: { id: 'DESC' }, // Get the most recent movement
+      });
+
+      if (!latestMovement) return null;
+
+      const getGroupName = await this.dataSource.query(
+        `SELECT name FROM cr_wf_stage_group WHERE id = ${latestMovement?.stage_group_id}`,
+      );
+
+      return {
+        ...latestMovement,
+        stage_group_name: getGroupName[0]?.name,
+      };
     }
 
     // get group name for the current stage