rez_core 2.2.162 → 2.2.164

package/package.json

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

package/src/module/user/controller/login.controller.ts

@@ -92,17 +92,13 @@ export class LoginController {
             actualState,
           );
 
-        return res.status(200).json({
-          success: true,
-          message: 'Gmail configuration saved successfully',
-          hubId: result.hubId,
-          configId: result.configId,
-        });
+        return res.redirect(
+          `${this.configService.get('BASE_URL')}`,
+        );
       } catch (error) {
-        return res.status(500).json({
-          success: false,
-          error: error.message,
-        });
+        return res.redirect(
+          `${this.configService.get('BASE_URL')}`,
+        );
       }
     }
 

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

@@ -110,7 +110,7 @@ export class StageGroupRepository {
     const meetingCounts = await this.dataSource.query(
       `
     SELECT stage_id, COUNT(*) AS meeting_count
-    FROM cr_lead_meeting
+    FROM crm_lead_meeting
     WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND lead_id = ?
     GROUP BY stage_id
     `,
@@ -121,7 +121,7 @@ export class StageGroupRepository {
     const sendCommCounts = await this.dataSource.query(
       `
     SELECT stage_id, COUNT(*) AS send_comm_count
-    FROM cr_lead_communication
+    FROM crm_lead_communication
     WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND lead_id = ?
     AND type IN ('SEND', 'LOG')
     GROUP BY stage_id

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

@@ -124,6 +124,18 @@ export class WorkflowMetaService extends EntityServiceImpl {
       loggedInUser,
     );
 
+    await this.taskService.createSystemNote(
+      {
+        reason_code: reason_code || '',
+        remark: remark || '',
+        mapped_entity_id,
+        stage_id: currentStage.stage_id,
+        action_id: currentStage.action_id,
+        stage_group_id: currentStage.stage_group_id,
+      },
+      loggedInUser,
+    );
+
     // Case 1: First stage – initialize
     if (!currentStage) {
       const getAllResult = await this.getFirstStage(
@@ -235,7 +247,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
           error?.message || error,
         );
       }
-
       return `Moved to next stage (Stage ID: ${nextStage.id}).`;
     }
 
@@ -244,18 +255,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
     currentStage.is_current = 'N';
     await this.stageMovementRepo.save(currentStage);
 
-    await this.taskService.createSystemNote(
-      {
-        reason_code: reason_code || '',
-        remark: remark || '',
-        mapped_entity_id,
-        stage_id: currentStage.stage_id,
-        action_id: currentStage.action_id,
-        stage_group_id: currentStage.stage_group_id,
-      },
-      loggedInUser,
-    );
-
     return 'Workflow completed. No next stage available.';
   }
 
@@ -387,7 +386,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
     );
 
     await this.dataSource.query(
-      `UPDATE cr_lead_meeting SET user_id=?
+      `UPDATE crm_lead_meeting SET user_id=?
       WHERE stage_id = ? 
       AND lead_id = ? 
       AND (status='scheduled' OR status='rescheduled')