rez_core 5.0.84 → 5.0.86

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

@@ -17,40 +17,38 @@ const common_1 = require("@nestjs/common");
 const typeorm_1 = require("typeorm");
 const menu_entity_1 = require("../entity/menu.entity");
 const module_access_entity_1 = require("../entity/module-access.entity");
-const user_role_mapping_entity_1 = require("../../user/entity/user-role-mapping.entity");
-const role_entity_1 = require("../../user/entity/role.entity");
 const typeorm_2 = require("@nestjs/typeorm");
 const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 let MenuRepository = class MenuRepository extends typeorm_1.Repository {
-    constructor(dataSource, menuData, reflectionHelper) {
+    constructor(dataSource, menuData, reflectionHelper, moduleAccessRepo) {
         super(menu_entity_1.MenuData, dataSource.createEntityManager());
         this.dataSource = dataSource;
         this.menuData = menuData;
         this.reflectionHelper = reflectionHelper;
+        this.moduleAccessRepo = moduleAccessRepo;
     }
     async getUserRoles(userId, appcode) {
-        const roles = await this.dataSource
-            .getRepository(user_role_mapping_entity_1.UserRoleMapping)
+        const userRoleMappingRepo = this.reflectionHelper.getRepoService('UserRoleMapping');
+        const roles = await userRoleMappingRepo
             .createQueryBuilder('urm')
             .innerJoin('sso_role', 'role', 'role.id = urm.role_id')
-            .select('urm.role_id')
+            .select('urm.role_id', 'role_id')
             .where('urm.user_id = :userId', { userId })
             .andWhere('role.appcode = :appcode', { appcode })
             .getRawMany();
         return roles.map((r) => r.urm_role_id);
     }
     async getAccessibleModules(roleIds, appCode) {
-        const roleCodes = await this.dataSource
-            .getRepository(role_entity_1.Role)
+        const roleRepo = this.reflectionHelper.getRepoService('Role');
+        const roleCodes = await roleRepo
             .createQueryBuilder('role')
-            .select('role.code')
+            .select('role.code', 'code')
             .where('role.id IN (:...roleIds)', { roleIds })
-            .getMany();
-        const codes = roleCodes.map((role) => role.code);
+            .getRawMany();
+        const codes = roleCodes.map(r => r.code);
         if (codes.length === 0)
             return [];
-        const modules = await this.dataSource
-            .getRepository(module_access_entity_1.ModuleAccess)
+        const modules = await this.moduleAccessRepo
             .createQueryBuilder('moduleAccess')
             .select('moduleAccess.module_code')
             .where('moduleAccess.role_code IN (:...codes)', { codes })
@@ -62,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 })
@@ -84,20 +82,21 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async resolveUserRoles(userId, appcode, levelType, levelId) {
         const repo = this.reflectionHelper.getRepoService('UserRoleMapping');
         if (userId) {
-            const getUserDetails = await this.dataSource.query(`
-            SELECT *
-            from sso_user
-            where id = $1
-        `, [userId]);
-            const getUserUrm = await this.dataSource.query(`
-            SELECT *
-            from sso_user_role_mapping
-            where user_id = $1
-              and appcode = $2
-        `, [userId, appcode]);
+            const userRepo = this.reflectionHelper.getRepoService('User');
+            const getUserDetails = await userRepo.findOne({
+                where: {
+                    id: userId,
+                },
+            });
+            const getUserUrm = await repo.findOne({
+                where: {
+                    user_id: userId,
+                    appcode: appcode,
+                },
+            });
             if (getUserDetails.length > 0 &&
                 getUserDetails[0].organization_id === 1) {
-                return [Number(getUserUrm[0].role_id)];
+                return [Number(getUserUrm.role_id)];
             }
         }
         let roles = await repo
@@ -112,11 +111,12 @@ 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 sso_school s
-            WHERE s.id = $1
-        `, [levelId]);
+            const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+            const sch = await schoolRepo.findOne({
+                where: {
+                    id: levelId,
+                },
+            });
             const brandId = sch?.brand_id;
             const orgId = sch?.organization_id;
             if (brandId) {
@@ -153,8 +153,10 @@ exports.MenuRepository = MenuRepository;
 exports.MenuRepository = MenuRepository = __decorate([
     (0, common_1.Injectable)(),
     __param(1, (0, typeorm_2.InjectRepository)(menu_entity_1.MenuData)),
+    __param(3, (0, typeorm_2.InjectRepository)(module_access_entity_1.ModuleAccess)),
     __metadata("design:paramtypes", [typeorm_1.DataSource,
         typeorm_1.Repository,
-        reflection_helper_service_1.ReflectionHelper])
+        reflection_helper_service_1.ReflectionHelper,
+        typeorm_1.Repository])
 ], MenuRepository);
 //# sourceMappingURL=menu.repository.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,uDAAiD;AACjD,yEAA8D;AAC9D,6CAAmD;AACnD,gGAAoF;AAG7E,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,oBAAoB;IACtD,YACmB,UAAsB,EACM,QAA8B,EAC1D,gBAAkC,EACF,gBAA0C;QAE3F,KAAK,CAAC,sBAAQ,EAAE,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;QALjC,eAAU,GAAV,UAAU,CAAY;QACM,aAAQ,GAAR,QAAQ,CAAsB;QAC1D,qBAAgB,GAAhB,gBAAgB,CAAkB;QACF,qBAAgB,GAAhB,gBAAgB,CAA0B;IAG7F,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,OAAe;QAChD,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAEpF,MAAM,KAAK,GAAG,MAAM,mBAAmB;aACpC,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,CAAC;aACtD,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC;aAChC,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;aAChD,UAAU,EAAE,CAAC;QAEhB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAAiB,EACjB,OAAe;QAEf,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAE9D,MAAM,SAAS,GAAG,MAAM,QAAQ;aAC7B,kBAAkB,CAAC,MAAM,CAAC;aAC1B,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC;aAC3B,KAAK,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,CAAC;aAC9C,UAAU,EAAE,CAAC;QAEhB,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAGlC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB;aACxC,kBAAkB,CAAC,cAAc,CAAC;aAClC,MAAM,CAAC,0BAA0B,CAAC;aAClC,KAAK,CAAC,uCAAuC,EAAE,EAAE,KAAK,EAAE,CAAC;aACzD,QAAQ,CAAC,8BAA8B,CAAC;aACxC,QAAQ,CAAC,+CAA+C,EAAE,EAAE,OAAO,EAAE,CAAC;aACtE,OAAO,EAAE,CAAC;QAEb,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;IAKD,KAAK,CAAC,YAAY,CAChB,WAAqB,EACrB,OAAe,EACf,SAAiB;QAEjB,OAAO,MAAM,IAAI,CAAC,QAAQ;aACvB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,QAAQ,CACP,YAAY,EACZ,QAAQ,EACR;;;;SAIC,CACF;aACA,KAAK,CAAC,uCAAuC,EAAE,EAAE,WAAW,EAAE,CAAC;aAC/D,QAAQ,CAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,CAAC;aAC9D,QAAQ,CAAC,8BAA8B,EAAE,EAAE,SAAS,EAAE,CAAC;aACvD,QAAQ,CAAC,qBAAqB,CAAC;aAC/B,MAAM,CAAC;YACN,QAAQ;YACR,oCAAoC;YACpC,uBAAuB;YACvB,mCAAmC;YACnC,qBAAqB;YACrB,+BAA+B;SAChC,CAAC;aACD,UAAU,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,MAAc,EACd,OAAe,EACf,SAAiB,EACjB,OAAe;QAEf,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAErE,IAAI,MAAM,EAAE,CAAC;YAEX,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC9D,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;gBAC5C,KAAK,EAAE;oBACL,EAAE,EAAE,MAAM;iBACX;aACF,CAAC,CAAC;YAGH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;gBACpC,KAAK,EAAE;oBACL,OAAO,EAAE,MAAM;oBACf,OAAO,EAAE,OAAO;iBACjB;aACF,CAAC,CAAC;YAEH,IACE,cAAc,CAAC,MAAM,GAAG,CAAC;gBACzB,cAAc,CAAC,CAAC,CAAC,CAAC,eAAe,KAAK,CAAC,EACvC,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAGD,IAAI,KAAK,GAAG,MAAM,IAAI;aACnB,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,CAAC;aACtD,MAAM,CAAC,aAAa,CAAC;aACrB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;aAClD,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,CAAC;aACtD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;aACzD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;aAChD,UAAU,EAAE,CAAC;QAEhB,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAGzD,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;gBACnC,KAAK,EAAE;oBACL,EAAE,EAAE,OAAO;iBACZ;aACF,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,GAAG,EAAE,QAAQ,CAAC;YAC9B,MAAM,KAAK,GAAG,GAAG,EAAE,eAAe,CAAC;YAEnC,IAAI,OAAO,EAAE,CAAC;gBACZ,KAAK,GAAG,MAAM,IAAI;qBACf,kBAAkB,CAAC,KAAK,CAAC;qBACzB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,CAAC;qBACtD,MAAM,CAAC,aAAa,CAAC;qBACrB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;qBAC1C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;qBAC7D,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;qBACzD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;qBAChD,UAAU,EAAE,CAAC;gBAEhB,IAAI,KAAK,CAAC,MAAM;oBAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,GAAG,MAAM,IAAI;qBACf,kBAAkB,CAAC,KAAK,CAAC;qBACzB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,CAAC;qBACtD,MAAM,CAAC,aAAa,CAAC;qBACrB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;qBAC1C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;qBAC7D,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;qBACvD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;qBAChD,UAAU,EAAE,CAAC;gBAEhB,IAAI,KAAK,CAAC,MAAM;oBAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAA;AA/KY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;IAE1B,WAAA,IAAA,0BAAgB,EAAC,mCAAY,CAAC,CAAA;qCAHF,oBAAU;QACgB,oBAAU;QAC9B,4CAAgB;QACgB,oBAAU;GALpE,cAAc,CA+K1B"}

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

@@ -67,12 +67,12 @@ let NotificationsService = class NotificationsService {
             isReadFilter = isRead ? '1' : '0';
         }
         let paramIndex = 1;
-        let sql = `
-    SELECT n.*
-    FROM frm_notification n
-    WHERE n.user_id = $${paramIndex}
-      AND n.level_id = $${paramIndex + 1}
-      AND n.level_type = $${paramIndex + 2}
+        let sql = `
+    SELECT n.*
+    FROM frm_notification n
+    WHERE n.user_id = $${paramIndex}
+      AND n.level_id = $${paramIndex + 1}
+      AND n.level_type = $${paramIndex + 2}
   `;
         const params = [
             String(id),
@@ -107,10 +107,10 @@ let NotificationsService = class NotificationsService {
     }
     async markAllAsRead(loggedInUser) {
         const { id, level_id, level_type } = loggedInUser;
-        const query = `
-    UPDATE frm_notification
-    SET is_read = 1
-    WHERE user_id = $1 AND level_id = $2 AND level_type = $3 AND is_read = 0
+        const query = `
+    UPDATE frm_notification
+    SET is_read = 1
+    WHERE user_id = $1 AND level_id = $2 AND level_type = $3 AND is_read = 0
   `;
         const params = [id, level_id, level_type];
         const result = await this.dataSource.query(query, params);

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

@@ -58,27 +58,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/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 = $1
+            getUserDetails = await this.dataSource.query(`
+        SELECT * from sso_user where id = $1
       `, [currentUser.id]);
         }
         if (getUserDetails[0].organization_id == 1 && payload.level_type == 'ORG') {

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

@@ -26,11 +26,11 @@ let ActionRepository = class ActionRepository {
     }
     async getReasonCode(loggedInUser) {
         const { organization_id } = loggedInUser;
-        const result = await this.dataSource.query(`
-          SELECT name, type
-          FROM frm_list_master
-          WHERE organization_id = $1
-            AND source = 'master'
+        const result = await this.dataSource.query(`
+          SELECT name, type
+          FROM frm_list_master
+          WHERE organization_id = $1
+            AND source = 'master'
       `, [organization_id]);
         const formatted = result.map((item) => ({
             label: item.name,
@@ -43,11 +43,11 @@ 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 frm_list_master_items
-          WHERE listtype = $1
-            AND organization_id = $2
+        const result = await this.dataSource.query(`
+          SELECT name, id
+          FROM frm_list_master_items
+          WHERE listtype = $1
+            AND organization_id = $2
       `, [list_type, organization_id]);
         return result.map((row) => ({
             label: row.name,
@@ -119,8 +119,8 @@ let ActionRepository = class ActionRepository {
         ])
             .from('frm_wf_action', 'a')
             .leftJoin('frm_wf_action_category', 'ac', 'ac.id::text = a.action_category')
-            .leftJoin('frm_list_master_items', 'ar', `ar.id::text = a.action_requirement 
-      AND ar.listtype = 'ACRQ' 
+            .leftJoin('frm_list_master_items', 'ar', `ar.id::text = a.action_requirement 
+      AND ar.listtype = 'ACRQ' 
       AND ar.organization_id = :orgId`, { orgId: organization_id })
             .where('a.organization_id = :orgId', { orgId: organization_id })
             .andWhere('a.id::text IN (:...actionIds)', { actionIds })

package/dist/module/workflow/repository/comm-template.repository.d.ts

@@ -2,12 +2,14 @@ import { DataSource, Repository } from 'typeorm';
 import { CommTemplate } from '../entity/comm-template.entity';
 import { TemplateAttach } from '../entity/template-attach-mapper.entity';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 export declare class CommTemplateRepository {
     private readonly commTemplateRepository;
     private readonly templateAttachEntity;
     private readonly mediaDataService;
     private readonly dataSource;
-    constructor(commTemplateRepository: Repository<CommTemplate>, templateAttachEntity: Repository<TemplateAttach>, mediaDataService: MediaDataService, dataSource: DataSource);
+    private readonly reflectionHelper;
+    constructor(commTemplateRepository: Repository<CommTemplate>, templateAttachEntity: Repository<TemplateAttach>, mediaDataService: MediaDataService, dataSource: DataSource, reflectionHelper: ReflectionHelper);
     getAllCommTemplate(entity_type: string, action_id?: number, loggedInUser?: any): Promise<CommTemplate[]>;
     save(commTemplate: any): Promise<any>;
     delete(id: any): Promise<any>;

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

@@ -19,28 +19,33 @@ const typeorm_2 = require("typeorm");
 const comm_template_entity_1 = require("../entity/comm-template.entity");
 const template_attach_mapper_entity_1 = require("../entity/template-attach-mapper.entity");
 const media_data_service_1 = require("../../meta/service/media-data.service");
+const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 let CommTemplateRepository = class CommTemplateRepository {
-    constructor(commTemplateRepository, templateAttachEntity, mediaDataService, dataSource) {
+    constructor(commTemplateRepository, templateAttachEntity, mediaDataService, dataSource, reflectionHelper) {
         this.commTemplateRepository = commTemplateRepository;
         this.templateAttachEntity = templateAttachEntity;
         this.mediaDataService = mediaDataService;
         this.dataSource = dataSource;
+        this.reflectionHelper = reflectionHelper;
     }
     async getAllCommTemplate(entity_type, action_id, loggedInUser) {
         const { organization_id, level_id, level_type } = loggedInUser;
         let is_template;
         if (action_id) {
-            const [actionResult] = await this.dataSource.query(`SELECT is_template 
-       FROM frm_wf_action 
-       WHERE id = $1 AND organization_id = $2 
-       LIMIT 1`, [action_id, organization_id]);
+            const actionRepo = this.reflectionHelper.getRepoService('ActionEntity');
+            const actionResult = await actionRepo.findOne({
+                where: {
+                    id: action_id,
+                    organization_id: organization_id,
+                }
+            });
             if (!actionResult) {
                 throw new Error('Invalid action_id');
             }
             is_template = actionResult.is_template;
-            await this.dataSource.query(`UPDATE frm_wf_comm_template
-     SET is_template = $1
-     WHERE mapped_entity_type = $2
+            await this.dataSource.query(`UPDATE frm_wf_comm_template
+     SET is_template = $1
+     WHERE mapped_entity_type = $2
        AND organization_id = $3 AND level_id = $4 AND level_type=$5`, [is_template, entity_type, organization_id, level_id, level_type]);
         }
         const whereCondition = {
@@ -109,6 +114,7 @@ exports.CommTemplateRepository = CommTemplateRepository = __decorate([
     __metadata("design:paramtypes", [typeorm_2.Repository,
         typeorm_2.Repository,
         media_data_service_1.MediaDataService,
-        typeorm_2.DataSource])
+        typeorm_2.DataSource,
+        reflection_helper_service_1.ReflectionHelper])
 ], CommTemplateRepository);
 //# sourceMappingURL=comm-template.repository.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"comm-template.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/comm-template.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA+D;AAC/D,6CAAmD;AACnD,qCAAiD;AACjD,yEAA8D;AAC9D,2FAAyE;AACzE,8EAA8E;AAGvE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YAEmB,sBAAgD,EAEhD,oBAAgD,EAChD,gBAAkC,EAClC,UAAsB;QAJtB,2BAAsB,GAAtB,sBAAsB,CAA0B;QAEhD,yBAAoB,GAApB,oBAAoB,CAA4B;QAChD,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,kBAAkB,CACtB,WAAmB,EACnB,SAAkB,EAClB,YAAa;QAEb,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;QAE/D,IAAI,WAA+B,CAAC;QAGpC,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAChD;;;eAGO,EACP,CAAC,SAAS,EAAE,eAAe,CAAC,CAC7B,CAAC;YAEF,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvC,CAAC;YAED,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;YAEvC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACzB;;;oEAG4D,EAC5D,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,CAAC,CAClE,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAQ;YAE1B,eAAe;YACf,QAAQ;YACR,UAAU;SACX,CAAC;QAEF,IAAI,OAAO,WAAW,KAAK,WAAW,EAAE,CAAC;YACvC,cAAc,CAAC,WAAW,GAAG,WAAW,CAAC;QAC3C,CAAC;QAED,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC;YACtC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC;YAC/C,KAAK,EAAE,cAAc;SACtB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,YAAiB;QAS1B,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAO;QAElB,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,WAAmB,EACnB,EAAU,EACV,YAAY;QAEZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,0BAAiB,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,QAAQ,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAC3D,QAAQ,CAAC,SAAS,EAClB,YAAY,CACb,CAAC;YACF,QAAQ,CAAC,SAAS,GAAG,KAAY,CAAC;QACpC,CAAC;QAED,IAAI,QAAQ,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;YACxC,OAAO,QAAQ,CAAC;QAClB,CAAC;QAGD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YACvD,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,KAAK,EAAE;gBACL,WAAW;gBACX,WAAW,EAAE,QAAQ,CAAC,EAAE;aACzB;SACF,CAAC,CAAC;QAGH,IAAI,gBAAgB,GAAU,EAAE,CAAC;QACjC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAE5B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAC3D,GAAG,CAAC,QAAQ,EACZ,YAAY,CACb,CAAC;gBACF,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;QAGD,OAAO;YACL,GAAG,QAAQ;YACX,WAAW,EAAE,gBAAgB;SAC9B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,0CAA0C,CAAC,IAAY,EAAE,QAAgB,EAC9B,UAAkB,EAAE,OAAe;QAClF,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;YAC/C,KAAK,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAC;SAC7C,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA5IY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,mCAAY,CAAC,CAAA;IAE9B,WAAA,IAAA,0BAAgB,EAAC,8CAAc,CAAC,CAAA;qCADQ,oBAAU;QAEZ,oBAAU;QACd,qCAAgB;QACtB,oBAAU;GAP9B,sBAAsB,CA4IlC"}
+{"version":3,"file":"comm-template.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/comm-template.repository.ts"],"names":[],"mappings":"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"}

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 frm_entity_view fm
+        const forms = await this.dataSource.query(`SELECT fm.id as fm_id, fm.name as fm_form_name
+       FROM frm_entity_view fm
        WHERE fm.organization_id = $1 AND fm.mapped_entity_type = $2`, [organization_id, source_entity_type]);
         const formatted = forms.map((form) => ({
             label: form.fm_form_name,

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

@@ -88,28 +88,28 @@ let StageGroupRepository = class StageGroupRepository {
             .map((_, idx) => `$${idx + 1}`)
             .join(", ");
         const params_task = [...stageIds];
-        const taskCounts = await this.dataSource.query(`
-      SELECT stage_id, COUNT(*) AS task_count
-      FROM frm_wf_task_data
-      WHERE stage_id IN (${stagePlaceholders})
-        AND is_system = FALSE
-        AND mapped_entity_id = ${lead_id}
-      GROUP BY stage_id
+        const taskCounts = await this.dataSource.query(`
+      SELECT stage_id, COUNT(*) AS task_count
+      FROM frm_wf_task_data
+      WHERE stage_id IN (${stagePlaceholders})
+        AND is_system = FALSE
+        AND mapped_entity_id = ${lead_id}
+      GROUP BY stage_id
     `, params_task);
-        const meetingCounts = await this.dataSource.query(`
-      SELECT stage_id, COUNT(*) AS meeting_count
-      FROM crm_lead_meeting
-      WHERE stage_id IN (${stagePlaceholders})
-        AND mapped_entity_id = ${lead_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 (${stagePlaceholders})
+        AND mapped_entity_id = ${lead_id}
+      GROUP BY stage_id
     `, params_task);
-        const sendCommCounts = await this.dataSource.query(`
-      SELECT stage_id, COUNT(*) AS send_comm_count
-      FROM crm_lead_communication
-      WHERE stage_id IN (${stagePlaceholders})
-        AND mapped_entity_id = ${lead_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 (${stagePlaceholders})
+        AND mapped_entity_id = ${lead_id}
+        AND type IN ('SEND','LOG')
+      GROUP BY stage_id
     `, params_task);
         const taskCountMap = new Map(taskCounts.map((r) => [Number(r.stage_id), Number(r.task_count)]));
         const meetingCountMap = new Map(meetingCounts.map((r) => [Number(r.stage_id), Number(r.meeting_count)]));

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

@@ -62,14 +62,14 @@ let StageRepository = class StageRepository {
         if (!stageGroup) {
             return [];
         }
-        const rows = await this.dataSource.query(`
-    SELECT 
-      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
-      s.*
-    FROM frm_wf_stage_group g
-    INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
-    WHERE g.workflow_id = $1 AND g.organization_id = $2 AND g.id = $3
-    ORDER BY g.id, s.id
+        const rows = await this.dataSource.query(`
+    SELECT 
+      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
+      s.*
+    FROM frm_wf_stage_group g
+    INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
+    WHERE g.workflow_id = $1 AND g.organization_id = $2 AND g.id = $3
+    ORDER BY g.id, s.id
     `, [stageGroup.workflow_id, organization_id, stage_group_id]);
         if (!rows || rows.length === 0) {
             return [];

package/dist/module/workflow/repository/task.repository.d.ts

@@ -2,6 +2,7 @@ import { TaskDataEntity } from '../entity/task-data.entity';
 import { Repository } from 'typeorm';
 import { EntityDynamicService } from 'src/module/meta/service/entity-dynamic.service';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
+import { UserData } from 'src/module/user/entity/user.entity';
 export declare class TaskRepository {
     private readonly taskRepository;
     private readonly entityDynamicService;
@@ -9,5 +10,5 @@ export declare class TaskRepository {
     constructor(taskRepository: Repository<TaskDataEntity>, entityDynamicService: EntityDynamicService, reflectionHelper: ReflectionHelper);
     getAllTaskByUserIdAndStageId(condition: any): Promise<TaskDataEntity[]>;
     saveActionDataInTask(action: any, loggedInUser: any, mapped_entity_id: number, mapped_entity_type: string): Promise<any>;
-    updateTaskStatus(loggedInUser: any, mapped_entity_type: any, mapped_entity_id: any, stage_id: any, action_id: any): Promise<any>;
+    updateTaskStatus(loggedInUser: UserData, mapped_entity_type: string, mapped_entity_id: number, stage_id: any, action_id: any): Promise<any>;
 }

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

@@ -42,21 +42,21 @@ let TaskRepository = class TaskRepository {
                 code: 'in_progress',
                 organization_id: loggedInUser.organization_id,
                 listtype: 'TKST',
-            }
+            },
         });
         const leadRepo = this.reflectionHelper.getRepoService('CRMLead');
         const leadData = await leadRepo.findOne({
             where: {
-                id: mapped_entity_id
-            }
+                id: mapped_entity_id,
+            },
         });
         if (action.length > 0) {
             for (const act of action) {
                 const mandatoryListMasterItem = listMasterItemsRepo.find({
                     where: {
                         id: act.action_requirement,
-                        organization_id: loggedInUser.organization_id
-                    }
+                        organization_id: loggedInUser.organization_id,
+                    },
                 });
                 const now = new Date();
                 const dueDateTime = new Date(now);

package/dist/module/workflow/repository/task.repository.js.map

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

package/dist/module/workflow/service/action-template-mapping.service.js

@@ -29,9 +29,9 @@ let ActionTemplateMappingService = class ActionTemplateMappingService extends en
     async getTemplateByMode(stage_id, action_id, loggedInUser, mode) {
         let stageAction = [];
         if (action_id != 0) {
-            stageAction = await this.dataSource.query(`
-      SELECT id FROM frm_wf_stage_action_mapping
-      WHERE action_id = $1
+            stageAction = await this.dataSource.query(`
+      SELECT id FROM frm_wf_stage_action_mapping
+      WHERE action_id = $1
       `, [action_id]);
         }
         else {
@@ -82,23 +82,23 @@ let ActionTemplateMappingService = class ActionTemplateMappingService extends en
             return [];
         const stgActMappingId = stageAction[0].id;
         if (!mode) {
-            const getModeFromAction = await this.dataSource.query(`
-        SELECT mode FROM frm_wf_action
-        WHERE id = $1
+            const getModeFromAction = await this.dataSource.query(`
+        SELECT mode FROM frm_wf_action
+        WHERE id = $1
         `, [action_id]);
             mode = getModeFromAction[0]?.mode;
         }
-        const templates = await this.dataSource.query(`
-      SELECT template_code FROM frm_wf_action_resources_mapping
-      WHERE stg_act_mapping_id = $1 
+        const templates = await this.dataSource.query(`
+      SELECT template_code FROM frm_wf_action_resources_mapping
+      WHERE stg_act_mapping_id = $1 
       `, [stgActMappingId]);
         const templateCodes = templates.map((t) => t.template_code);
         if (!templateCodes.length)
             return [];
-        const commTemplates = await this.dataSource.query(`
-  SELECT code as value, name as label , id
-  FROM frm_wf_comm_template
-  WHERE code IN ($1) AND mode = $2 AND organization_id = $3 AND level_type = $4 AND level_id = $5 AND status IN (SELECT id FROM frm_list_master_items WHERE code = 'STATUS_ACTIVE' AND organization_id = $6)
+        const commTemplates = await this.dataSource.query(`
+  SELECT code as value, name as label , id
+  FROM frm_wf_comm_template
+  WHERE code IN ($1) AND mode = $2 AND organization_id = $3 AND level_type = $4 AND level_id = $5 AND status IN (SELECT id FROM frm_list_master_items WHERE code = 'STATUS_ACTIVE' AND organization_id = $6)
   `, [
             templateCodes,
             mode,

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

@@ -25,12 +25,12 @@ let ActionService = class ActionService extends entity_service_impl_service_1.En
         if (!actionData) {
             return null;
         }
-        const result = await this.dataSource.query(`SELECT template_code, form_id 
-   FROM frm_wf_action_resources_mapping 
-   WHERE stg_act_mapping_id IN (
-     SELECT id 
-     FROM frm_wf_stage_action_mapping 
-     WHERE action_id = $1 AND entity_type = 'WFSA'
+        const result = await this.dataSource.query(`SELECT template_code, form_id 
+   FROM frm_wf_action_resources_mapping 
+   WHERE stg_act_mapping_id IN (
+     SELECT id 
+     FROM frm_wf_stage_action_mapping 
+     WHERE action_id = $1 AND entity_type = 'WFSA'
    )`, [actionData.id]);
         const templates = result
             .filter((t) => t.template_code !== null)
@@ -136,7 +136,7 @@ let ActionService = class ActionService extends entity_service_impl_service_1.En
         return action;
     }
     async deleteEntity(entityType, id, loggedInUser) {
-        await this.dataSource.query(`DELETE FROM frm_wf_action_template_mapping WHERE stg_act_mapping_id IN (SELECT
+        await this.dataSource.query(`DELETE FROM frm_wf_action_template_mapping WHERE stg_act_mapping_id IN (SELECT
         id FROM frm_wf_stage_action_mapping WHERE action_id = $1 AND entity_type = 'WFSA')`, [id]);
         await this.dataSource.query(`DELETE FROM frm_wf_stage_action_mapping WHERE action_id = $1 AND entity_type ='WFSA'`, [id]);
         const deleteAction = await super.deleteEntity(entityType, id, loggedInUser);

package/dist/module/workflow/service/entity-modification.service.js

@@ -29,8 +29,8 @@ let EntityModificationService = class EntityModificationService extends entity_s
             throw new common_1.NotFoundException('Entity metadata not found in frm_entity_master');
         }
         const tableName = entityMeta.db_table_name;
-        const [entityRow] = await this.dataSource.query(`
-    SELECT * FROM ${tableName} WHERE id = $1
+        const [entityRow] = await this.dataSource.query(`
+    SELECT * FROM ${tableName} WHERE id = $1
     `, [mapped_entity_id]);
         if (!entityRow) {
             throw new common_1.NotFoundException(`No record found in ${tableName} with ID ${mapped_entity_id}`);