rez_core 3.1.192 → 3.1.194

package/dist/module/meta/service/entity-relation.service.js

@@ -19,12 +19,12 @@ let EntityRelationService = class EntityRelationService extends entity_service_i
         this.dataSource = dataSource;
     }
     async getEntityRelations(entityType, loggedInUser, includeSelf = false) {
-        const relations = await this.dataSource.query(`SELECT name as label, target_entity_type as value, id 
-       FROM cr_entity_relation 
+        const relations = await this.dataSource.query(`SELECT name as label, target_entity_type as value, id 
+       FROM cr_entity_relation 
        WHERE source_entity_type = ? AND organization_id = ?`, [entityType, loggedInUser.organization_id]);
         if (includeSelf) {
-            const [entity] = await this.dataSource.query(`SELECT name as label 
-         FROM cr_entity_master 
+            const [entity] = await this.dataSource.query(`SELECT name as label 
+         FROM cr_entity_master 
          WHERE mapped_entity_type = ? AND organization_id = ?`, [entityType, loggedInUser.organization_id]);
             if (entity) {
                 relations.unshift({
@@ -39,13 +39,13 @@ let EntityRelationService = class EntityRelationService extends entity_service_i
     async getRelatedEntityIds(sourceEntity, targetEntity, targetIds, orgId) {
         if (!targetIds.length)
             return [];
-        const result = await this.dataSource.query(`
-      SELECT DISTINCT source_entity_id
-      FROM cr_entity_relation_data
-      WHERE source_entity_type = ?
-        AND target_entity_type = ?
-        AND target_entity_id IN (?)
-        AND organization_id = ?
+        const result = await this.dataSource.query(`
+      SELECT DISTINCT source_entity_id
+      FROM cr_entity_relation_data
+      WHERE source_entity_type = ?
+        AND target_entity_type = ?
+        AND target_entity_id IN (?)
+        AND organization_id = ?
       `, [sourceEntity, targetEntity, targetIds, orgId]);
         return result.map((r) => r.source_entity_id);
     }

package/dist/module/meta/service/entity-service-impl.service.js

@@ -50,9 +50,9 @@ let EntityServiceImpl = class EntityServiceImpl {
             maxSeqNo = Number(maxSeqNo) + 1;
             entityData.code = entityData.entity_type + maxSeqNo;
         }
-        const statusList = await repo.query(`SELECT id
-       FROM cr_list_master_items
-       WHERE code = ?
+        const statusList = await repo.query(`SELECT id
+       FROM cr_list_master_items
+       WHERE code = ?
          AND organization_id = ?`, [global_constant_1.STATUS_ACTIVE, loggedInUser?.organization_id || -1]);
         console.log('Status List:', statusList);
         console.log(`status_code,${global_constant_1.STATUS_ACTIVE},statusList, ${loggedInUser?.organization_id}`);

package/dist/module/meta/service/resolver.service.js

@@ -125,12 +125,12 @@ let ResolverService = class ResolverService {
             displayValue === '') {
             return displayValue;
         }
-        const [attr] = await this.dataSource.query(`SELECT * FROM cr_entity_attribute 
+        const [attr] = await this.dataSource.query(`SELECT * FROM cr_entity_attribute 
        WHERE mapped_entity_type = ? AND organization_id = ? AND attribute_key = ?`, [entityType, loggedInUser.organization_id, attrKey]);
         if (!attr)
             return displayValue;
         if (attr.data_source_type === 'entity') {
-            const [entityDef] = await this.dataSource.query(`SELECT * FROM cr_entity_master 
+            const [entityDef] = await this.dataSource.query(`SELECT * FROM cr_entity_master 
          WHERE mapped_entity_type = ? AND organization_id = ?`, [attr.datasource_list, loggedInUser.organization_id]);
             if (!entityDef)
                 return displayValue;
@@ -145,7 +145,7 @@ let ResolverService = class ResolverService {
             return item?.id ?? displayValue;
         }
         else if (attr.data_source_type === 'master') {
-            const [item] = await this.dataSource.query(`SELECT id FROM cr_list_master_items 
+            const [item] = await this.dataSource.query(`SELECT id FROM cr_list_master_items 
          WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`, [displayValue, loggedInUser.organization_id]);
             return item?.id ?? displayValue;
         }

package/dist/module/module/repository/menu.repository.js

@@ -60,10 +60,10 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async getMenuItems(moduleCodes, appcode, levelType) {
         return await this.menuData
             .createQueryBuilder('menu')
-            .leftJoin('sso_module', 'module', `
-          menu.module_code = module.module_code
-          AND LOWER(menu.appcode) = LOWER(module.appcode)
-          AND menu.level_type = module.level_type
+            .leftJoin('sso_module', 'module', `
+          menu.module_code = module.module_code
+          AND LOWER(menu.appcode) = LOWER(module.appcode)
+          AND menu.level_type = module.level_type
         `)
             .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
             .andWhere('LOWER(menu.appcode) = LOWER(:appcode)', { appcode })
@@ -82,11 +82,11 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async resolveUserRoles(userId, appcode, levelType, levelId) {
         const repo = this.dataSource.getRepository(user_role_mapping_entity_1.UserRoleMapping);
         if (userId) {
-            const getUserDetails = await this.dataSource.query(`
-        SELECT * from sso_user where id = ?
+            const getUserDetails = await this.dataSource.query(`
+        SELECT * from sso_user where id = ?
       `, [userId]);
-            const getUserUrm = await this.dataSource.query(`
-        SELECT * from sso_user_role_mapping where user_id = ? and appcode = ?
+            const getUserUrm = await this.dataSource.query(`
+        SELECT * from sso_user_role_mapping where user_id = ? and appcode = ?
       `, [userId, appcode]);
             if (getUserDetails.length > 0 &&
                 getUserDetails[0].organization_id === 1) {
@@ -105,10 +105,10 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
         if (roles.length)
             return roles.map((r) => r.urm_role_id);
         if (levelType === 'SCH') {
-            const [sch] = await this.dataSource.query(`
-        SELECT s.brand_id, s.organization_id
-        FROM eth_school_profile s
-        WHERE s.id = ?
+            const [sch] = await this.dataSource.query(`
+        SELECT s.brand_id, s.organization_id
+        FROM eth_school_profile s
+        WHERE s.id = ?
       `, [levelId]);
             const brandId = sch?.brand_id;
             const orgId = sch?.organization_id;

package/dist/module/notification/service/notification.service.d.ts

@@ -1,11 +1,13 @@
 import { DataSource } from 'typeorm';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
 import * as admin from 'firebase-admin';
+import { ConfigService } from '@nestjs/config';
 export declare class NotificationsService {
     private readonly dataSource;
     private readonly mediaDataService;
+    private readonly configService;
     private readonly firebaseAdmin;
-    constructor(dataSource: DataSource, mediaDataService: MediaDataService, firebaseAdmin: typeof admin);
+    constructor(dataSource: DataSource, mediaDataService: MediaDataService, configService: ConfigService, firebaseAdmin: typeof admin);
     private tokens;
     saveToken(userId: string | undefined, token: string): Promise<{
         success: boolean;

package/dist/module/notification/service/notification.service.js

@@ -16,10 +16,13 @@ exports.NotificationsService = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("typeorm");
 const media_data_service_1 = require("../../meta/service/media-data.service");
+const axios_1 = require("axios");
+const config_1 = require("@nestjs/config");
 let NotificationsService = class NotificationsService {
-    constructor(dataSource, mediaDataService, firebaseAdmin) {
+    constructor(dataSource, mediaDataService, configService, firebaseAdmin) {
         this.dataSource = dataSource;
         this.mediaDataService = mediaDataService;
+        this.configService = configService;
         this.firebaseAdmin = firebaseAdmin;
         this.tokens = new Map();
     }
@@ -63,14 +66,11 @@ let NotificationsService = class NotificationsService {
             const isReadBool = String(filterQuery.is_read).toLowerCase() === 'true';
             isReadFilter = isReadBool ? 1 : 0;
         }
-        let query = `
-    SELECT
-      n.*,
-      u.name AS user_name,
-      u.profile_image AS user_profile
-    FROM cr_notification n
-    LEFT JOIN eth_user_profile u ON n.user_id = u.parent_id
-    WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
+        let query = `
+    SELECT
+      n.*
+    FROM cr_notification n
+    WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
   `;
         const params = [id, level_id, level_type];
         if (isReadFilter !== undefined) {
@@ -82,25 +82,32 @@ let NotificationsService = class NotificationsService {
         const mediaCache = new Map();
         for (const notification of notifications) {
             notification.is_read = !!notification.is_read;
-            if (notification.user_profile) {
-                if (!mediaCache.has(notification.user_profile)) {
-                    const url = await this.mediaDataService.getMediaDownloadUrl(notification.user_profile, loggedInUser);
-                    mediaCache.set(notification.user_profile, url);
-                }
-                notification.user_profile = mediaCache.get(notification.user_profile);
+            try {
+                const baseUrl = this.configService.get('REDIRECT_BE_URL');
+                const queryParams = new URLSearchParams({
+                    loggedInUser: JSON.stringify(loggedInUser),
+                }).toString();
+                const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${notification?.user_id}?entity_type=UPR&${queryParams}`, {
+                    headers: {
+                        'Content-Type': 'application/json',
+                    },
+                });
+                console.log('✅ Internal Entity API response:', response.data);
+                notification.user_name = response.data.name;
+                notification.user_profile = response.data.profile_image;
             }
-            else {
-                notification.user_profile = null;
+            catch (error) {
+                console.error('⚠️ Internal Entity API call failed:', error.message);
             }
         }
         return notifications;
     }
     async markAllAsRead(loggedInUser) {
         const { id, level_id, level_type } = loggedInUser;
-        const query = `
-    UPDATE cr_notification
-    SET is_read = 1
-    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
+        const query = `
+    UPDATE cr_notification
+    SET is_read = 1
+    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
   `;
         const params = [id, level_id, level_type];
         const result = await this.dataSource.query(query, params);
@@ -110,8 +117,9 @@ let NotificationsService = class NotificationsService {
 exports.NotificationsService = NotificationsService;
 exports.NotificationsService = NotificationsService = __decorate([
     (0, common_1.Injectable)(),
-    __param(2, (0, common_1.Inject)('FIREBASE_ADMIN')),
+    __param(3, (0, common_1.Inject)('FIREBASE_ADMIN')),
     __metadata("design:paramtypes", [typeorm_1.DataSource,
-        media_data_service_1.MediaDataService, Object])
+        media_data_service_1.MediaDataService,
+        config_1.ConfigService, Object])
 ], NotificationsService);
 //# sourceMappingURL=notification.service.js.map

package/dist/module/notification/service/notification.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"notification.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/notification.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"notification.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/notification.service.ts"],"names":[],"mappings":"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"}

package/dist/module/user/controller/login.controller.js

@@ -57,27 +57,27 @@ let LoginController = class LoginController {
             try {
                 const actualState = state.replace('gmail_config:', '');
                 const result = await this.integrationService.handleGmailTokensCallback(email, googleAccessToken, googleRefreshToken, actualState);
-                return res.send(`<html><body><script>
-    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
-    window.close();
+                return res.send(`<html><body><script>
+    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
+    window.close();
   </script> <p>Configuration successful. You can close this window.</p> </body></html>`);
             }
             catch (error) {
-                return res.send(`
-         <html>
-        <body>
-          <script>
-            if (window.opener) {
-              window.opener.postMessage({ 
-                type: "CONFIG_FAILED", 
-                error: "${error.message || 'Something went wrong'}" 
-              }, "*");
-            }
-            window.close();
-          </script>
-          <p>Configuration failed. Please close this window.</p>
-        </body>
-      </html>
+                return res.send(`
+         <html>
+        <body>
+          <script>
+            if (window.opener) {
+              window.opener.postMessage({ 
+                type: "CONFIG_FAILED", 
+                error: "${error.message || 'Something went wrong'}" 
+              }, "*");
+            }
+            window.close();
+          </script>
+          <p>Configuration failed. Please close this window.</p>
+        </body>
+      </html>
         `);
             }
         }

package/dist/module/user/service/role.service.js

@@ -76,10 +76,10 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
             if (!existingRole) {
                 return { success: false, error: 'Role not found' };
             }
-            const associatedUsers = await this.entityManager.query(`SELECT map.*
-                                                              FROM sso_user_role_mapping map
-                                                                     JOIN sso_user usr ON map.user_id = usr.id
-                                                              WHERE usr.status = ${resolveStatus.id}
+            const associatedUsers = await this.entityManager.query(`SELECT map.*
+                                                              FROM sso_user_role_mapping map
+                                                                     JOIN sso_user usr ON map.user_id = usr.id
+                                                              WHERE usr.status = ${resolveStatus.id}
                                                                 and map.role_id = ${existingRole?.id}`);
             if (associatedUsers.length > 0) {
                 return {

package/dist/module/user/service/user-session.service.js

@@ -71,8 +71,8 @@ let UserSessionService = class UserSessionService {
         };
         let getUserDetails;
         if (currentUser) {
-            getUserDetails = await this.dataSource.query(`
-        SELECT * from sso_user where id = ?
+            getUserDetails = await this.dataSource.query(`
+        SELECT * from sso_user where id = ?
       `, [currentUser.id]);
         }
         if (getUserDetails[0].organization_id == 1 && payload.level_type == 'ORG') {

package/dist/module/workflow/controller/activity-log.controller.d.ts

@@ -6,8 +6,6 @@ export declare class ActivityLogController {
         user: any;
     }, mapped_entity_type: string, mapped_entity_id: string, category: string): Promise<{
         category: string;
-        user_name: any;
-        profile: any;
         created_date: string | null;
         mapped_entity_type: string;
         mapped_entity_id: string;

package/dist/module/workflow/repository/action.repository.js

@@ -24,10 +24,10 @@ let ActionRepository = class ActionRepository {
     }
     async getReasonCode(loggedInUser) {
         const { organization_id } = loggedInUser;
-        const result = await this.dataSource.query(`
-       SELECT name, type
-       FROM cr_list_master
-       WHERE organization_id = ? AND source = 'master'
+        const result = await this.dataSource.query(`
+       SELECT name, type
+       FROM cr_list_master
+       WHERE organization_id = ? AND source = 'master'
        `, [organization_id]);
         const formatted = result.map((item) => ({
             label: item.name,
@@ -40,10 +40,10 @@ let ActionRepository = class ActionRepository {
         if (!list_type) {
             throw new common_1.BadRequestException('list_type is required');
         }
-        const result = await this.dataSource.query(`
-    SELECT name, id 
-    FROM cr_list_master_items 
-    WHERE listtype = ? AND organization_id = ?
+        const result = await this.dataSource.query(`
+    SELECT name, id 
+    FROM cr_list_master_items 
+    WHERE listtype = ? AND organization_id = ?
     `, [list_type, organization_id]);
         return result.map((row) => ({
             label: row.name,
@@ -52,19 +52,19 @@ let ActionRepository = class ActionRepository {
     }
     async getActions(loggedInUser, stage_id) {
         const { organization_id } = loggedInUser;
-        const stageActions = await this.dataSource.query(`
-    SELECT id, action_id 
-    FROM cr_wf_stage_action_mapping 
-    WHERE stage_id = ?
+        const stageActions = await this.dataSource.query(`
+    SELECT id, action_id 
+    FROM cr_wf_stage_action_mapping 
+    WHERE stage_id = ?
     `, [stage_id]);
         if (!stageActions?.length)
             return [];
         const actionIds = stageActions.map((sa) => sa.action_id);
         const mappingIds = stageActions.map((sa) => sa.id);
-        const templateMappings = await this.dataSource.query(`
-    SELECT stg_act_mapping_id, template_code 
-    FROM cr_wf_action_template_mapping 
-    WHERE stg_act_mapping_id IN (${mappingIds.map(() => '?').join(',')})
+        const templateMappings = await this.dataSource.query(`
+    SELECT stg_act_mapping_id, template_code 
+    FROM cr_wf_action_template_mapping 
+    WHERE stg_act_mapping_id IN (${mappingIds.map(() => '?').join(',')})
     `, mappingIds);
         const templateCodes = templateMappings.map((tm) => tm.template_code);
         const templateCodeToName = {};

package/dist/module/workflow/repository/activity-log.repository.d.ts

@@ -1,6 +1,7 @@
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
 import { ActivityLog } from '../entity/activity-log.entity';
 import { Repository } from 'typeorm';
+import { ConfigService } from '@nestjs/config';
 export declare const ACTIVITY_CATEGORIES: {
     readonly ASSIGN: "ASSIGN";
     readonly INTERACTION: "INTERACTION";
@@ -18,11 +19,10 @@ export type ActivityCategoryType = keyof typeof ACTIVITY_CATEGORIES;
 export declare class ActivityLogRepository {
     private readonly activityLogRepository;
     private readonly mediaDataService;
-    constructor(activityLogRepository: Repository<ActivityLog>, mediaDataService: MediaDataService);
+    private readonly configService;
+    constructor(activityLogRepository: Repository<ActivityLog>, mediaDataService: MediaDataService, configService: ConfigService);
     getAllActivityLog(mapped_entity_type: string, mapped_entity_id: number | string, category: string | undefined, loggedInUser: any): Promise<{
         category: string;
-        user_name: any;
-        profile: any;
         created_date: string | null;
         mapped_entity_type: string;
         mapped_entity_id: string;

package/dist/module/workflow/repository/activity-log.repository.js

@@ -18,6 +18,8 @@ const media_data_service_1 = require("../../meta/service/media-data.service");
 const activity_log_entity_1 = require("../entity/activity-log.entity");
 const typeorm_2 = require("typeorm");
 const moment = require("moment");
+const axios_1 = require("axios");
+const config_1 = require("@nestjs/config");
 exports.ACTIVITY_CATEGORIES = {
     ASSIGN: 'ASSIGN',
     INTERACTION: 'INTERACTION',
@@ -32,18 +34,15 @@ exports.ACTIVITY_CATEGORIES = {
     STAGEGROUP: 'STAGE_GROUP',
 };
 let ActivityLogRepository = class ActivityLogRepository {
-    constructor(activityLogRepository, mediaDataService) {
+    constructor(activityLogRepository, mediaDataService, configService) {
         this.activityLogRepository = activityLogRepository;
         this.mediaDataService = mediaDataService;
+        this.configService = configService;
     }
     async getAllActivityLog(mapped_entity_type, mapped_entity_id, category, loggedInUser) {
         const { organization_id, id: loggedInUserId } = loggedInUser;
         const query = this.activityLogRepository
             .createQueryBuilder('log')
-            .leftJoin('sso_user', 'user', 'log.created_by = user.id')
-            .leftJoin('eth_user_profile', 'profile', 'profile.parent_id = user.id')
-            .addSelect('user.name', 'user_name')
-            .addSelect('profile.profile_image', 'profile_image')
             .where('log.mapped_entity_type = :mapped_entity_type', {
             mapped_entity_type,
         })
@@ -56,12 +55,32 @@ let ActivityLogRepository = class ActivityLogRepository {
         }
         query.orderBy('log.created_date', 'DESC');
         const rows = await query.getRawAndEntities();
+        if (rows?.entities) {
+            let user = null;
+            for (const param of rows?.entities) {
+                try {
+                    const baseUrl = this.configService.get('REDIRECT_BE_URL');
+                    const queryParams = new URLSearchParams({
+                        loggedInUser: JSON.stringify(loggedInUser),
+                    }).toString();
+                    const response = await axios_1.default.get(`${baseUrl}/users/profile-image-url/${param?.created_by}?entity_type=UPR&${queryParams}`, {
+                        headers: {
+                            'Content-Type': 'application/json',
+                        },
+                    });
+                    console.log('✅ Internal Entity API response:', response.data);
+                    user = response.data;
+                    param.user_name = user.name;
+                    param.profile_image = user.profile_image;
+                }
+                catch (error) {
+                    console.error('⚠️ Internal Entity API call failed:', error.message);
+                }
+            }
+        }
         const result = await Promise.all(rows.entities.map(async (entity, i) => {
             const profileImageId = rows.raw[i].profile_image;
             let profile = null;
-            if (profileImageId) {
-                profile = await this.mediaDataService.getMediaDownloadUrl(profileImageId, loggedInUser);
-            }
             const formattedLabel = entity.category
                 .toLowerCase()
                 .replace(/_/g, ' ')
@@ -69,8 +88,6 @@ let ActivityLogRepository = class ActivityLogRepository {
             return {
                 ...entity,
                 category: formattedLabel,
-                user_name: rows.raw[i].user_name,
-                profile,
                 created_date: entity.created_date
                     ? moment(entity.created_date).local().format('DD-MMM, hh:mm A')
                     : null,
@@ -107,6 +124,7 @@ exports.ActivityLogRepository = ActivityLogRepository;
 exports.ActivityLogRepository = ActivityLogRepository = __decorate([
     __param(0, (0, typeorm_1.InjectRepository)(activity_log_entity_1.ActivityLog)),
     __metadata("design:paramtypes", [typeorm_2.Repository,
-        media_data_service_1.MediaDataService])
+        media_data_service_1.MediaDataService,
+        config_1.ConfigService])
 ], ActivityLogRepository);
 //# sourceMappingURL=activity-log.repository.js.map

package/dist/module/workflow/repository/activity-log.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity-log.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/activity-log.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"activity-log.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/activity-log.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAmD;AACnD,8EAA8E;AAC9E,uEAA4D;AAC5D,qCAAqC;AACrC,iCAAiC;AACjC,iCAA0B;AAC1B,2CAA+C;AAElC,QAAA,mBAAmB,GAAG;IACjC,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,aAAa;IAC1B,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,YAAY;IACxB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE,aAAa;CACjB,CAAC;AAIX,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAChC,YAEmB,qBAA8C,EAC9C,gBAAkC,EAClC,aAA4B;QAF5B,0BAAqB,GAArB,qBAAqB,CAAyB;QAC9C,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;IAC5C,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CACrB,kBAA0B,EAC1B,gBAAiC,EACjC,QAA4B,EAC5B,YAAY;QAEZ,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC;QAE7D,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB;aACrC,kBAAkB,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,8CAA8C,EAAE;YACrD,kBAAkB;SACnB,CAAC;aACD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,eAAe,EAAE,CAAC;aACvE,QAAQ,CAAC,0CAA0C,EAAE;YACpD,gBAAgB;SACjB,CAAC,CAAC;QAEL,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,QAAQ,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAE7C,IAAI,IAAI,EAAE,QAAQ,EAAE,CAAC;YACnB,IAAI,IAAI,GAAQ,IAAI,CAAC;YACrB,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,QAAe,EAAE,CAAC;gBAC1C,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,iBAAiB,CAAC,CAAC;oBAGlE,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC;wBACtC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;qBAC3C,CAAC,CAAC,QAAQ,EAAE,CAAC;oBAGd,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAC9B,GAAG,OAAO,4BAA4B,KAAK,EAAE,UAAU,oBAAoB,WAAW,EAAE,EACxF;wBACE,OAAO,EAAE;4BACP,cAAc,EAAE,kBAAkB;yBACnC;qBACF,CACF,CAAC;oBAEF,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAC9D,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;oBACrB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;oBAC5B,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;gBAC3C,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YAEjD,IAAI,OAAO,GAAQ,IAAI,CAAC;YAQxB,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ;iBACnC,WAAW,EAAE;iBACb,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;iBAClB,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAElD,OAAO;gBACL,GAAG,MAAM;gBACT,QAAQ,EAAE,cAAc;gBACxB,YAAY,EAAE,MAAM,CAAC,YAAY;oBAC/B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC;oBAC/D,CAAC,CAAC,IAAI;aACT,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,gBAAiC,EACjC,kBAA0B,EAC1B,YAAiB;QAEjB,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;QAEzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB;aAC5C,kBAAkB,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,8BAA8B,EAAE,UAAU,CAAC;aAClD,KAAK,CAAC,8CAA8C,EAAE;YACrD,kBAAkB;SACnB,CAAC;aACD,QAAQ,CAAC,wCAAwC,EAAE,EAAE,eAAe,EAAE,CAAC;aACvE,QAAQ,CAAC,0CAA0C,EAAE;YACpD,gBAAgB;SACjB,CAAC;aAED,UAAU,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,MAAM,cAAc,GAAG,GAAG,CAAC,QAAQ;iBAChC,WAAW,EAAE;iBACb,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;iBAClB,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAClD,OAAO;gBACL,KAAK,EAAE,cAAc;gBACrB,KAAK,EAAE,GAAG,CAAC,QAAQ;aACpB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA5HY,sDAAqB;gCAArB,qBAAqB;IAE7B,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACU,oBAAU;QACf,qCAAgB;QACnB,sBAAa;GALpC,qBAAqB,CA4HjC"}

package/dist/module/workflow/repository/comm-template.repository.js

@@ -30,17 +30,17 @@ let CommTemplateRepository = class CommTemplateRepository {
         const { organization_id, level_id, level_type } = loggedInUser;
         let is_template;
         if (action_id) {
-            const [actionResult] = await this.dataSource.query(`SELECT is_template 
-       FROM cr_wf_action 
-       WHERE id = ? AND organization_id = ? 
+            const [actionResult] = await this.dataSource.query(`SELECT is_template 
+       FROM cr_wf_action 
+       WHERE id = ? AND organization_id = ? 
        LIMIT 1`, [action_id, organization_id]);
             if (!actionResult) {
                 throw new Error('Invalid action_id');
             }
             is_template = actionResult.is_template;
-            await this.dataSource.query(`UPDATE cr_wf_comm_template
-     SET is_template = ?
-     WHERE mapped_entity_type = ?
+            await this.dataSource.query(`UPDATE cr_wf_comm_template
+     SET is_template = ?
+     WHERE mapped_entity_type = ?
        AND organization_id = ? AND level_id = ? AND level_type=?`, [is_template, entity_type, organization_id, level_id, level_type]);
         }
         const whereCondition = {

package/dist/module/workflow/repository/form-master.repository.js

@@ -17,8 +17,8 @@ let FormMasterRepository = class FormMasterRepository {
         this.dataSource = dataSource;
     }
     async getForms(organization_id, source_entity_type) {
-        const forms = await this.dataSource.query(`SELECT fm.id as fm_id, fm.name as fm_form_name
-       FROM cr_entity_view fm
+        const forms = await this.dataSource.query(`SELECT fm.id as fm_id, fm.name as fm_form_name
+       FROM cr_entity_view fm
        WHERE fm.organization_id = ? AND fm.mapped_entity_type = ?`, [organization_id, source_entity_type]);
         const formatted = forms.map((form) => ({
             label: form.fm_form_name,

package/dist/module/workflow/repository/stage-group.repository.js

@@ -67,33 +67,33 @@ let StageGroupRepository = class StageGroupRepository {
         if (!stageGroups.length)
             return [];
         const stageGroupIds = stageGroups.map((sg) => sg.id);
-        const stagesRaw = await this.dataSource.query(`
-      SELECT
-        cr_wf_stage.*
-      FROM cr_wf_stage
-      WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
-        AND cr_wf_stage.organization_id = ?
-      ORDER BY cr_wf_stage.sequence ASC
+        const stagesRaw = await this.dataSource.query(`
+      SELECT
+        cr_wf_stage.*
+      FROM cr_wf_stage
+      WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
+        AND cr_wf_stage.organization_id = ?
+      ORDER BY cr_wf_stage.sequence ASC
     `, [...stageGroupIds, loggedInUser.organization_id]);
         const stageIds = stagesRaw.map((s) => s.id);
-        const taskCounts = await this.dataSource.query(`
-    SELECT stage_id, COUNT(*) AS task_count
-    FROM cr_wf_task_data
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND is_system=0 AND mapped_entity_id = ?
-    GROUP BY stage_id
+        const taskCounts = await this.dataSource.query(`
+    SELECT stage_id, COUNT(*) AS task_count
+    FROM cr_wf_task_data
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND is_system=0 AND mapped_entity_id = ?
+    GROUP BY stage_id
     `, [...stageIds, lead_id]);
-        const meetingCounts = await this.dataSource.query(`
-    SELECT stage_id, COUNT(*) AS meeting_count
-    FROM crm_lead_meeting
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
-    GROUP BY stage_id
+        const meetingCounts = await this.dataSource.query(`
+    SELECT stage_id, COUNT(*) AS meeting_count
+    FROM crm_lead_meeting
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
+    GROUP BY stage_id
     `, [...stageIds, lead_id]);
-        const sendCommCounts = await this.dataSource.query(`
-    SELECT stage_id, COUNT(*) AS send_comm_count
-    FROM crm_lead_communication
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
-    AND type IN ('SEND', 'LOG')
-    GROUP BY stage_id
+        const sendCommCounts = await this.dataSource.query(`
+    SELECT stage_id, COUNT(*) AS send_comm_count
+    FROM crm_lead_communication
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
+    AND type IN ('SEND', 'LOG')
+    GROUP BY stage_id
     `, [...stageIds, lead_id]);
         const taskCountMap = new Map(taskCounts.map((row) => [Number(row.stage_id), Number(row.task_count)]));
         const meetingCountMap = new Map(meetingCounts.map((row) => [