rez_core 2.1.16 → 2.1.18

package/dist/utils/service/encryptUtil.service.js

@@ -41,7 +41,7 @@ let EncryptUtilService = class EncryptUtilService {
             return decrypted;
         }
         catch (error) {
-            throw new common_1.InternalServerErrorException('Encryption process failed');
+            throw new common_1.InternalServerErrorException('Decryption process failed');
         }
     }
     static encryptCBC(data, Datakey, Dataiv) {

package/package.json

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

package/src/module/enterprise/controller/organization.controller.ts

@@ -23,10 +23,7 @@ export class OrganizationController {
 
   @UseGuards(JwtAuthGuard)
   @Get('hierarchy')
-  async getOrganizationHierarchy(@Req() req: Request & { user: any }) {
-    const userId = req.user.userData?.id;
-    const appcode = req.user.userData?.appcode;
-
-    return await this.orgService.getOrganizationHierarchy(userId, appcode);
+  async getOrganizationHierarchy(): Promise<any[]> {
+    return await this.orgService.getOrganizationHierarchy();
   }
 }

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

@@ -24,153 +24,111 @@ export class SchoolRepository {
     });
   }
 
-  async getUserContextDropdown(userId: number, appCode: string) {
-    const userRoleRepo = this.dataSource.getRepository(UserRoleMapping);
-
-    // Check if user has any org level access for the app
-    const hasOrgAccess = await userRoleRepo
-      .createQueryBuilder('urm')
-      .where('urm.user_id = :userId', { userId })
-      .andWhere('urm.appcode = :appCode', { appCode })
-      .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
+  async getUserContextDropdown(): Promise<any[]> {
+    const data = await this.dataSource
+      .createQueryBuilder()
+      .select([
+        'org.id AS org_id',
+        'org.name AS org_name',
+        'org.address AS org_address',
+
+        // Full brand columns
+        'br.id AS brand_id',
+        'br.entity_type AS brand_entity_type',
+        'br.name AS brand_name',
+        'br.status AS brand_status',
+        'br.parent_type AS brand_parent_type',
+        'br.parent_id AS brand_parent_id',
+        'br.code AS brand_code',
+        'br.created_by AS brand_created_by',
+        'br.created_date AS brand_created_date',
+        'br.modified_by AS brand_modified_by',
+        'br.modified_date AS brand_modified_date',
+        'br.enterprise_id AS brand_enterprise_id',
+        'br.organization_id AS brand_organization_id',
+        'br.appcode AS brand_appcode',
+        'br.level_id AS brand_level_id',
+        'br.level_type AS brand_level_type',
+        'br.type AS brand_type',
+
+        // Full school columns
+        'sch.id AS school_id',
+        'sch.entity_type AS school_entity_type',
+        'sch.name AS school_name',
+        'sch.status AS school_status',
+        'sch.parent_type AS school_parent_type',
+        'sch.parent_id AS school_parent_id',
+        'sch.code AS school_code',
+        'sch.created_by AS school_created_by',
+        'sch.created_date AS school_created_date',
+        'sch.modified_by AS school_modified_by',
+        'sch.modified_date AS school_modified_date',
+        'sch.enterprise_id AS school_enterprise_id',
+        'sch.organization_id AS school_organization_id',
+        'sch.appcode AS school_appcode',
+        'sch.level_id AS school_level_id',
+        'sch.level_type AS school_level_type',
+        'sch.type AS school_type',
+      ])
+      .from('cr_school', 'sch')
+      .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
+      .innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
+      .orderBy('org.id, br.id, sch.id')
       .getRawMany();
 
-    if (hasOrgAccess.length > 0) {
-      // Return nested Org -> Brand -> School structure
-      const schools = await this.dataSource
-        .createQueryBuilder()
-        .select([
-          'org.id AS org_id',
-          'org.name AS org_name',
-          'org.address AS org_address',
-          'br.id AS brand_id',
-          'br.name AS brand_name',
-          'sch.id AS school_id',
-          'sch.name AS school_name',
-          'sch.location AS school_location',
-        ])
-        .from('cr_school', 'sch')
-        .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
-        .innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
-        .where('org.id = :orgId', { orgId: hasOrgAccess[0].urm_level_id })
-        .getRawMany();
-      const result = {};
-
-      for (const row of schools) {
-        const {
+    const result = {};
+
+    for (const row of data) {
+      const {
+        org_id,
+        org_name,
+        org_address,
+
+        brand_id,
+        ...brandFields
+
+        // include only brand fields prefixed with brand_
+      } = row;
+
+      const {
+        school_id,
+        ...schoolFields
+
+        // include only school fields prefixed with school_
+      } = row;
+
+      if (!result[org_id]) {
+        result[org_id] = {
           org_id,
           org_name,
           org_address,
-          brand_id,
-          brand_name,
-          school_id,
-          school_name,
-          school_location,
-        } = row;
-
-        if (!result[org_id]) {
-          result[org_id] = {
-            org_id,
-            org_name,
-            org_address,
-            type: 'Organization',
-            brands: {},
-          };
-        }
-        if (!result[org_id].brands[brand_id]) {
-          result[org_id].brands[brand_id] = {
-            brand_id,
-            brand_name,
-            type: 'Brand',
-            schools: [],
-          };
-        }
-        result[org_id].brands[brand_id].schools.push({
-          school_id,
-          school_name,
-          school_location,
-          type: 'School',
-        });
+          brands: {},
+        };
       }
 
-      return Object.values(result).map((org: { [key: string]: any }) => ({
-        ...org,
-        brands: Object.values(org.brands),
-      }));
-    } else {
-      // 1. Get schools via BRN-level access
-      const brnMappings = await this.dataSource
-        .createQueryBuilder()
-        .select([
-          'brand.id AS brand_id',
-          'brand.name AS brand_name',
-          'school.id AS school_id',
-          'school.name AS school_name',
-          'school.location AS school_location',
-        ])
-        .from('cr_user_role_mapping', 'urm')
-        .innerJoin('cr_brand', 'brand', 'brand.id = urm.level_id')
-        .innerJoin('cr_school', 'school', 'school.brand_id = brand.id')
-        .where('urm.user_id = :userId', { userId })
-        .andWhere('urm.appcode = :appCode', { appCode })
-        .andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
-        .getRawMany();
-
-      // 2. Get directly mapped schools via SCH-level access
-      const schMappings = await this.dataSource
-        .createQueryBuilder()
-        .select([
-          'brand.id AS brand_id',
-          'brand.name AS brand_name',
-          'school.id AS school_id',
-          'school.name AS school_name',
-        ])
-        .from('cr_user_role_mapping', 'urm')
-        .innerJoin('cr_school', 'school', 'school.id = urm.level_id')
-        .innerJoin('cr_brand', 'brand', 'brand.id = school.brand_id')
-        .where('urm.user_id = :userId', { userId })
-        .andWhere('urm.appcode = :appCode', { appCode })
-        .andWhere('urm.level_type = :levelType', { levelType: 'SCH' })
-        .getRawMany();
-
-      // 3. Combine both mappings
-      const allMappings = [...brnMappings, ...schMappings];
-
-      // 4. Group by brand
-      const result = {};
-      for (const row of allMappings) {
-        const {
-          brand_id,
-          brand_name,
-          school_id,
-          school_name,
-          school_location,
-        } = row;
-
-        if (!result[brand_id]) {
-          result[brand_id] = {
-            brand_id,
-            brand_name,
-            type: 'Brand',
-            schools: [],
-          };
+      if (!result[org_id].brands[brand_id]) {
+        const brandInfo: any = {};
+        for (const key in row) {
+          if (key.startsWith('brand_')) {
+            brandInfo[key.replace('brand_', '')] = row[key];
+          }
         }
+        brandInfo.schools = [];
+        result[org_id].brands[brand_id] = brandInfo;
+      }
 
-        // prevent duplicates if needed
-        if (
-          school_id &&
-          !result[brand_id].schools.some((s) => s.school_id === school_id)
-        ) {
-          result[brand_id].schools.push({
-            school_id,
-            school_name,
-            school_location,
-            type: 'School',
-          });
+      const schoolInfo: any = {};
+      for (const key in row) {
+        if (key.startsWith('school_')) {
+          schoolInfo[key.replace('school_', '')] = row[key];
         }
       }
-
-      return Object.values(result);
+      result[org_id].brands[brand_id].schools.push(schoolInfo);
     }
+
+    return Object.values(result).map((org: any) => ({
+      ...org,
+      brands: Object.values(org.brands),
+    }));
   }
 }

package/src/module/enterprise/service/organization.service.ts

@@ -78,7 +78,7 @@ export class OrganizationService {
     await repo.delete(id);
   }
 
-  async getOrganizationHierarchy(userId: number, appCode: string) {
-    return await this.schoolRepository.getUserContextDropdown(userId, appCode);
+  async getOrganizationHierarchy(): Promise<any[]> {
+    return await this.schoolRepository.getUserContextDropdown();
   }
 }

package/src/module/filter/repository/saved-filter.repository.ts

@@ -13,19 +13,21 @@ export class SavedFilterRepositoryService {
     private readonly savedFilterDetailRepo: Repository<SavedFilterDetail>,
   ) {}
 
-  async isFilterNameExists(
-    name: string,
-    orgId: number,
-    entId: number,
-    excludeId?: number,
-  ): Promise<boolean> {
+  async isFilterNameExists({
+    name,
+    organization_id,
+    id,
+    level_type,
+    level_id,
+  }: any): Promise<boolean> {
     const where: any = {
       name,
-      organization_id: orgId,
-      enterprise_id: entId,
+      organization_id: organization_id,
+      level_type: level_type,
+      level_id: level_id,
     };
-    if (excludeId) {
-      where.id = Not(excludeId);
+    if (id) {
+      where.id = Not(id);
     }
 
     const existing = await this.savedFilterMasterRepo.findOne({ where });

package/src/module/filter/service/saved-filter.service.ts

@@ -15,15 +15,17 @@ export class SavedFilterService extends EntityServiceImpl {
 
   async createEntity(
     entityData: any,
-    loggedInUser: UserData | null,
+    loggedInUser: UserData,
   ): Promise<BaseEntity> {
     const master = entityData as SavedFilterMaster;
 
-    const exists = await this.savedFilterRepo.isFilterNameExists(
-      master.name,
-      master.organization_id,
-      master.enterprise_id,
-    );
+    const exists = await this.savedFilterRepo.isFilterNameExists({
+      name: master.name,
+      organization_id: loggedInUser.organization_id,
+      id: master.id,
+      level_type: loggedInUser?.level_type,
+      level_id: loggedInUser?.level_id,
+    });
 
     if (exists) {
       throw new BadRequestException('Saved filter name already exists.');
@@ -68,12 +70,12 @@ export class SavedFilterService extends EntityServiceImpl {
       throw new BadRequestException('Saved filter not found.');
     }
 
-    const nameExists = await this.savedFilterRepo.isFilterNameExists(
-      master.name,
-      master.organization_id,
-      master.enterprise_id,
-      master.id,
-    );
+    const nameExists = await this.savedFilterRepo.isFilterNameExists({
+      name: master.name,
+      organization_id: master.organization_id,
+      enterprise_id: master.enterprise_id,
+      id: master.id, // Include ID to check for updates
+    });
 
     if (nameExists) {
       throw new BadRequestException('Saved filter name already exists.');

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -22,8 +22,6 @@ export class LayoutPreferenceService extends EntityServiceImpl {
       throw new Error('User ID is required to create layout preference.');
     }
 
-    console.log('userId', userId);
-
     const existingLayoutPreference =
       await this.layoutPreferenceRepository.findByEntityUserId(
         mapped_entity_type,

package/src/module/meta/controller/entity.controller.ts

@@ -60,7 +60,6 @@ export class EntityController {
   }
 
   @Post('create')
-  // @Roles('USR', 'VIEW')
   async create(
     @Body() entityData: BaseEntity,
     @Query('entity_type') entityType: string,
@@ -68,18 +67,9 @@ export class EntityController {
     @Req() req: Request & { user: any },
   ) {
     try {
-      let requestedUser = req.user.userData;
-      let appcode = requestedUser.appcode;
-      // let loggedInUser = await this.entityService.getEntityData(
-      //   ENTITYTYPE_USER,
-      //   requestedUser.userId,
-      // );
       let loggedInUser = req.user.userData;
+      let appcode = req.user.userData.appcode;
       if (!entityType) {
-        // throw new BadRequestException(
-        //   'Query parameter "entity_type" is required',
-        // );
-
         return res.status(HttpStatus.BAD_REQUEST).json({
           success: false,
           error: 'Query parameter "entity_type" is required',
@@ -96,7 +86,7 @@ export class EntityController {
       if (!entityService) {
         return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json({
           success: false,
-          error: `No service found for entity_type "${entityType}"`,
+          error: `No service found for Entity Type ${entityType}`,
         });
       }
       const createdEntity = await entityService.createEntity(
@@ -106,7 +96,7 @@ export class EntityController {
         appcode,
       );
 
-      if (!createdEntity || !createdEntity.success) {
+      if (!createdEntity) {
         return res.status(HttpStatus.BAD_REQUEST).json({
           success: false,
           error: createdEntity?.error || 'Entity creation failed',
@@ -115,7 +105,7 @@ export class EntityController {
 
       return res.status(HttpStatus.OK).json({
         success: true,
-        data: createdEntity.data,
+        data: createdEntity,
       });
     } catch (error) {
       return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json({
@@ -175,7 +165,7 @@ export class EntityController {
         loggedInUser as UserData,
       );
 
-      if (!updatedEntity || !updatedEntity.success) {
+      if (!updatedEntity) {
         return response.status(HttpStatus.BAD_REQUEST).json({
           success: false,
           error: updatedEntity?.error || 'Entity creation failed',

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

@@ -51,7 +51,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
       );
     if (validationErrors.length > 0) {
       throw new BadRequestException({
-        success: false,
+        message: 'Validation failed',
         errors: validationErrors,
       });
     }

package/src/module/meta/service/section-master.service.ts

@@ -52,7 +52,6 @@ export class SectionMasterService extends EntityServiceImpl {
 
     if (layoutJson?.form?.children && Array.isArray(layoutJson.form.children)) {
       const firstChild = layoutJson.form.children[0];
-      console.log('First Child:', firstChild);
 
       if (firstChild.type === 'wizard' && Array.isArray(firstChild.steps)) {
         console.log('Wizard Steps:', firstChild.steps);

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

@@ -8,8 +8,9 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 @Injectable()
 export class MenuRepository extends Repository<MenuData> {
-  constructor(private readonly dataSource: DataSource,
-    @InjectRepository(MenuData) private readonly menuData: Repository<MenuData>
+  constructor(
+    private readonly dataSource: DataSource,
+    @InjectRepository(MenuData) private readonly menuData: Repository<MenuData>,
   ) {
     super(MenuData, dataSource.createEntityManager());
   }
@@ -27,7 +28,10 @@ export class MenuRepository extends Repository<MenuData> {
     return roles.map((r) => r.urm_role_id);
   }
 
-  async getAccessibleModules(roleIds: number[], appCode: string): Promise<string[]> {
+  async getAccessibleModules(
+    roleIds: number[],
+    appCode: string,
+  ): Promise<string[]> {
     const roleCodes = await this.dataSource
       .getRepository(Role)
       .createQueryBuilder('role')
@@ -35,11 +39,9 @@ export class MenuRepository extends Repository<MenuData> {
       .where('role.id IN (:...roleIds)', { roleIds })
       .getMany();
 
-      console.log(roleCodes,"ROLE CODES")
-  
     const codes = roleCodes.map((role) => role.code);
     if (codes.length === 0) return [];
-  
+
     const modules = await this.dataSource
       .getRepository(ModuleAccess)
       .createQueryBuilder('moduleAccess')
@@ -49,16 +51,17 @@ export class MenuRepository extends Repository<MenuData> {
       .andWhere('LOWER(moduleAccess.appcode) = LOWER(:appCode)', { appCode })
       .getMany();
 
-      console.log(modules,"MODULES")
-  
     return Array.from(new Set(modules.map((module) => module.module_code)));
   }
-  
 
   /**
    * ✅ FIXED: Use this.createQueryBuilder() instead of this.menuData.createQueryBuilder()
    */
-  async getMenuItems(moduleCodes: string[], appcode: string, levelType: string) {
+  async getMenuItems(
+    moduleCodes: string[],
+    appcode: string,
+    levelType: string,
+  ) {
     return await this.menuData
       .createQueryBuilder('menu')
       .leftJoin(
@@ -68,7 +71,7 @@ export class MenuRepository extends Repository<MenuData> {
           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 })
@@ -83,8 +86,7 @@ export class MenuRepository extends Repository<MenuData> {
       ])
       .getRawMany();
   }
-  
-  
+
   async resolveUserRoles(
     userId: number,
     appcode: string,
@@ -92,9 +94,10 @@ export class MenuRepository extends Repository<MenuData> {
     levelId: number,
   ): Promise<number[]> {
     const repo = this.dataSource.getRepository(UserRoleMapping);
-  
+
     // 1. Try exact level match
-    let roles = await repo.createQueryBuilder('urm')
+    let roles = await repo
+      .createQueryBuilder('urm')
       .innerJoin('cr_role', 'role', 'role.id = urm.role_id')
       .select('urm.role_id')
       .where('urm.user_id = :userId', { userId })
@@ -102,23 +105,26 @@ export class MenuRepository extends Repository<MenuData> {
       .andWhere('urm.level_id = :levelId', { levelId })
       .andWhere('role.appcode = :appcode', { appcode })
       .getRawMany();
-  
-    if (roles.length) return roles.map(r => r.urm_role_id);
-  
+
+    if (roles.length) return roles.map((r) => r.urm_role_id);
+
     // 2. If SCH fallback → BRN → ORG
     if (levelType === 'SCH') {
-      const [sch] = await this.dataSource.query(`
+      const [sch] = await this.dataSource.query(
+        `
         SELECT s.brand_id, s.organization_id
         FROM cr_school s
         WHERE s.id = ?
-      `, [levelId]);
-      
-  
+      `,
+        [levelId],
+      );
+
       const brandId = sch?.brand_id;
       const orgId = sch?.organization_id;
-  
+
       if (brandId) {
-        roles = await repo.createQueryBuilder('urm')
+        roles = await repo
+          .createQueryBuilder('urm')
           .innerJoin('cr_role', 'role', 'role.id = urm.role_id')
           .select('urm.role_id')
           .where('urm.user_id = :userId', { userId })
@@ -126,12 +132,13 @@ export class MenuRepository extends Repository<MenuData> {
           .andWhere('urm.level_id = :levelId', { levelId: brandId })
           .andWhere('role.appcode = :appcode', { appcode })
           .getRawMany();
-  
-        if (roles.length) return roles.map(r => r.urm_role_id);
+
+        if (roles.length) return roles.map((r) => r.urm_role_id);
       }
-  
+
       if (orgId) {
-        roles = await repo.createQueryBuilder('urm')
+        roles = await repo
+          .createQueryBuilder('urm')
           .innerJoin('cr_role', 'role', 'role.id = urm.role_id')
           .select('urm.role_id')
           .where('urm.user_id = :userId', { userId })
@@ -139,12 +146,11 @@ export class MenuRepository extends Repository<MenuData> {
           .andWhere('urm.level_id = :levelId', { levelId: orgId })
           .andWhere('role.appcode = :appcode', { appcode })
           .getRawMany();
-  
-        if (roles.length) return roles.map(r => r.urm_role_id);
+
+        if (roles.length) return roles.map((r) => r.urm_role_id);
       }
     }
-  
+
     return [];
   }
-  
 }

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

@@ -71,11 +71,8 @@ export class LoginController {
     const currentUser = req.user.userData;
     const currentAppcode = currentUser.appcode;
 
-    console.log(currentUser, 'DEBUG USER', data);
-
     // If appcode is changing, validate the new level_id/level_type
     if (data.appcode !== currentAppcode) {
-      console.log('inside if', data.appcode, currentAppcode);
       const isValidAccess = await this.userSessionService.checkIfUserHasMapping(
         currentUser.id,
         data.appcode,
@@ -83,8 +80,6 @@ export class LoginController {
         data.level_id,
       );
 
-      console.log('isValidAccess', isValidAccess);
-
       if (!isValidAccess) {
         // If not valid, fetch the default one
         const userMapping =
@@ -102,11 +97,6 @@ export class LoginController {
         data.level_type = userMapping.level_type;
         data.level_id = userMapping.level_id;
       }
-      console.log(
-        data.level_type,
-        data.level_id,
-        'data.level_type, data.level_id',
-      );
     }
 
     return await this.userSessionService.switchCurrentLevelService(

package/src/utils/service/encryptUtil.service.ts

@@ -32,7 +32,7 @@ export class EncryptUtilService {
       let decrypted = decipher.update(data, 'utf8') + decipher.final('utf8');
       return decrypted;
     } catch (error) {
-      throw new InternalServerErrorException('Encryption process failed');
+      throw new InternalServerErrorException('Decryption process failed');
     }
   }