rez_core 5.0.86 → 5.0.88

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

@@ -1,20 +1,16 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { InjectRepository } from '@nestjs/typeorm';
-import {
-  INVITATION_STATUS_ACCEPTED,
-  STATUS_ACTIVE,
-} from 'src/constant/global.constant';
+import { INVITATION_STATUS_ACCEPTED, STATUS_ACTIVE } from 'src/constant/global.constant';
 import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
-import { DataSource, Not, Repository, IsNull } from 'typeorm';
+import { Repository } from 'typeorm';
 import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
-import { Role } from '../entity/role.entity';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
-import { UserData } from '../entity/user.entity';
 import { UserSessionService } from './user-session.service';
 import { UserService } from './user.service';
 import { JwtAuthService } from 'src/module/auth/services/jwt.service';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
 export class LoginService {
@@ -24,16 +20,13 @@ export class LoginService {
     private configService: ConfigService,
     @InjectRepository(UserRoleMapping)
     private readonly userRoleMappingRepository: Repository<UserRoleMapping>,
-    @InjectRepository(Role)
-    private readonly roleRepo: Repository<Role>,
-    private readonly dataSource: DataSource,
     private readonly organizationRepository: OrganizationRepository,
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
     private readonly jwtAuthService: JwtAuthService,
-    @InjectRepository(UserData)
-    private readonly userRepository: Repository<UserData>,
-  ) {}
+    private readonly reflectionHelper: ReflectionHelper,
+  ) {
+  }
 
   masterKey: string = this.configService.get('MASTER_KEY') || '';
   masterIv: string = this.configService.get('MASTER_IV') || '';
@@ -196,16 +189,17 @@ export class LoginService {
     if (body) {
       const { entity_type, entity_id } = body;
 
-      const entityData = await this.dataSource.query(
-        `SELECT level_id, level_type, organization_id FROM ether_core.crm_lead where id = ${entity_id}`,
-      );
+      const leadRepo = this.reflectionHelper.getRepoService('CRMLead');
+      const entityData = await leadRepo.findOne({
+        where: { id: entity_id },
+      });
 
-      if (entityData.length > 0) {
-        const level_id = entityData[0].level_id;
-        const level_type = entityData[0].level_type;
-        const organization_id = entityData[0].organization_id;
+      if (entityData) {
+        const level_id = entityData.level_id;
+        const level_type = entityData.level_type;
+        const organization_id = entityData.organization_id;
 
-        const token = await this.jwtAuthService.generateJwt({
+        const token = this.jwtAuthService.generateJwt({
           level_id: level_id,
           level_type: level_type,
           organization_id: organization_id,
@@ -260,15 +254,21 @@ export class LoginService {
     if (brnAccesses.length) {
       const brandId = brnAccesses[0].level_id;
 
-      const rows = await this.dataSource.query(
-        `SELECT id FROM sso_school WHERE brand_id = $1 ORDER BY id ASC LIMIT 1`,
-        [brandId],
-      );
+      const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+
+      const rows = await schoolRepo.findOne({
+        where: {
+          brand_id: brandId,
+        },
+        order: {
+          id: 'ASC',
+        },
+      });
 
       if (rows.length) {
         return {
           level_type: 'SCH',
-          level_id: rows[0].id,
+          level_id: rows.id,
           appcode: brnAccesses[0].appcode,
         };
       } else {

package/src/module/user/service/user-session.service.ts

@@ -1,4 +1,3 @@
-import { get } from 'http';
 import { UserSession } from '../entity/user-session.entity';
 import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
 import { BadRequestException, Injectable } from '@nestjs/common';
@@ -6,9 +5,11 @@ import { UserSessionRepository } from '../repository/userSession.repository';
 import { JwtAuthService } from 'src/module/auth/services/jwt.service';
 import { ConfigService } from '@nestjs/config';
 import { UserRoleMappingService } from './user-role-mapping.service';
-import { DataSource } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { UserData } from '../entity/user.entity';
+import { InjectRepository } from '@nestjs/typeorm';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
 export class UserSessionService {
@@ -17,8 +18,11 @@ export class UserSessionService {
     private readonly jwtAuthService: JwtAuthService,
     private readonly clockIDGenService: ClockIDGenService,
     private configService: ConfigService,
-    private readonly userRoleMappingService: UserRoleMappingService,
-    private readonly dataSource: DataSource, // Assuming dataSource is injected for TypeORM operations
+    @InjectRepository(UserData)
+    private readonly  userDataRepository:Repository<UserData>,
+    @InjectRepository(UserRoleMapping)
+    private readonly  userRoleMappingRepository:Repository<UserRoleMapping>,
+    private readonly reflectionHelper: ReflectionHelper
   ) {}
   async createSession(user, appcode?: string, accessInfo?: any) {
     const sessionToken = this.clockIDGenService.idGenerator('SES');
@@ -86,26 +90,27 @@ export class UserSessionService {
       appcode: data.appcode,
     };
 
-    let getUserDetails;
+    let getUserDetails: UserData | null = null;
 
     if (currentUser) {
       // Check if user has any role mappings for the given appcode
-      getUserDetails = await this.dataSource.query(
-        `
-        SELECT * from sso_user where id = $1
-      `,
-        [currentUser.id],
-      );
+
+      getUserDetails = await this.userDataRepository.findOne({
+        where: {
+          id: currentUser.id,
+        }
+      })
     }
 
-    if (getUserDetails[0].organization_id == 1 && payload.level_type == 'ORG') {
+    if (getUserDetails?.organization_id == 1 && payload.level_type == 'ORG') {
       payload.organization_id = payload.level_id;
     }
 
-    await this.dataSource.query(
-      `UPDATE sso_user SET last_app_access  = $1 , last_level_type = $2, last_level_id = $3 WHERE id = $4`,
-      [data.appcode, data.level_type, data.level_id, currentUser.id],
-    );
+    await this.userDataRepository.update(currentUser.id, {
+      last_app_access: data.appcode,
+      last_level_type: data.level_type,
+      last_level_id: data.level_id,
+    });
 
     return {
       success: true,
@@ -122,21 +127,20 @@ export class UserSessionService {
     levelType: string,
     levelId: string,
   ): Promise<boolean> {
-    const count = await this.dataSource
-      .getRepository(UserRoleMapping)
-      .createQueryBuilder('sso_user_role_mapping')
-      .where('sso_user_role_mapping.user_id = :userId', { userId })
-      .andWhere('sso_user_role_mapping.appcode = :appcode', { appcode })
-      .andWhere('sso_user_role_mapping.level_type = :levelType', { levelType })
-      .andWhere('sso_user_role_mapping.level_id = :levelId', { levelId })
+
+    const count = await this.userRoleMappingRepository
+      .createQueryBuilder("urm")
+      .where("urm.user_id = :userId", { userId })
+      .andWhere("urm.appcode = :appcode", { appcode })
+      .andWhere("urm.level_type = :levelType", { levelType })
+      .andWhere("urm.level_id = :levelId", { levelId })
       .getCount();
 
     return count > 0;
   }
 
   async getUserRoleMappingForApp(userId: number, appcode: string) {
-    const mapping = await this.dataSource
-      .getRepository(UserRoleMapping)
+    const mapping = await this.userRoleMappingRepository
       .createQueryBuilder('sso_user_role_mapping')
       .where('sso_user_role_mapping.user_id = :userId', { userId })
       .andWhere('sso_user_role_mapping.appcode = :appcode', { appcode })
@@ -149,16 +153,21 @@ export class UserSessionService {
 
     //DONE
     // If BRN, resolve first SCH under this brand
-    const schools = await this.dataSource.query(
-      `SELECT id FROM sso_school WHERE brand_id = $1 ORDER BY id ASC LIMIT 1`,
-      [mapping.level_id],
-    );
-
-    if (schools.length) {
+    const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+    const schools = await schoolRepo.findOne({
+      where: {
+        brand_id: mapping.level_id
+      },
+      order: {
+        id: "ASC"
+      }
+    });
+
+    if (schools) {
       return {
         ...mapping,
         level_type: 'SCH',
-        level_id: schools[0].id,
+        level_id: schools.id,
       };
     }
 

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

@@ -94,18 +94,6 @@ export class StageRepository {
     `,
       [stageGroup.workflow_id, organization_id, stage_group_id],
     );
-    // const rows2 = 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 = ? AND g.organization_id = ?
-    // ORDER BY g.id, s.id
-    // `,
-    //   [stageGroup.workflow_id, organization_id],
-    // );
 
     // console.log(rows2, '-----------INNER JOIN----------');
 

package/src/module/workflow/service/action-template-mapping.service.ts

@@ -1,21 +1,20 @@
-import { level } from 'winston';
 import { Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { DataSource, Repository } from 'typeorm';
+import { Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { ListMasterItems } from '../../listmaster/entity/list-master-items.entity';
 import { CommTemplate } from '../entity/comm-template.entity';
 
 @Injectable()
 export class ActionTemplateMappingService extends EntityServiceImpl {
-  constructor(private readonly dataSource: DataSource,
-              @InjectRepository(ListMasterItems)
+  constructor(@InjectRepository(ListMasterItems)
               private listMasterItemsRepo: Repository<ListMasterItems>,
               @InjectRepository(CommTemplate)
               private commTemplateRepository: Repository<CommTemplate>,
-              ) {
+  ) {
     super();
   }
+
   async getTemplateByMode(
     stage_id: number,
     action_id: number,
@@ -25,26 +24,26 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
     let stageAction = [] as any;
 
     if (action_id != 0) {
-      stageAction = await this.dataSource.query(
-        `
-      SELECT id FROM frm_wf_stage_action_mapping
-      WHERE action_id = $1
-      `,
-        [action_id],
-      );
+      const stageActionMappingRepo = this.reflectionHelper.getRepoService('StageActionMapping');
+
+      stageAction = await stageActionMappingRepo.find({
+        where: {
+          action_id: action_id,
+        },
+      });
     } else {
       // generic action
       // get template by mode
 
       let modeId = mode;
       if (!modeId) {
-        const rows =  await this.listMasterItemsRepo.find({
+        const rows = await this.listMasterItemsRepo.find({
           where: {
             listtype: 'MOD',
             code: 'email',
             organization_id: loggedInUser.organization_id,
-          }
-        })
+          },
+        });
 
         modeId = rows?.[0]?.id ?? 0;
       }
@@ -89,43 +88,44 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
     const stgActMappingId = stageAction[0].id;
 
     if (!mode) {
-      const getModeFromAction = await this.dataSource.query(
-        `
-        SELECT mode FROM frm_wf_action
-        WHERE id = $1
-        `,
-        [action_id],
-      );
-      mode = getModeFromAction[0]?.mode;
-    }
+      const actionRepo = this.reflectionHelper.getRepoService('ActionEntity');
+      const getModeFromAction = await actionRepo.findOne({
+        where: {
+          id: action_id,
+        },
+      });
 
-    const templates = await this.dataSource.query(
-      `
-      SELECT template_code FROM frm_wf_action_resources_mapping
-      WHERE stg_act_mapping_id = $1 
-      `,
-      [stgActMappingId],
-    );
+      mode = getModeFromAction?.mode;
+    }
+    const actionResourceMappingRepo = this.reflectionHelper.getRepoService('ActionResourcesMapping');
+    const templates = await actionResourceMappingRepo.find({
+      where: {
+        stg_act_mapping_id: 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)
-  `,
-      [
-        templateCodes,
-        mode,
-        loggedInUser.organization_id,
-        loggedInUser.level_type,
-        Number(loggedInUser.level_id),
-        Number(loggedInUser.organization_id),
-      ],
-    );
+    const commTemplateRepo = this.reflectionHelper.getRepoService('CommTemplate');
 
-    return commTemplates;
+    return await commTemplateRepo
+      .createQueryBuilder('ct')
+      .select([
+        'ct.code AS value',
+        'ct.name AS label',
+        'ct.id AS id',
+      ])
+      .where('ct.code IN (:...codes)', { codes: templateCodes })
+      .andWhere('ct.mode = :mode', { mode })
+      .andWhere('ct.organization_id = :orgId', { orgId: loggedInUser.organization_id })
+      .andWhere('ct.level_type = :levelType', { levelType: loggedInUser.level_type })
+      .andWhere('ct.level_id = :levelId', { levelId: Number(loggedInUser.level_id) })
+      .andWhere(`ct.status IN (
+      SELECT id FROM frm_list_master_items 
+      WHERE code = 'STATUS_ACTIVE' 
+        AND organization_id = :orgId2
+    )`, { orgId2: loggedInUser.organization_id })
+      .getRawMany();
   }
 }

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

@@ -34,11 +34,6 @@ export class PopulateWorkflowService extends EntityServiceImpl {
 
     if (!listMasterItemsRepo) return;
 
-    // let statusRow = await this.dataSource.query(
-    //   `SELECT * FROM frm_list_master_items WHERE code='STATUS_ACTIVE' AND organization_id = $1`,
-    //   [organization_id],
-    // );
-
     let statusRow = await listMasterItemsRepo.findOne({
       where: { code: 'STATUS_ACTIVE', organization_id: organization_id },
     });
@@ -117,14 +112,6 @@ export class PopulateWorkflowService extends EntityServiceImpl {
     const viewMasterRepo = this.reflectionHelper.getRepoService('ViewMaster');
 
     // Fetch all base data
-    // const getAllFactoryData = async (table: { table: string }) =>
-    //   this.dataSource.query(
-    //     `SELECT * FROM ${table.table} WHERE organization_id = -1 AND level_type = 'ORG' AND level_id = -1`,
-    //   );
-    // const factoryData = await Promise.all(
-    //   workflowTables.map(getAllFactoryData),
-    // );
-    // const [workflows, stageGroups, stages] = factoryData;
 
     // === 1. Workflow mapping
     const workflowIdMap: Record<number, number> = {};

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

@@ -351,10 +351,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
       }
     })
 
-    // const assignmentType = await this.dataSource.query(
-    //   `SELECT value FROM frm_list_master_items WHERE id = ${Number(firstAction.assignment_type)}`,
-    // );
-
     // save in action data
     await this.actionDataService.saveActionData(
       actions,
@@ -598,20 +594,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
     const nextUser = userIds[nextIdx];
 
     //4) Update lead owner in the lead table no need because we are updating lead owner in updateLeadOwner method
-    // await this.dataSource.query(
-    //   `
-    // UPDATE crm_lead
-    // SET lead_owner = ?
-    // WHERE organization_id = ?
-    //   AND level_id = ?
-    //   AND level_type = ?
-    //   AND lead_owner IS NULL
-    // ORDER BY created_date ASC
-    // LIMIT 1
-    // `,
-    //   [nextUser, organization_id, Number(level_id), level_type],
-    // );
-
     console.log(`Assigning lead to user ID: ${nextUser}`);
 
     const firstAction = actions[0];

package/src/module/workflow-automation/service/workflow-automation-engine.service.ts

@@ -168,11 +168,6 @@ export class WorkflowAutomationEngineService {
     for (const action of actions) {
       try {
         // 2 Resolve action_decorator using action_category_id
-        // const category = await this.dataSource.query(
-        //   `SELECT action_decorator FROM frm_wf_action_category WHERE id = ?`,
-        //   [action.action_category_id],
-        // );
-
         const category = await this.actionCateRepo.findOne({
           where: {
             id: action.action_category_id,

package/.idea/250218_nodejs_core.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/codeStyles/Project.xml

@@ -1,59 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/250218_nodejs_core.iml" filepath="$PROJECT_DIR$/.idea/250218_nodejs_core.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>