rez_core 2.1.17 → 2.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.17",
+  "version": "2.1.19",
   "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/enterprise.module.ts

@@ -11,6 +11,7 @@ import { SchoolData } from './entity/school.entity';
 import { BrandRepository } from './repository/brand.repository';
 import { SchoolRepository } from './repository/school.repository';
 import { UtilsModule } from 'src/utils/utils.module';
+import { BrandService } from './service/brand.service';
 
 @Module({
   imports: [
@@ -29,6 +30,10 @@ import { UtilsModule } from 'src/utils/utils.module';
     OrganizationAppMappingService,
     BrandRepository,
     SchoolRepository,
+    {
+      provide: 'BrandService',
+      useClass: BrandService,
+    },
   ],
   exports: [OrganizationService],
 })

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/brand.service.ts

@@ -0,0 +1,4 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class BrandService {}

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/listmaster/service/list-master.service.ts

@@ -25,6 +25,8 @@ export class ListMasterService {
     private readonly httpService: HttpService,
   ) {}
 
+  private readonly skipLevelFilterEntities = ['BRN'];
+
   async getDropdownOptions(
     type: string,
     params: Record<string, string>,
@@ -77,19 +79,24 @@ export class ListMasterService {
       }
 
       if (loggedInUser?.level_type && loggedInUser?.level_id) {
-        qb.andWhere(
-          `${tableName}.level_type = :levelType AND ${tableName}.level_id = :levelId`,
-          {
-            levelType: loggedInUser.level_type,
-            levelId: loggedInUser.level_id,
-          },
-        );
+        // Skip level filter for certain entities
+        if (!this.skipLevelFilterEntities.includes(sourceList)) {
+          qb.andWhere(
+            `${tableName}.level_type = :levelType AND ${tableName}.level_id = :levelId`,
+            {
+              levelType: loggedInUser.level_type,
+              levelId: loggedInUser.level_id,
+            },
+          );
+        }
       }
 
       if (loggedInUser?.appcode && sourceList === 'ROL') {
-        qb.andWhere(`${tableName}.appcode = :appcode`, {
-          appcode: loggedInUser.appcode,
-        });
+        if (!this.skipLevelFilterEntities.includes(sourceList)) {
+          qb.andWhere(`${tableName}.appcode = :appcode`, {
+            appcode: loggedInUser.appcode,
+          });
+        }
       }
 
       for (const key in params) {

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

@@ -165,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',