rez_core 5.0.86 → 5.0.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "5.0.86",
+  "version": "5.0.88",
   "description": "",
   "author": "",
   "private": false,

package/src/module/enterprise/repository/school.repository.ts

@@ -1,34 +1,32 @@
 import { Injectable } from '@nestjs/common';
-// import { InjectRepository } from '@nestjs/typeorm';
-import { DataSource, Repository } from 'typeorm';
-// import { SchoolData } from '../entity/school.entity';
-import { UserRoleMapping } from 'src/module/user/entity/user-role-mapping.entity';
 import { STATUS_INACTIVE } from 'src/constant/global.constant';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
 export class SchoolRepository {
-  constructor(private readonly dataSource: DataSource) {}
+  constructor(private readonly reflectionHelper: ReflectionHelper) {
+  }
 
   async findAllByOrgId(orgId: number): Promise<any[]> {
-    return await this.dataSource
-      .createQueryBuilder()
-      .select(['*'])
-      .from('sso_school', 'sch')
-      .where('sch.organization_id = :orgId', { orgId })
-      .getRawMany();
+    const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+    return await schoolRepo.find({
+      where: {
+        organization_id: orgId,
+      },
+    });
   }
 
   async findAllByBrandId(brdId: number): Promise<any[]> {
-    return await this.dataSource
-      .createQueryBuilder()
-      .select(['*'])
-      .from('sso_school', 'sch')
-      .where('sch.brand_id = :brdId', { brdId })
-      .getRawMany();
+    const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+    return await schoolRepo.find({
+      where: {
+        brand_id: brdId,
+      },
+    });
   }
 
   async getUserContextDropdown(userId: number, appCode: string, org_id) {
-    const userRoleRepo = this.dataSource.getRepository(UserRoleMapping);
+    const userRoleRepo = this.reflectionHelper.getRepoService('UserRoleMapping');
 
     const hasOrgAccess = await userRoleRepo
       .createQueryBuilder('urm')
@@ -42,19 +40,19 @@ export class SchoolRepository {
       currentORGLevel_id = org_id;
     }
 
-    const resolvedInactiveStatus = await this.dataSource
-      .createQueryBuilder()
-      .select('*')
-      .from('frm_list_master_items', 'cli')
-      .where('cli.code = :code AND cli.organization_id = :orgId', {
+    const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
+    const resolvedInactiveStatus = await listMasterItemsRepo.findOne({
+      where: {
         code: STATUS_INACTIVE,
-        orgId: org_id,
-      })
-      .getRawOne();
+        organization_id: org_id,
+      },
+    });
 
     if (hasOrgAccess.length > 0) {
-      const schools = await this.dataSource
-        .createQueryBuilder()
+      const organizationRepo = this.reflectionHelper.getRepoService('OrganizationData');
+
+      const schools = await organizationRepo
+        .createQueryBuilder('org')
         .select([
           'org.id AS org_id',
           'org.name AS org_name',
@@ -70,14 +68,18 @@ export class SchoolRepository {
           'school.location AS school_location',
           'school.status AS school_status',
         ])
-        .from('sso_organization', 'org')
-        .innerJoin('sso_organization', 'brn', "brn.type = 'BRN' AND brn.parent_id::varchar = org.id::varchar")
-        // .innerJoin(
-        //   'eth_brand_profile',
-        //   'brand_profile',
-        //   'brand_profile.parent_id = brn.id AND brand_profile.organization_id = org.id',
-        // )
-        .innerJoin('sso_school', 'school', 'school.brand_id::varchar = brn.id::varchar')
+        // JOIN brand (on the same table)
+        .innerJoin(
+          'sso_organization',
+          'brn',
+          'brn.type = \'BRN\' AND brn.parent_id::varchar = org.id::varchar',
+        )
+        // JOIN school table
+        .innerJoin(
+          'sso_school',
+          'school',
+          'school.brand_id::varchar = brn.id::varchar',
+        )
         .where('org.id = :orgId', { orgId: String(currentORGLevel_id) })
         .distinct(true)
         .getRawMany();
@@ -99,15 +101,12 @@ export class SchoolRepository {
             school_status,
           } = row;
 
-          const orgStatus = await this.dataSource
-            .createQueryBuilder()
-            .select('*')
-            .from('frm_list_master_items', 'cli')
-            .where('cli.id = :id AND cli.organization_id = :orgId', {
+          const orgStatus = await listMasterItemsRepo.findOne({
+            where: {
               id: org_status,
-              orgId: org_id,
-            })
-            .getRawOne();
+              organization_id: org_id,
+            },
+          });
 
           if (!result[org_id]) {
             result[org_id] = {
@@ -120,15 +119,12 @@ export class SchoolRepository {
             };
           }
 
-          const brandStatus = await this.dataSource
-            .createQueryBuilder()
-            .select('*')
-            .from('frm_list_master_items', 'cli')
-            .where('cli.id = :id AND cli.organization_id = :orgId', {
+          const brandStatus = await listMasterItemsRepo.findOne({
+            where: {
               id: brand_status,
-              orgId: org_id,
-            })
-            .getRawOne();
+              organization_id: org_id,
+            },
+          });
 
           if (!result[org_id].brands[brand_id]) {
             result[org_id].brands[brand_id] = {
@@ -140,15 +136,12 @@ export class SchoolRepository {
             };
           }
 
-          const schoolStatus = await this.dataSource
-            .createQueryBuilder()
-            .select('*')
-            .from('frm_list_master_items', 'cli')
-            .where('cli.id = :id AND cli.organization_id = :orgId', {
+          const schoolStatus = await listMasterItemsRepo.findOne({
+            where: {
               id: school_status,
-              orgId: org_id,
-            })
-            .getRawOne();
+              organization_id: org_id,
+            },
+          });
 
           const finalSchoolName =
             schoolStatus?.id === resolvedInactiveStatus?.id
@@ -168,14 +161,12 @@ export class SchoolRepository {
           brands: Object.values(org.brands),
         }));
       } else {
-        const orgDetails = await this.dataSource.createQueryBuilder();
 
-        orgDetails
-          .select(['*'])
-          .from('sso_organization', 'org')
-          .where('org.id = :orgId', { orgId: currentORGLevel_id });
-
-        const orgResult = await orgDetails.getRawOne();
+        const orgResult = await organizationRepo.findOne({
+          where: {
+            id: currentORGLevel_id,
+          },
+        });
 
         return [
           {
@@ -189,18 +180,21 @@ export class SchoolRepository {
         ];
       }
     } else {
-      const brnMappings = await this.dataSource
-        .createQueryBuilder()
+
+      const userRoleMappingRepo = this.reflectionHelper.getRepoService('UserRoleMapping');
+
+      const brnMappings = await userRoleMappingRepo
+        .createQueryBuilder('urm')
         .select([
           'brand.id AS brand_id',
           'brand.name AS brand_name',
           'brand.status AS brand_status',
+
           'school.id AS school_id',
           'school.name AS school_name',
           'school.location AS school_location',
           'school.status AS school_status',
         ])
-        .from('sso_user_role_mapping', 'urm')
         .innerJoin('sso_organization', 'brand', 'brand.id = urm.level_id')
         .innerJoin('sso_school', 'school', 'school.brand_id = brand.id')
         .where('urm.user_id = :userId', { userId })
@@ -209,24 +203,24 @@ export class SchoolRepository {
         .distinct(true)
         .getRawMany();
 
-      const schMappings = await this.dataSource
-        .createQueryBuilder()
+      const schMappings = await userRoleMappingRepo
+        .createQueryBuilder('urm')
         .select([
           'brand.id AS brand_id',
           'brand.name AS brand_name',
           'brand.status AS brand_status',
+
           'school.id AS school_id',
           'school.name AS school_name',
           'school.location AS school_location',
           'school.status AS school_status',
         ])
-        .from('sso_user_role_mapping', 'urm')
         .innerJoin('sso_school', 'school', 'school.id = urm.level_id')
         .innerJoin('sso_organization', 'brand', 'brand.id = school.brand_id')
         .where('urm.user_id = :userId', { userId })
         .andWhere('urm.appcode = :appCode', { appCode })
         .andWhere('urm.level_type = :levelType', { levelType: 'SCH' })
-        .distinct(true) // avoids duplicates from duplicate addresses
+        .distinct(true)
         .getRawMany();
 
       const allMappings = [...brnMappings, ...schMappings];

package/src/module/mapper/service/field-mapper.service.ts

@@ -1,10 +1,9 @@
-import { Inject, Injectable, Logger, LoggerService } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { FieldMapperRepository } from '../repository/field-mapper.repository';
 import { FieldMapperDto } from '../dto/field-mapper.dto';
 import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
 import { UserData } from '../../user/entity/user.entity';
 import { FieldLovsRepository } from '../repository/field-lovs.repository';
-import { DataSource } from 'typeorm';
 import { FilterService } from 'src/module/filter/service/filter.service';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { LoggingService } from 'src/utils/service/loggingUtil.service';
@@ -14,7 +13,6 @@ export class FieldMapperService extends EntityServiceImpl {
   constructor(
     private readonly fieldMapperRepository: FieldMapperRepository,
     private readonly fieldLovsRepository: FieldLovsRepository,
-    private readonly datasource: DataSource,
     private readonly filterService: FilterService,
     @Inject() protected readonly loggingService: LoggingService,
   ) {
@@ -139,14 +137,14 @@ export class FieldMapperService extends EntityServiceImpl {
               inMemory[entityType][filterCode] =
                 entity_data[field.mapped_entity_type];
             } else {
-              const relations = await this.datasource.query(
-                `SELECT target_entity_id
-                 FROM frm_entity_relation_data
-                 WHERE source_entity_type = $1
-                   AND source_entity_id = $2
-                   AND target_entity_type = $3`,
-                [parent_type, parent_id, field.mapped_entity_type],
-              );
+              const relationDataRepo = this.reflectionHelper.getRepoService('EntityRelationData');
+              const relations = await relationDataRepo.find({
+                where: {
+                  source_entity_type: parent_type,
+                  source_entity_id: parent_id,
+                  target_entity_type: field.mapped_entity_type,
+                },
+              });
 
               const targetEntityIds = relations.map((r) => r.target_entity_id);
 
@@ -237,8 +235,8 @@ export class FieldMapperService extends EntityServiceImpl {
         }
       }
 
-      // ----------------------------------------------------------------
-      // LOAD (External → System)
+        // ----------------------------------------------------------------
+        // LOAD (External → System)
       // ----------------------------------------------------------------
       else if (action === 'LOAD' && inputJson) {
         let value = inputJson[field.source_attribute];

package/src/module/meta/repository/entity-attribute-update.repository.ts

@@ -1,44 +1,48 @@
 import { Injectable } from '@nestjs/common';
-import { DataSource } from 'typeorm';
+import { EntityManager } from 'typeorm';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
 export class EntityUpdateRepository {
-  constructor(private readonly dataSource: DataSource) {}
+  constructor(private readonly entityManager: EntityManager,
+              private readonly reflectionHelper: ReflectionHelper,
+  ) {
+  }
 
 
- async updateEntityAttribute(entity, config ) {
-  const {entityType, organization_id} = entity;
+  async updateEntityAttribute(entity, config) {
+    const { entityType, organization_id } = entity;
 
-  // 1. Get the table name
+    // 1. Get the table name
+    const entityMasterRepo = this.reflectionHelper.getRepoService('EntityMaster');
 
-  const result = await this.dataSource.query(
-    `SELECT db_table_name 
-     FROM frm_entity_master 
-     WHERE mapped_entity_type = ?
-     and organization_id = ?`,
-    [config.entity_type, organization_id],
-  );
+    const result = await entityMasterRepo.findOne({
+      where: {
+        mapped_entity_type: entityType,
+        organization_id,
+      },
+    });
 
-  if (!result.length) {
-    throw new Error("Entity table not found");
-  }
+    if (!result) {
+      throw new Error('Entity table not found');
+    }
 
-  const entityTableName = result[0].db_table_name;
+    const entityTableName = result.db_table_name;
 
-  // 2. Determine the ID condition
+    // 2. Determine the ID condition
 
-const isLead = config.entity_type === "LEAD";
-const idColumn = isLead ? "id" : "parent_id";
+    const isLead = config.entity_type === 'LEAD';
+    const idColumn = isLead ? 'id' : 'parent_id';
 
-  // 3. Update using dynamic table name
+    // 3. Update using dynamic table name
 
-return await this.dataSource
-  .createQueryBuilder()
-  .update(entityTableName)
-  .set({ [config.attribute_key]: config.attribute_value })
-  .where(`${idColumn} = :id`, { id: entity.id })
-  .execute();
+    return await this.entityManager
+      .createQueryBuilder()
+      .update(entityTableName)
+      .set({ [config.attribute_key]: config.attribute_value })
+      .where(`${idColumn} = :id`, { id: entity.id })
+      .execute();
 
-}
+  }
 
 }

package/src/module/meta/repository/entity-master.repository.ts

@@ -1,21 +1,22 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { EntityMaster } from '../entity/entity-master.entity';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, DataSource } from 'typeorm';
+import { Repository } from 'typeorm';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
-import { EntityRelationService } from '../service/entity-relation.service';
 import { EntityRelation } from '../entity/entity-relation.entity';
+import { AttributeMaster } from '../entity/attribute-master.entity';
 
 @Injectable()
 export class EntityMasterRepository {
   constructor(
     @InjectRepository(EntityMaster)
     private readonly entityMasterRepository: Repository<EntityMaster>,
-    private readonly dataSource: DataSource,
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
     @InjectRepository(EntityRelation)
     private readonly entityRelationRepo: Repository<EntityRelation>,
+    @InjectRepository(AttributeMaster)
+    private readonly attributeMasterRepository: Repository<AttributeMaster>
   ) {
   }
 
@@ -92,20 +93,17 @@ export class EntityMasterRepository {
   async getAttributesOfTypeDate(entity_type, loggedInUser) {
     const organization_id = loggedInUser.organization_id;
 
-    const attributes = await this.dataSource.query(
-      `SELECT *
-       FROM frm_entity_attribute
-       WHERE mapped_entity_type = $1
-         AND data_type = 'DATE'
-         AND organization_id = $2`,
-      [entity_type, organization_id],
-    );
+    const attributes = await this.attributeMasterRepository.find({
+      where: {
+        mapped_entity_type: entity_type,
+        data_type: 'DATE',
+        organization_id
+      }
+    })
 
-    const attributeList = attributes.map((attr) => ({
+    return attributes.map((attr) => ({
       label: attr.name,
       value: attr.attribute_key,
     }));
-
-    return attributeList;
   }
 }

package/src/module/meta/service/entity-dynamic.service.ts

@@ -168,14 +168,6 @@ export class EntityDynamicService {
       },
     });
 
-    // const getRelation = await this.dataSource.query(
-    //   `SELECT *
-    //    FROM frm_entity_relation
-    //    WHERE organization_id = $1
-    //      AND source_entity_type = $2`,
-    //   [organizationId, entityType],
-    // );
-
     const { mappedEntities, ...mainData } = data;
 
     // create main entity
@@ -220,23 +212,9 @@ export class EntityDynamicService {
             source_entity_id: mainID,
             source_entity_type: entityType,
             target_entity_id: createdRelatedEntity.id,
-            targetEntityType: targetEntityType,
+            target_entity_type: targetEntityType,
             relation_type: relationType,
           });
-
-          // await this.dataSource.query(
-          //   `INSERT INTO frm_entity_relation_data (organization_id, source_entity_id, source_entity_type,
-          //                                          target_entity_id, target_entity_type, relation_type)
-          //    VALUES ($1, $2, $3, $4, $5, $6)`,
-          //   [
-          //     organizationId,
-          //     mainID,
-          //     entityType,
-          //     createdRelatedEntity.id,
-          //     targetEntityType,
-          //     relationType,
-          //   ],
-          // );
         }
       }
     }
@@ -266,7 +244,10 @@ export class EntityDynamicService {
       this.reflectionHelper.getRepoService('EntityRelationData');
 
     const relations = await relationRepo.find({
-      where: { source_entity_type: entityType },
+      where: {
+        source_entity_type: entityType,
+        organization_id: loggedInUser.organization_id,
+      },
     });
 
     const targetTypes = relations.map((r) => r.target_entity_type);
@@ -397,20 +378,6 @@ export class EntityDynamicService {
               loggedInUser,
             );
           } else {
-            // Delete the related entity if we are creating a new one
-            // for (const existingRel of existingRelationsForType) {
-            //   await this.deleteEntity(
-            //     existingRel.target_entity_type,
-            //     existingRel.target_entity_id,
-            //     loggedInUser,
-            //   );
-
-            //   // Delete the relation row
-            //   await this.dataSource.query(
-            //     `DELETE FROM frm_entity_relation_data WHERE id = ?`,
-            //     [existingRel.id],
-            //   );
-            // }
             // Create new entity
             const createdEntity = await this.createEntity(
               targetEntityType,

package/src/module/meta/service/resolver.service.ts

@@ -1,4 +1,3 @@
-import { DataSource } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
 import { UserData } from '../../user/entity/user.entity';
 import * as moment from 'moment';
@@ -6,19 +5,23 @@ import { ListMasterService } from 'src/module/listmaster/service/list-master.ser
 import { ModuleRef } from '@nestjs/core';
 import { AttributeMasterRepository } from '../repository/attribute-master.repository';
 import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
+import { EntityMasterRepository } from '../repository/entity-master.repository';
+import { EntityManager } from 'typeorm';
 
 @Injectable()
 export class ResolverService {
   private mediaDataService: any;
 
   constructor(
-    private readonly dataSource: DataSource,
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
     private readonly moduleRef: ModuleRef,
     private readonly attributeMasterRepo: AttributeMasterRepository,
     private readonly reflectionHelper: ReflectionHelper,
-  ) {}
+    private readonly entityMasterRepo: EntityMasterRepository,
+    private readonly entityManger: EntityManager,
+  ) {
+  }
 
   private async getMediaDataService() {
     if (!this.mediaDataService) {
@@ -138,26 +141,12 @@ export class ResolverService {
     }
 
     // fetch attribute meta only for the given attributeKey
-    const [attr] = await this.dataSource.query(
-      `SELECT *
-       FROM frm_entity_attribute
-       WHERE mapped_entity_type = $1
-         AND organization_id = $2
-         AND attribute_key = $3`,
-      [entityType, loggedInUser.organization_id, attrKey],
-    );
-
+    const attr = await this.attributeMasterRepo.findByMappedEntityTypeAndAttributeKeyAndOrganizationId(entityType, attrKey, loggedInUser.organization_id);
     if (!attr) return rawValue;
 
     // -------- ENTITY data_source_type --------
     if (attr.data_source_type === 'entity') {
-      const [entityDef] = await this.dataSource.query(
-        `SELECT *
-         FROM frm_entity_master
-         WHERE mapped_entity_type = $1
-           AND organization_id = $2`,
-        [attr.datasource_list, loggedInUser.organization_id],
-      );
+      const entityDef = await this.entityMasterRepo.getEntityByMappedEntityType(attr.datasource_list, loggedInUser.organization_id);
 
       if (!entityDef) return rawValue;
 
@@ -181,7 +170,7 @@ export class ResolverService {
               ? [code]
               : [code, loggedInUser.organization_id];
 
-          const [item] = await this.dataSource.query(query, params);
+          const [item] = await this.entityManger.query(query, params);
           resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
         }
         return resolvedValues;
@@ -201,7 +190,7 @@ export class ResolverService {
             ? [rawValue]
             : [rawValue, loggedInUser.organization_id];
 
-        const [item] = await this.dataSource.query(query, params);
+        const [item] = await this.entityManger.query(query, params);
         return item?.[attr.data_source_attribute] ?? rawValue;
       }
     }
@@ -211,8 +200,7 @@ export class ResolverService {
       if (Array.isArray(rawValue)) {
         const resolvedValues: string[] = [];
         for (const code of rawValue) {
-          const repo =
-            await this.reflectionHelper.getRepoService('ListMasterItems');
+          const repo = this.reflectionHelper.getRepoService('ListMasterItems');
 
           let item = repo.findOne({
             where: {
@@ -254,26 +242,13 @@ export class ResolverService {
     }
 
     // fetch attribute meta
-    const [attr] = await this.dataSource.query(
-      `SELECT *
-       FROM frm_entity_attribute
-       WHERE mapped_entity_type = $1
-         AND organization_id = $2
-         AND attribute_key = $3`,
-      [entityType, loggedInUser.organization_id, attrKey],
-    );
+    const attr = await this.attributeMasterRepo.findByMappedEntityTypeAndAttributeKeyAndOrganizationId(entityType, attrKey, loggedInUser.organization_id);
 
     if (!attr) return displayValue;
 
     // -------- ENTITY data_source_type --------
     if (attr.data_source_type === 'entity') {
-      const [entityDef] = await this.dataSource.query(
-        `SELECT *
-         FROM frm_entity_master
-         WHERE mapped_entity_type = $1
-           AND organization_id = $2`,
-        [attr.datasource_list, loggedInUser.organization_id],
-      );
+      const entityDef =await this.entityMasterRepo.getEntityByMappedEntityType(attr.datasource_list, loggedInUser.organization_id);
 
       if (!entityDef) return displayValue;
 
@@ -294,20 +269,21 @@ export class ResolverService {
           ? [displayValue]
           : [displayValue, loggedInUser.organization_id];
 
-      const [item] = await this.dataSource.query(query, params);
+      const [item] = await this.entityManger.query(query, params);
       return item?.id ?? displayValue;
     }
 
     // -------- MASTER data_source_type --------
     else if (attr.data_source_type === 'master') {
-      const [item] = await this.dataSource.query(
-        `SELECT id
-         FROM frm_list_master_items
-         WHERE ${attr.data_source_attribute} = $1
-           AND organization_id = $2
-           AND listtype = $3`,
-        [displayValue, loggedInUser.organization_id, attr.datasource_list],
-      );
+      const listMasterItemsRepo =  this.reflectionHelper.getRepoService('ListMasterItems');
+
+      const item = await listMasterItemsRepo.findOne({
+        where: { [attr.data_source_attribute] : displayValue,
+        organization_id: loggedInUser.organization_id,
+        listtype: attr.datasource_list
+        }
+      })
+
       return item?.id ?? displayValue;
     }
 

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

@@ -102,7 +102,7 @@ export class MenuRepository extends Repository<MenuData> {
 
     if (userId) {
       // Check if user has any role mappings for the given appcode
-      const userRepo = this.reflectionHelper.getRepoService('User');
+      const userRepo = this.reflectionHelper.getRepoService('UserData');
       const getUserDetails = await userRepo.findOne({
         where: {
           id: userId,