rez_core 2.1.18 → 2.1.19

package/package.json

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

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

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

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) {