rez_core 2.2.147 → 2.2.149

package/package.json

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

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -15,8 +15,7 @@ export class LayoutPreferenceService extends EntityServiceImpl {
   }
 
   async createEntity(entityData: BaseEntity, loggedInUser: UserData) {
-
-    const { mapped_entity_type,type } = entityData as any;
+    const { mapped_entity_type, type } = entityData as any;
     const userId = loggedInUser?.id;
 
     if (userId === undefined) {
@@ -30,7 +29,7 @@ export class LayoutPreferenceService extends EntityServiceImpl {
         loggedInUser.level_id,
         loggedInUser.level_type,
         userId,
-        type  
+        type,
       );
 
     console.log(existingLayoutPreference, 'existingLayoutPreference');
@@ -57,7 +56,7 @@ export class LayoutPreferenceService extends EntityServiceImpl {
     mapped_entity_type,
     mapped_level_id,
     mapped_level_type,
-    type
+    type,
   ) {
     const layoutPreference =
       await this.layoutPreferenceRepository.findByEntityUserId(
@@ -65,10 +64,15 @@ export class LayoutPreferenceService extends EntityServiceImpl {
         mapped_level_id,
         mapped_level_type,
         user_id,
-        type
+        type,
       );
 
-    return layoutPreference;
+    if (layoutPreference) {
+      return layoutPreference;
+    }
+    return {
+      mapped_json: {},
+    };
   }
 
   async getColumnValue(

package/src/module/meta/controller/view-master.controller.ts

@@ -1,3 +1,4 @@
+import { log } from 'console';
 import {
   Controller,
   Get,
@@ -24,7 +25,10 @@ export class ViewMasterController {
     @Query('entity_type') entityType: string,
     @Query('type') type: string,
     @Res() res: Response,
+    @Req() req: Request & { user: any },
   ) {
+    const loggedInUser = req.user.userData;
+
     try {
       if (!entityType || !type) {
         return res.status(HttpStatus.BAD_REQUEST).json({

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

@@ -32,4 +32,7 @@ export class ActionEntity extends BaseEntity {
 
   @Column({ nullable: true })
   user_id: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  assignment_type: string;
 }

package/src/module/workflow/repository/stage-movement.repository.ts

@@ -189,7 +189,7 @@ export class StageMovementRepository {
       ac.code AS action_category_code,
       arm.form_id
     FROM cr_wf_action a
-    INNER JOIN cr_wf_stage_action_mapping m ON a.id = m.action_id
+    LEFT JOIN cr_wf_stage_action_mapping m ON a.id = m.action_id
     LEFT JOIN cr_wf_action_category ac ON a.action_category = ac.id
     LEFT JOIN cr_wf_action_resources_mapping arm ON m.id = arm.stg_act_mapping_id
     WHERE m.stage_id = ?

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

@@ -257,6 +257,23 @@ export class WorkflowMetaService extends EntityServiceImpl {
       return 'No actions found for this stage.';
     }
 
+    // check whether first action's action_category is owner_assignment and assignment_type is AUTO_ASSIGN
+    const firstAction = actions[0];
+    let actionCategory = await this.dataSource.query(
+      `SELECT code FROM cr_wf_action_category WHERE id = ${Number(firstAction.action_category)}`,
+    );
+
+    let assignmentType = await this.dataSource.query(
+      `SELECT value FROM cr_list_master_items WHERE id = ${Number(firstAction.assignment_type)}`,
+    );
+    if (
+      actionCategory[0]?.code === 'OWAS' &&
+      assignmentType[0]?.value == 'round_robin'
+    ) {
+      console.log('Auto-assigning owner based on round-robin assignment type');
+      await this.assignLead(loggedInUser);
+    }
+
     // save in action data
     await this.actionDataService.saveActionData(
       actions,
@@ -272,5 +289,101 @@ export class WorkflowMetaService extends EntityServiceImpl {
       mapped_entity_id,
       mapped_entity_type,
     );
+
+    if (
+      actionCategory[0]?.code == 'OWAS' &&
+      assignmentType[0]?.value == 'round_robin'
+    ) {
+      console.log('Auto-assigning owner based on round-robin assignment type');
+      await this.assignLead(loggedInUser);
+      // move task
+      await this.taskService.moveTask(loggedInUser, {
+        mapped_entity_type,
+        mapped_entity_id,
+        stage_id,
+        action_id: firstAction.id,
+      });
+
+      // if it has only one action then move next stage
+      if (actions.length == 1) {
+        console.log(
+          'Only one action present and it is owner assignment. Moving to next stage.',
+        );
+        await this.moveToNextStage(
+          mapped_entity_type,
+          mapped_entity_id,
+          loggedInUser,
+        );
+      }
+    }
+  }
+
+  async assignLead(loggedInUser: UserData): Promise<number> {
+    const { organization_id, level_id, level_type } = loggedInUser;
+
+    // 1) Get eligible owners (distinct + stable ordering)
+    const owners: Array<{ id: number }> = await this.dataSource.query(
+      `
+    SELECT DISTINCT u.id
+    FROM cr_user u
+    JOIN cr_user_role_mapping urm   ON u.id = urm.user_id
+    JOIN cr_role r                  ON urm.role_id = r.id
+    JOIN cr_module_access ma        ON ma.role_code = r.code
+    WHERE urm.organization_id = ?
+      AND urm.level_id = ?
+      AND urm.level_type = ?
+      AND urm.appcode = 'CRM'
+      AND ma.appcode = 'CRM'
+      AND ma.module_code = 'lead_crm_sch'
+      AND ma.access_flag = 1
+      AND ma.action_type = 'LEAD_OWNER'
+    ORDER BY u.id ASC
+    `,
+      [organization_id, Number(level_id), level_type],
+    );
+
+    if (!owners?.length) throw new Error('No eligible users found');
+    const userIds = owners.map((o) => Number(o.id)); // normalize to numbers
+
+    // 2) Find the last assigned *eligible* owner (use IN (...))
+    const placeholders = userIds.map(() => '?').join(',');
+    const lastRow: Array<{ lead_owner: number }> = await this.dataSource.query(
+      `
+    SELECT lead_owner
+    FROM crm_lead
+    WHERE organization_id = ?
+      AND level_id = ?
+      AND level_type = ?
+      AND lead_owner IN (${placeholders})
+    ORDER BY created_date DESC
+    LIMIT 1
+    `,
+      [organization_id, Number(level_id), level_type, ...userIds],
+    );
+
+    const lastAssigned = lastRow.length ? Number(lastRow[0].lead_owner) : null;
+
+    // 3) Compute next user in round-robin
+    const lastIdx = lastAssigned != null ? userIds.indexOf(lastAssigned) : -1;
+    const nextIdx = (lastIdx + 1) % userIds.length;
+    const nextUser = userIds[nextIdx];
+
+    //4) Update lead owner in the lead table
+    await this.dataSource.query(
+      `
+    UPDATE crm_lead
+    SET lead_owner = ?
+    WHERE organization_id = ?
+      AND level_id = ?
+      AND level_type = ?
+      AND lead_owner IS NULL
+    ORDER BY created_date ASC
+    LIMIT 1
+    `,
+      [nextUser, organization_id, Number(level_id), level_type],
+    );
+
+    console.log(`Assigning lead to user ID: ${nextUser}`);
+    return nextUser;
   }
 }