rez_core 5.0.88 → 5.0.90

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

@@ -75,11 +75,11 @@ let EntityListService = class EntityListService {
     }
     getQuery(source, groupByColumn) {
         if (groupByColumn) {
-            return `SELECT ${groupByColumn} as tab_value, COUNT(1) AS tab_value_count
+            return `SELECT ${groupByColumn} as tab_value, COUNT(1) AS tab_value_count
               FROM ${source}`;
         }
         else {
-            return `SELECT *
+            return `SELECT *
               FROM ${source}`;
         }
     }
@@ -123,7 +123,7 @@ let EntityListService = class EntityListService {
         return { query, argumentList: argsObjectList };
     }
     async getMaxSequenceNumber(tableName, parentType, parentId) {
-        const query = `SELECT max(id) as seq_no
+        const query = `SELECT max(id) as seq_no
                  FROM ${tableName} WHERE 1=1 `;
         const argsObjectList = [];
         const result = await this.entityManager.query(query, argsObjectList);

package/dist/module/meta/service/entity-relation.service.d.ts

@@ -1,10 +1,8 @@
 import { EntityServiceImpl } from './entity-service-impl.service';
-import { DataSource } from 'typeorm';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
 export declare class EntityRelationService extends EntityServiceImpl {
-    private readonly dataSource;
     private entityMasterRepo;
-    constructor(dataSource: DataSource, entityMasterRepo: EntityMasterRepository);
+    constructor(entityMasterRepo: EntityMasterRepository);
     getEntityRelations(entityType: string, loggedInUser: any, includeSelf?: boolean): Promise<any>;
     getRelatedEntityIds(sourceEntity: string, targetEntity: string, targetIds: number[], orgId: number): Promise<number[]>;
 }

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

@@ -12,18 +12,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityRelationService = void 0;
 const common_1 = require("@nestjs/common");
 const entity_service_impl_service_1 = require("./entity-service-impl.service");
-const typeorm_1 = require("typeorm");
 const entity_master_repository_1 = require("../repository/entity-master.repository");
 let EntityRelationService = class EntityRelationService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(dataSource, entityMasterRepo) {
+    constructor(entityMasterRepo) {
         super();
-        this.dataSource = dataSource;
         this.entityMasterRepo = entityMasterRepo;
     }
     async getEntityRelations(entityType, loggedInUser, includeSelf = false) {
-        const relations = await this.dataSource.query(`SELECT name as label, target_entity_type as value, id 
-       FROM frm_entity_relation 
-       WHERE source_entity_type = $1 AND organization_id = $2`, [entityType, loggedInUser.organization_id]);
+        const entityRelationRepo = this.reflectionHelper.getRepoService('EntityRelation');
+        const relations = await entityRelationRepo
+            .createQueryBuilder("er")
+            .select([
+            "er.name AS label",
+            "er.target_entity_type AS value",
+            "er.id AS id",
+        ])
+            .where("er.source_entity_type = :entityType", { entityType })
+            .andWhere("er.organization_id = :orgId", { orgId: loggedInUser.organization_id })
+            .getRawMany();
         if (includeSelf) {
             const entity = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.organization_id);
             if (entity) {
@@ -39,36 +45,21 @@ let EntityRelationService = class EntityRelationService extends entity_service_i
     async getRelatedEntityIds(sourceEntity, targetEntity, targetIds, orgId) {
         if (!targetIds.length)
             return [];
-        let paramIndex = 1;
-        const params = [];
-        params.push(sourceEntity);
-        const sourceEntityParam = `$${paramIndex++}`;
-        params.push(targetEntity);
-        const targetEntityParam = `$${paramIndex++}`;
-        const idPlaceholders = targetIds
-            .map((id) => {
-            params.push(Number(id));
-            return `$${paramIndex++}`;
-        })
-            .join(", ");
-        params.push(Number(orgId));
-        const orgPlaceholder = `$${paramIndex}`;
-        const sql = `
-        SELECT DISTINCT source_entity_id
-        FROM frm_entity_relation_data
-        WHERE source_entity_type = ${sourceEntityParam}
-          AND target_entity_type = ${targetEntityParam}
-          AND target_entity_id IN (${idPlaceholders})
-          AND organization_id = ${orgPlaceholder}
-    `;
-        const rows = await this.dataSource.query(sql, params);
+        const entityRelationRepo = this.reflectionHelper.getRepoService('EntityRelation');
+        const rows = await entityRelationRepo
+            .createQueryBuilder("erd")
+            .select("DISTINCT erd.source_entity_id", "source_entity_id")
+            .where("erd.source_entity_type = :sourceEntity", { sourceEntity })
+            .andWhere("erd.target_entity_type = :targetEntity", { targetEntity })
+            .andWhere("erd.target_entity_id IN (:...targetIds)", { targetIds })
+            .andWhere("erd.organization_id = :orgId", { orgId })
+            .getRawMany();
         return rows.map((r) => Number(r.source_entity_id));
     }
 };
 exports.EntityRelationService = EntityRelationService;
 exports.EntityRelationService = EntityRelationService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource,
-        entity_master_repository_1.EntityMasterRepository])
+    __metadata("design:paramtypes", [entity_master_repository_1.EntityMasterRepository])
 ], EntityRelationService);
 //# sourceMappingURL=entity-relation.service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"entity-relation.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-relation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAAkE;AAClE,qCAAqC;AACrC,qFAAgF;AAGzE,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,+CAAiB;IAC1D,YAA6B,UAAsB,EAC/B,gBAAwC;QAC1D,KAAK,EAAE,CAAC;QAFmB,eAAU,GAAV,UAAU,CAAY;QAC/B,qBAAgB,GAAhB,gBAAgB,CAAwB;IAE5D,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,UAAkB,EAClB,YAAiB,EACjB,WAAW,GAAG,KAAK;QAEnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC3C;;8DAEwD,EACxD,CAAC,UAAU,EAAE,YAAY,CAAC,eAAe,CAAC,CAC3C,CAAC;QAEF,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,UAAU,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC;YAEjH,IAAI,MAAM,EAAE,CAAC;gBACX,SAAS,CAAC,OAAO,CAAC;oBAChB,KAAK,EAAE,MAAM,CAAC,IAAI;oBAClB,KAAK,EAAE,UAAU;oBACjB,EAAE,EAAE,IAAI;iBACT,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,YAAoB,EACpB,YAAoB,EACpB,SAAmB,EACnB,KAAa;QAGb,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAEjC,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,MAAM,GAAU,EAAE,CAAC;QAGzB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1B,MAAM,iBAAiB,GAAG,IAAI,UAAU,EAAE,EAAE,CAAC;QAE7C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1B,MAAM,iBAAiB,GAAG,IAAI,UAAU,EAAE,EAAE,CAAC;QAG7C,MAAM,cAAc,GAAG,SAAS;aAC7B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YACV,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;YACxB,OAAO,IAAI,UAAU,EAAE,EAAE,CAAC;QAC5B,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;QAGd,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3B,MAAM,cAAc,GAAG,IAAI,UAAU,EAAE,CAAC;QAExC,MAAM,GAAG,GAAG;;;qCAGqB,iBAAiB;qCACjB,iBAAiB;qCACjB,cAAc;kCACjB,cAAc;KAC3C,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAEtD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC1D,CAAC;CAIF,CAAA;AAhFY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;QACb,iDAAsB;GAFjD,qBAAqB,CAgFjC"}
+{"version":3,"file":"entity-relation.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-relation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAAkE;AAElE,qFAAgF;AAGzE,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,+CAAiB;IAC1D,YAAoB,gBAAwC;QAC1D,KAAK,EAAE,CAAC;QADU,qBAAgB,GAAhB,gBAAgB,CAAwB;IAE5D,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,UAAkB,EAClB,YAAiB,EACjB,WAAW,GAAG,KAAK;QAEnB,MAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;QAElF,MAAM,SAAS,GAAG,MAAM,kBAAkB;aACvC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC;YACN,kBAAkB;YAClB,gCAAgC;YAChC,aAAa;SACd,CAAC;aACD,KAAK,CAAC,qCAAqC,EAAE,EAAE,UAAU,EAAE,CAAC;aAC5D,QAAQ,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,eAAe,EAAE,CAAC;aAChF,UAAU,EAAE,CAAC;QAEhB,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,UAAU,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC;YAEjH,IAAI,MAAM,EAAE,CAAC;gBACX,SAAS,CAAC,OAAO,CAAC;oBAChB,KAAK,EAAE,MAAM,CAAC,IAAI;oBAClB,KAAK,EAAE,UAAU;oBACjB,EAAE,EAAE,IAAI;iBACT,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,YAAoB,EACpB,YAAoB,EACpB,SAAmB,EACnB,KAAa;QAGb,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAEjC,MAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;QAClF,MAAM,IAAI,GAAG,MAAM,kBAAkB;aAClC,kBAAkB,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,+BAA+B,EAAE,kBAAkB,CAAC;aAC3D,KAAK,CAAC,wCAAwC,EAAE,EAAE,YAAY,EAAE,CAAC;aACjE,QAAQ,CAAC,wCAAwC,EAAE,EAAE,YAAY,EAAE,CAAC;aACpE,QAAQ,CAAC,yCAAyC,EAAE,EAAE,SAAS,EAAE,CAAC;aAClE,QAAQ,CAAC,8BAA8B,EAAE,EAAE,KAAK,EAAE,CAAC;aACnD,UAAU,EAAE,CAAC;QAEhB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACrD,CAAC;CAIF,CAAA;AA9DY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAE2B,iDAAsB;GADjD,qBAAqB,CA8DjC"}

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 frm_list_master_items
-       WHERE code = $1
+        const statusList = await repo.query(`SELECT id
+       FROM frm_list_master_items
+       WHERE code = $1
          AND organization_id = $2`, [global_constant_1.STATUS_ACTIVE, loggedInUser?.organization_id || 0]);
         console.log('Status List:', statusList);
         console.log(`status_code,${global_constant_1.STATUS_ACTIVE},statusList, ${loggedInUser?.organization_id}`);

package/dist/module/meta/service/media-data.service.js

@@ -150,8 +150,8 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
         const getEntityData = await this.entityMasterService.getEntityData(levelEntityType, loggedInUser);
         if (!getEntityData)
             return null;
-        const levelEntityDataResult = await this.entityManager.query(`SELECT *
-       FROM ${getEntityData?.db_table_name}
+        const levelEntityDataResult = await this.entityManager.query(`SELECT *
+       FROM ${getEntityData?.db_table_name}
        WHERE id = $1`, [levelEntityId]);
         const levelEntityData = levelEntityDataResult[0] || null;
         if (levelEntityData?.code) {
@@ -172,8 +172,8 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
             const getEntityData = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
             if (!getEntityData)
                 return null;
-            const levelEntityDataResult = await this.entityManager.query(`SELECT *
-         FROM ${getEntityData?.db_table_name}
+            const levelEntityDataResult = await this.entityManager.query(`SELECT *
+         FROM ${getEntityData?.db_table_name}
          WHERE id = $1`, [mappedEntityId]);
             if (levelEntityDataResult?.[0].code &&
                 parentType != 'SCH' &&
@@ -185,8 +185,8 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
                 const getEntityData = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
                 if (!getEntityData)
                     return null;
-                const levelEntityDataResult = await this.entityManager.query(`SELECT *
-           FROM ${getEntityData?.db_table_name}
+                const levelEntityDataResult = await this.entityManager.query(`SELECT *
+           FROM ${getEntityData?.db_table_name}
            WHERE id = $1`, [mappedEntityId]);
                 replacements['template_code'] = levelEntityDataResult?.[0].code;
                 pathTemplate = '${org_code}/${level_code}/template/${template_code}';

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

@@ -108,12 +108,12 @@ let ResolverService = class ResolverService {
                 const resolvedValues = [];
                 for (const code of rawValue) {
                     const query = tableName === 'sso_organization'
-                        ? `SELECT *
-                 FROM ${tableName}
+                        ? `SELECT *
+                 FROM ${tableName}
                  WHERE code = $1`
-                        : `SELECT *
-                 FROM ${tableName}
-                 WHERE id = $1
+                        : `SELECT *
+                 FROM ${tableName}
+                 WHERE id = $1
                    AND organization_id = $2`;
                     const params = tableName === 'sso_organization'
                         ? [code]
@@ -125,12 +125,12 @@ let ResolverService = class ResolverService {
             }
             else {
                 const query = tableName === 'sso_organization'
-                    ? `SELECT *
-               FROM ${tableName}
+                    ? `SELECT *
+               FROM ${tableName}
                WHERE id = $1`
-                    : `SELECT *
-               FROM ${tableName}
-               WHERE id = $1
+                    : `SELECT *
+               FROM ${tableName}
+               WHERE id = $1
                  AND organization_id = $2`;
                 const params = tableName === 'sso_organization'
                     ? [rawValue]
@@ -184,12 +184,12 @@ let ResolverService = class ResolverService {
                 return displayValue;
             const tableName = entityDef.db_table_name;
             const query = tableName === 'sso_organization'
-                ? `SELECT id
-             FROM ${tableName}
+                ? `SELECT id
+             FROM ${tableName}
              WHERE ${attr.data_source_attribute} = $1`
-                : `SELECT id
-             FROM ${tableName}
-             WHERE ${attr.data_source_attribute} = $1
+                : `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.data_source_attribute} = $1
                AND organization_id = $2`;
             const params = tableName === 'sso_organization'
                 ? [displayValue]

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

@@ -36,7 +36,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
             .where('urm.user_id = :userId', { userId })
             .andWhere('role.appcode = :appcode', { appcode })
             .getRawMany();
-        return roles.map((r) => r.urm_role_id);
+        return roles.map((r) => r.role_id);
     }
     async getAccessibleModules(roleIds, appCode) {
         const roleRepo = this.reflectionHelper.getRepoService('Role');
@@ -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 })

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":"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"}

package/dist/module/module/service/module-access.service.d.ts

@@ -3,12 +3,14 @@ import { DataSource } from 'typeorm';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { MenuRepository } from '../repository/menu.repository';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 export declare class ModuleAccessService {
     private readonly moduleAccessRepository;
     private readonly menuRepository;
     private readonly dataSource;
     private readonly listMasterService;
-    constructor(moduleAccessRepository: ModuleAccessRepository, menuRepository: MenuRepository, dataSource: DataSource, listMasterService: ListMasterService);
+    private readonly reflectionHelper;
+    constructor(moduleAccessRepository: ModuleAccessRepository, menuRepository: MenuRepository, dataSource: DataSource, listMasterService: ListMasterService, reflectionHelper: ReflectionHelper);
     getModules({ appcode, loggedInUser }: {
         appcode: string;
         loggedInUser: UserData;

package/dist/module/module/service/module-access.service.js

@@ -19,12 +19,14 @@ const global_constant_1 = require("../../../constant/global.constant");
 const typeorm_1 = require("typeorm");
 const menu_repository_1 = require("../repository/menu.repository");
 const list_master_service_1 = require("../../listmaster/service/list-master.service");
+const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 let ModuleAccessService = class ModuleAccessService {
-    constructor(moduleAccessRepository, menuRepository, dataSource, listMasterService) {
+    constructor(moduleAccessRepository, menuRepository, dataSource, listMasterService, reflectionHelper) {
         this.moduleAccessRepository = moduleAccessRepository;
         this.menuRepository = menuRepository;
         this.dataSource = dataSource;
         this.listMasterService = listMasterService;
+        this.reflectionHelper = reflectionHelper;
     }
     async getModules({ appcode, loggedInUser }) {
         return this.moduleAccessRepository.getModules({
@@ -91,8 +93,12 @@ let ModuleAccessService = class ModuleAccessService {
         const roleIds = roleCodes.map(Number);
         const allPermissions = await this.moduleAccessRepository.getModuleAccessByRoles(roleIds, appcode);
         if (level_type === 'SCH') {
-            const result = await this.dataSource.query(`SELECT * FROM sso_school WHERE id = ${level_id}`);
-            const school = result?.[0];
+            const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+            const school = await schoolRepo.findOne({
+                where: {
+                    id: level_id
+                }
+            });
             const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_INACTIVE, organization_id || 0);
             if (!school || school.status === resolveStatus.id) {
                 return allPermissions.filter((perm) => perm.action === 'VIEW');
@@ -108,6 +114,7 @@ exports.ModuleAccessService = ModuleAccessService = __decorate([
     __metadata("design:paramtypes", [module_access_repository_1.ModuleAccessRepository,
         menu_repository_1.MenuRepository,
         typeorm_1.DataSource,
-        list_master_service_1.ListMasterService])
+        list_master_service_1.ListMasterService,
+        reflection_helper_service_1.ReflectionHelper])
 ], ModuleAccessService);
 //# sourceMappingURL=module-access.service.js.map

package/dist/module/module/service/module-access.service.js.map

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

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

@@ -18,6 +18,6 @@ export declare class NotificationsController {
     getNotifications(req: any, filterQuery: any): Promise<any>;
     markAllAsRead(req: any): Promise<{
         success: boolean;
-        affectedRows: any;
+        affectedRows: number;
     }>;
 }

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

@@ -1,13 +1,15 @@
-import { DataSource } from 'typeorm';
+import { EntityManager } from 'typeorm';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
 import * as admin from 'firebase-admin';
 import { ConfigService } from '@nestjs/config';
+import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
 export declare class NotificationsService {
-    private readonly dataSource;
+    private readonly entityManager;
     private readonly mediaDataService;
     private readonly configService;
+    private readonly reflectionHelper;
     private readonly firebaseAdmin;
-    constructor(dataSource: DataSource, mediaDataService: MediaDataService, configService: ConfigService, firebaseAdmin: typeof admin);
+    constructor(entityManager: EntityManager, mediaDataService: MediaDataService, configService: ConfigService, reflectionHelper: ReflectionHelper, firebaseAdmin: typeof admin);
     private tokens;
     saveToken(userId: string | undefined, token: string): Promise<{
         success: boolean;
@@ -22,6 +24,6 @@ export declare class NotificationsService {
     }): Promise<any>;
     markAllAsRead(loggedInUser: any): Promise<{
         success: boolean;
-        affectedRows: any;
+        affectedRows: number;
     }>;
 }

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

@@ -18,11 +18,13 @@ 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");
+const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 let NotificationsService = class NotificationsService {
-    constructor(dataSource, mediaDataService, configService, firebaseAdmin) {
-        this.dataSource = dataSource;
+    constructor(entityManager, mediaDataService, configService, reflectionHelper, firebaseAdmin) {
+        this.entityManager = entityManager;
         this.mediaDataService = mediaDataService;
         this.configService = configService;
+        this.reflectionHelper = reflectionHelper;
         this.firebaseAdmin = firebaseAdmin;
         this.tokens = new Map();
     }
@@ -67,18 +69,14 @@ 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),
-            String(level_id),
-            String(level_type),
-        ];
+        const params = [String(id), String(level_id), String(level_type)];
         paramIndex += 3;
         if (isReadFilter !== undefined) {
             sql += ` AND n.is_read = $${paramIndex}`;
@@ -86,10 +84,11 @@ let NotificationsService = class NotificationsService {
             paramIndex++;
         }
         sql += ` ORDER BY n.created_date DESC`;
-        const notifications = await this.dataSource.query(sql, params);
+        const notifications = await this.entityManager.query(sql, params);
         const mediaCache = new Map();
         for (const notification of notifications) {
-            notification.is_read = notification.is_read === 1 || notification.is_read === '1';
+            notification.is_read =
+                notification.is_read === 1 || notification.is_read === '1';
             try {
                 const baseUrl = this.configService.get('REDIRECT_BE_URL');
                 const queryParams = new URLSearchParams({
@@ -107,22 +106,25 @@ 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 params = [id, level_id, level_type];
-        const result = await this.dataSource.query(query, params);
-        return { success: true, affectedRows: result.affectedRows || 0 };
+        const notificationRepo = this.reflectionHelper.getRepoService('NotificationData');
+        const result = await notificationRepo.update({
+            user_id: id,
+            level_id: level_id,
+            level_type: level_type,
+            is_read: 0,
+        }, {
+            is_read: 1,
+        });
+        return { success: true, affectedRows: result.affected || 0 };
     }
 };
 exports.NotificationsService = NotificationsService;
 exports.NotificationsService = NotificationsService = __decorate([
     (0, common_1.Injectable)(),
-    __param(3, (0, common_1.Inject)('FIREBASE_ADMIN')),
-    __metadata("design:paramtypes", [typeorm_1.DataSource,
+    __param(4, (0, common_1.Inject)('FIREBASE_ADMIN')),
+    __metadata("design:paramtypes", [typeorm_1.EntityManager,
         media_data_service_1.MediaDataService,
-        config_1.ConfigService, Object])
+        config_1.ConfigService,
+        reflection_helper_service_1.ReflectionHelper, 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":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,qCAAqC;AACrC,8EAA8E;AAE9E,iCAA0B;AAC1B,2CAA+C;AAGxC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YACmB,UAAsB,EACtB,gBAAkC,EAClC,aAA4B,EACnB,aAA4C;QAHrD,eAAU,GAAV,UAAU,CAAY;QACtB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;QACF,kBAAa,GAAb,aAAa,CAAc;QAGhE,WAAM,GAAwB,IAAI,GAAG,EAAE,CAAC;IAF7C,CAAC;IAIJ,KAAK,CAAC,SAAS,CAAC,MAA0B,EAAE,KAAa;QACvD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,KAAa,EACb,KAAa,EACb,IAAY,EACZ,IAA0B;QAG1B,MAAM,eAAe,GAAG,CACtB,OAA4B,EACJ,EAAE,CAC1B,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACrC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS;gBAAE,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,CACH,CAAC;QAEJ,MAAM,OAAO,GAA4B;YACvC,KAAK;YACL,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;YAC7B,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;SAC/C,CAAC;QAEF,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YACnD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAGD,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,KAAa,EAAE,IAAY;QAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC;QAExD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,YAAiB,EACjB,WAAkC;QAElC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;QAKlD,IAAI,YAAY,GAAuB,SAAS,CAAC;QACjD,IAAI,WAAW,IAAI,WAAW,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACrD,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;YACpE,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACpC,CAAC;QAKD,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,GAAG,GAAG;;;yBAGW,UAAU;0BACT,UAAU,GAAG,CAAC;4BACZ,UAAU,GAAG,CAAC;GACvC,CAAC;QAEA,MAAM,MAAM,GAAa;YACvB,MAAM,CAAC,EAAE,CAAC;YACV,MAAM,CAAC,QAAQ,CAAC;YAChB,MAAM,CAAC,UAAU,CAAC;SACnB,CAAC;QACF,UAAU,IAAI,CAAC,CAAC;QAKhB,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,GAAG,IAAI,qBAAqB,UAAU,EAAE,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;YAClC,UAAU,EAAE,CAAC;QACf,CAAC;QAED,GAAG,IAAI,+BAA+B,CAAC;QAKvC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAK/D,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;QAE7B,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,KAAK,CAAC,IAAI,YAAY,CAAC,OAAO,KAAK,GAAG,CAAC;YAElF,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,iBAAiB,CAAC,CAAC;gBAClE,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC;oBACtC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;iBAC3C,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAEd,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAC9B,GAAG,OAAO,4BAA4B,YAAY,CAAC,OAAO,oBAAoB,WAAW,EAAE,EAC3F,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,CACpD,CAAC;gBAEF,YAAY,CAAC,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC5C,YAAY,CAAC,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC;YAC1D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,YAAiB;QACnC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;QAElD,MAAM,KAAK,GAAG;;;;GAIf,CAAC;QAEA,MAAM,MAAM,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE1D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC;IACnE,CAAC;CACF,CAAA;AAvJY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,gBAAgB,CAAC,CAAA;qCAHI,oBAAU;QACJ,qCAAgB;QACnB,sBAAa;GAJpC,oBAAoB,CAuJhC"}
+{"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

@@ -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/workflow/controller/action.controller.d.ts

@@ -11,7 +11,10 @@ export declare class ActionController {
         user: any;
     }, body: {
         list_type: string;
-    }): Promise<any>;
+    }): Promise<{
+        label: any;
+        value: any;
+    }[]>;
     getActions(req: Request & {
         user: any;
     }, stage_id: number): Promise<any[]>;
@@ -33,7 +36,7 @@ export declare class ActionController {
         name: any;
         reason_code: any;
         default_reason_code: any;
-        is_default: boolean;
+        is_default: any;
         is_current: any;
         is_done: any;
         is_mandatory: any;

package/dist/module/workflow/controller/form-master.controller.d.ts

@@ -4,7 +4,10 @@ export declare class FormMasterController {
     constructor(formMasterService: FormMasterService);
     getForms(req: Request & {
         user: any;
-    }, source_entity_type: string): Promise<any>;
+    }, source_entity_type: string): Promise<{
+        label: any;
+        value: any;
+    }[]>;
     submitForm(req: Request & {
         user: any;
     }, body: any): Promise<string>;

package/dist/module/workflow/repository/action-data.repository.d.ts

@@ -1,5 +1,5 @@
 import { ActionDataEntity } from '../entity/action-data.entity';
-import { DataSource, Repository } from 'typeorm';
+import { Repository } from 'typeorm';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { TaskDataEntity } from '../entity/task-data.entity';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
@@ -7,11 +7,10 @@ import { ConfigService } from '@nestjs/config';
 import { WorkflowAutomationEngineService } from 'src/module/workflow-automation/service/workflow-automation-engine.service';
 export declare class ActionDataRepository extends EntityServiceImpl {
     private readonly actionDataRepo;
-    private readonly dataSource;
     private readonly TaskRepository;
     private readonly configService;
     private readonly workflowAutomationEngineService;
-    constructor(actionDataRepo: Repository<ActionDataEntity>, dataSource: DataSource, TaskRepository: Repository<TaskDataEntity>, configService: ConfigService, workflowAutomationEngineService: WorkflowAutomationEngineService);
+    constructor(actionDataRepo: Repository<ActionDataEntity>, TaskRepository: Repository<TaskDataEntity>, configService: ConfigService, workflowAutomationEngineService: WorkflowAutomationEngineService);
     saveActionData(action: any, loggedInUser: UserData, mapped_entity_id: any, mapped_entity_type: any): Promise<any>;
     updateActionStatus(loggedInUser: UserData, mapped_entity_type: string, mapped_entity_id: number, stage_id: number, action_id: number): Promise<any>;
     resubmitAction(organization_id: number, mapped_entity_type: string, mapped_entity_id: number, stage_id: number, action_id: number): Promise<{