rez_core 5.0.85 → 5.0.86

package/src/module/meta/service/media-data.service.ts

@@ -2,12 +2,9 @@ import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { S3 } from 'aws-sdk';
 import axios from 'axios';
-import { DataSource } from 'typeorm';
+import { EntityManager } from 'typeorm';
 import { v4 as uuidv4 } from 'uuid';
-import {
-  ENTITYTYPE_MEDIA,
-  STATUS_PENDING,
-} from '../../../constant/global.constant';
+import { ENTITYTYPE_MEDIA, STATUS_PENDING } from '../../../constant/global.constant';
 import { MediaData } from '../entity/media-data.entity';
 import { MediaDataRepository } from '../repository/media-data.repository';
 import { EntityServiceImpl } from './entity-service-impl.service';
@@ -17,7 +14,7 @@ export class MediaDataService extends EntityServiceImpl {
   constructor(
     private readonly configService: ConfigService,
     private readonly mediaRepository: MediaDataRepository,
-    private dataSource: DataSource,
+    private entityManager: EntityManager,
   ) {
     super();
   }
@@ -197,11 +194,14 @@ export class MediaDataService extends EntityServiceImpl {
     const replacements: Record<string, string | null> = {};
 
     // --- ORG ---
-    let organizationData = await this.dataSource.query(
-      'SELECT * FROM sso_organization WHERE id = $1',
-      [loggedInUser.organization_id],
-    );
-    replacements['org_code'] = organizationData[0].code;
+    const organizationRepo = this.reflectionHelper.getRepoService('OrganizationData');
+    let organizationData = await organizationRepo.findOne({
+      where: {
+        id: loggedInUser.organization_id,
+      },
+    });
+
+    replacements['org_code'] = organizationData.code;
 
     // --- LEVEL CODE ---
     // Priority: If parent is provided, use parent for level_code; otherwise use normal logic
@@ -221,14 +221,13 @@ export class MediaDataService extends EntityServiceImpl {
     }
 
     // Get entity data for level_code
-    const getEntityData = await this.dataSource.query(
-      `SELECT * FROM cr_entity_master WHERE mapped_entity_type = $1 and organization_id = $2`,
-      [levelEntityType, loggedInUser.organization_id],
-    );
+    const getEntityData = await this.entityMasterService.getEntityData(levelEntityType, loggedInUser);
 
-    if (getEntityData.length == 0) return null;
-    const levelEntityDataResult = await this.dataSource.query(
-      `SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = $1`,
+    if (!getEntityData) return null;
+    const levelEntityDataResult = await this.entityManager.query(
+      `SELECT *
+       FROM ${getEntityData?.db_table_name}
+       WHERE id = $1`,
       [levelEntityId],
     );
 
@@ -269,14 +268,13 @@ export class MediaDataService extends EntityServiceImpl {
       // );
 
       // Get entity data for level_code
-      const getEntityData = await this.dataSource.query(
-        `SELECT * FROM cr_entity_master WHERE mapped_entity_type = $1 and organization_id = $2`,
-        [mappedEntityType, loggedInUser.organization_id],
-      );
+      const getEntityData = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
 
-      if (getEntityData.length == 0) return null;
-      const levelEntityDataResult = await this.dataSource.query(
-        `SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = $1`,
+      if (!getEntityData) return null;
+      const levelEntityDataResult = await this.entityManager.query(
+        `SELECT *
+         FROM ${getEntityData?.db_table_name}
+         WHERE id = $1`,
         [mappedEntityId],
       );
 
@@ -289,14 +287,13 @@ export class MediaDataService extends EntityServiceImpl {
         // If we have parent template, modify the path to include it
         pathTemplate = '${org_code}/template/${template_code}';
       } else {
-        const getEntityData = await this.dataSource.query(
-          `SELECT * FROM cr_entity_master WHERE mapped_entity_type = $1 and organization_id = $2`,
-          [mappedEntityType, loggedInUser.organization_id],
-        );
+        const getEntityData = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
 
-        if (getEntityData.length == 0) return null;
-        const levelEntityDataResult = await this.dataSource.query(
-          `SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = $1`,
+        if (!getEntityData) return null;
+        const levelEntityDataResult = await this.entityManager.query(
+          `SELECT *
+           FROM ${getEntityData?.db_table_name}
+           WHERE id = $1`,
           [mappedEntityId],
         );
 
@@ -417,14 +414,20 @@ export class MediaDataService extends EntityServiceImpl {
           return null;
         });
     } else {
-      organizationData = await this.dataSource.query(
-        'SELECT * FROM adm_org_profile WHERE id = $1',
-        [loggedInUser.organization_id],
-      );
-      levelData = await this.dataSource.query(
-        'SELECT * FROM adm_school_profile WHERE id = $1',
-        [loggedInUser.level_id],
-      );
+      const organizationProfileRepo = this.reflectionHelper.getRepoService('OrganizationProfile');
+      organizationData = await organizationProfileRepo.find({
+        where: {
+          id: loggedInUser.organization_id,
+        },
+      });
+
+      const schoolProfileRepo = this.reflectionHelper.getRepoService('School');
+
+      levelData = await schoolProfileRepo.find({
+        where: {
+          id: loggedInUser.level_id,
+        },
+      });
     }
 
     console.log(levelData);

package/src/module/module/repository/menu.repository.ts

@@ -2,10 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { DataSource, Repository } from 'typeorm';
 import { MenuData } from '../entity/menu.entity';
 import { ModuleAccess } from '../entity/module-access.entity';
-import { UserRoleMapping } from 'src/module/user/entity/user-role-mapping.entity';
-import { Role } from 'src/module/user/entity/role.entity';
 import { InjectRepository } from '@nestjs/typeorm';
-import { get } from 'http';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
@@ -14,16 +11,18 @@ export class MenuRepository extends Repository<MenuData> {
     private readonly dataSource: DataSource,
     @InjectRepository(MenuData) private readonly menuData: Repository<MenuData>,
     private readonly reflectionHelper: ReflectionHelper,
+    @InjectRepository(ModuleAccess) private readonly moduleAccessRepo: Repository<ModuleAccess>,
   ) {
     super(MenuData, dataSource.createEntityManager());
   }
 
   async getUserRoles(userId: number, appcode: string): Promise<number[]> {
-    const roles = await this.dataSource
-      .getRepository(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();
@@ -35,18 +34,20 @@ export class MenuRepository extends Repository<MenuData> {
     roleIds: number[],
     appCode: string,
   ): Promise<string[]> {
-    const roleCodes = await this.dataSource
-      .getRepository(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();
+      .getRawMany();
+
+    const codes = roleCodes.map(r => r.code);
 
-    const codes = roleCodes.map((role) => role.code);
     if (codes.length === 0) return [];
 
-    const modules = await this.dataSource
-      .getRepository(ModuleAccess)
+
+    const modules = await this.moduleAccessRepo
       .createQueryBuilder('moduleAccess')
       .select('moduleAccess.module_code')
       .where('moduleAccess.role_code IN (:...codes)', { codes })
@@ -101,32 +102,26 @@ export class MenuRepository extends Repository<MenuData> {
 
     if (userId) {
       // Check if user has any role mappings for the given appcode
-      const getUserDetails = await this.dataSource.query(
-        `
-            SELECT *
-            from sso_user
-            where id = $1
-        `,
-        [userId],
-      );
+      const userRepo = this.reflectionHelper.getRepoService('User');
+      const getUserDetails = await userRepo.findOne({
+        where: {
+          id: userId,
+        },
+      });
 
       // get user role from urm
-
-      const getUserUrm = await this.dataSource.query(
-        `
-            SELECT *
-            from sso_user_role_mapping
-            where user_id = $1
-              and appcode = $2
-        `,
-        [userId, appcode],
-      );
+      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)];
       }
     }
 
@@ -145,14 +140,12 @@ export class MenuRepository extends Repository<MenuData> {
 
     // 2. If SCH fallback → BRN → ORG
     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;

package/src/module/workflow/repository/comm-template.repository.ts

@@ -4,6 +4,7 @@ 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';
 
 @Injectable()
 export class CommTemplateRepository {
@@ -14,6 +15,7 @@ export class CommTemplateRepository {
     private readonly templateAttachEntity: Repository<TemplateAttach>,
     private readonly mediaDataService: MediaDataService,
     private readonly dataSource: DataSource,
+    private readonly reflectionHelper: ReflectionHelper,
   ) {}
 
   async getAllCommTemplate(
@@ -27,20 +29,20 @@ export class CommTemplateRepository {
 
     // 1️⃣ Only check action_id if provided
     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

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

@@ -547,27 +547,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
   ): Promise<number> {
     const { organization_id, level_id, level_type } = loggedInUser;
 
-    // 1) Get eligible owners (distinct + stable ordering) // axios call
-    // const owners: Array<{ id: number }> = await this.dataSource.query(
-    //   `
-    // SELECT DISTINCT u.id
-    // FROM sso_user u
-    // JOIN sso_user_role_mapping urm   ON u.id = urm.user_id
-    // JOIN sso_role r                  ON urm.role_id = r.id
-    // JOIN sso_module_access ma        ON ma.role_code = r.code
-    // WHERE urm.organization_id = ?
-    //   AND urm.level_id = ?
-    //   AND urm.level_type = ?
-    //   AND urm.appcode = 'CRM'
-    //   AND ma.appcode = 'CRM'
-    //   AND ma.module_code = 'lead_crm_sch'
-    //   AND ma.access_flag = 1
-    //   AND ma.action_type = 'LEAD_OWNER'
-    // ORDER BY u.id ASC
-    // `,
-    //   [organization_id, Number(level_id), level_type],
-    // );
-
     let owners = [] as any;
 
     try {

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}

package/dist/module/dev/dev.module.d.ts

@@ -1,2 +0,0 @@
-export declare class DevModule {
-}

package/dist/module/dev/dev.module.js

@@ -1,25 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DevModule = void 0;
-const common_1 = require("@nestjs/common");
-const entity_module_1 = require("../meta/entity.module");
-const user_module_1 = require("../user/user.module");
-const module_module_1 = require("../module/module.module");
-const dev_service_1 = require("./service/dev.service");
-let DevModule = class DevModule {
-};
-exports.DevModule = DevModule;
-exports.DevModule = DevModule = __decorate([
-    (0, common_1.Module)({
-        imports: [entity_module_1.EntityModule, user_module_1.UserModule, module_module_1.ModuleModule],
-        controllers: [],
-        providers: [dev_service_1.DevService],
-    })
-], DevModule);
-//# sourceMappingURL=dev.module.js.map

package/dist/module/dev/dev.module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dev.module.js","sourceRoot":"","sources":["../../../src/module/dev/dev.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,yDAAqD;AACrD,qDAAiD;AACjD,2DAAuD;AACvD,uDAAmD;AAO5C,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IALrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,4BAAY,EAAE,wBAAU,EAAE,4BAAY,CAAC;QACjD,WAAW,EAAE,EAAE;QACf,SAAS,EAAE,CAAC,wBAAU,CAAC;KACxB,CAAC;GACW,SAAS,CAAG"}

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

@@ -1,5 +0,0 @@
-import { UserService } from '../../user/service/user.service';
-export declare class DevService {
-    private readonly userService;
-    constructor(userService: UserService);
-}

package/dist/module/dev/service/dev.service.js

@@ -1,25 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DevService = void 0;
-const common_1 = require("@nestjs/common");
-const user_service_1 = require("../../user/service/user.service");
-let DevService = class DevService {
-    constructor(userService) {
-        this.userService = userService;
-    }
-};
-exports.DevService = DevService;
-exports.DevService = DevService = __decorate([
-    (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [user_service_1.UserService])
-], DevService);
-//# sourceMappingURL=dev.service.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"dev.service.js","sourceRoot":"","sources":["../../../../src/module/dev/service/dev.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAGvD,IAAM,UAAU,GAAhB,MAAM,UAAU;IACrB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;CAC1D,CAAA;AAFY,gCAAU;qBAAV,UAAU;IADtB,IAAA,mBAAU,GAAE;qCAE+B,0BAAW;GAD1C,UAAU,CAEtB"}

package/src/module/dev/dev.module.ts

@@ -1,12 +0,0 @@
-import { Module } from '@nestjs/common';
-import { EntityModule } from '../meta/entity.module';
-import { UserModule } from '../user/user.module';
-import { ModuleModule } from '../module/module.module';
-import { DevService } from './service/dev.service';
-
-@Module({
-  imports: [EntityModule, UserModule, ModuleModule],
-  controllers: [],
-  providers: [DevService],
-})
-export class DevModule {}

package/src/module/dev/service/dev.service.ts

@@ -1,7 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { UserService } from '../../user/service/user.service';
-
-@Injectable()
-export class DevService {
-  constructor(private readonly userService: UserService) {}
-}