rez_core 5.0.165 → 5.0.167

package/package.json

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

package/src/module/dashboard/service/dashboard.service.ts

@@ -20,7 +20,7 @@ export class DashboardService {
       appcode: loggedInUser.appcode,
       level_type: loggedInUser.level_type,
       level_id: loggedInUser.level_id,
-      organization_id: loggedInUser.organization_id,
+      enterprise_id: loggedInUser.enterprise_id,
     });
 
     // Build a set of accessible codes

package/src/module/listmaster/entity/list-master.entity.ts

@@ -27,4 +27,7 @@ export class ListMasterData extends BaseEntity {
 
   @Column({ nullable: true })
   custom_source_id: number;
+
+  @Column({ nullable: true, default: '' })
+  description: string;
 }

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

@@ -515,7 +515,7 @@ export class EntityDynamicService {
     values.push(id);
 
     const updateQuery = `
-        UPDATE ${tableName}
+        UPDATE ${this.schema}.${tableName}
         SET ${updates.join(', ')}
         WHERE id = ${idPlaceholder}
     `;

package/src/module/module/controller/module-access.controller.ts

@@ -29,13 +29,12 @@ export class ModuleAccessController {
     @Query('include') include: string, // ✅ declare it as boolean
     @Request() req,
   ) {
-    const { level_type, level_id, organization_id } = req.user.userData;
+    const { level_type, level_id } = req.user.userData;
 
     return this.moduleAccessService.getRoles({
       appcode,
       level_type,
       level_id,
-      organization_id,
       include: include === 'true', // ensure it's either true or false
     });
   }
@@ -84,7 +83,7 @@ export class ModuleAccessController {
   }
 
   @Post('update')
-  async updateModuleAccess(@Body() moduleAccessData: any[], @Request() req) {
+  async updateModuleAccess(@Body() moduleAccessData: any[]) {
     return this.moduleAccessService.updateModuleAccess(moduleAccessData);
   }
 
@@ -117,9 +116,9 @@ export class ModuleAccessController {
     const appcode = userData?.appcode;
     const level_type = userData?.level_type;
     const level_id = userData?.level_id;
-    const organization_id = userData?.organization_id;
+    const enterprise_id = userData?.enterprise_id;
 
-    if (!userId || !appcode || !level_type || !level_id || !organization_id) {
+    if (!userId || !appcode || !level_type || !level_id || !enterprise_id) {
       throw new BadRequestException('Invalid token data');
     }
 
@@ -128,7 +127,7 @@ export class ModuleAccessController {
       appcode,
       level_type,
       level_id,
-      organization_id,
+      enterprise_id,
     });
   }
 }

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

@@ -120,7 +120,7 @@ export class MenuRepository extends Repository<MenuData> {
 
       if (
         getUserDetails &&
-        getUserDetails.organization_id === 1 &&
+        getUserDetails.enterprise_id === 1 &&
         getUserUrm
       ) {
         return [Number(getUserUrm.role_id)];

package/src/module/module/service/module-access.service.ts

@@ -21,26 +21,25 @@ export class ModuleAccessService {
     private readonly dataSource: DataSource,
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
-    private readonly reflectionHelper: ReflectionHelper
-  ) {}
+    private readonly reflectionHelper: ReflectionHelper,
+  ) {
+  }
 
-  async getModules({ appcode,loggedInUser }: { appcode: string ,loggedInUser: UserData}) {
+  async getModules({ appcode, loggedInUser }: { appcode: string, loggedInUser: UserData }) {
     return this.moduleAccessRepository.getModules({
-      appcode,loggedInUser
+      appcode, loggedInUser,
     });
   }
 
   async getRoles({
-    appcode,
-    level_type,
-    level_id,
-    organization_id,
-    include,
-  }: {
+                   appcode,
+                   level_type,
+                   level_id,
+                   include,
+                 }: {
     appcode: string;
     level_type?: string;
     level_id?: number;
-    organization_id?: number;
     include?: boolean;
   }) {
     const query = this.dataSource
@@ -54,17 +53,8 @@ export class ModuleAccessService {
       query.andWhere('(role.is_factory IS NULL OR role.is_factory != 1)');
     }
 
-    if (level_type) {
+    if (level_type && level_id) {
       query.andWhere('role.level_type = :level_type', { level_type });
-    }
-
-    if (organization_id) {
-      query.andWhere('role.organization_id = :organization_id', {
-        organization_id,
-      });
-    }
-
-    if (level_id !== undefined) {
       query.andWhere('role.level_id = :level_id', {
         level_id: String(level_id),
       });
@@ -139,17 +129,17 @@ export class ModuleAccessService {
   }
 
   async getUserPermissions({
-    userId,
-    appcode,
-    level_type,
-    level_id,
-    organization_id,
-  }: {
+                             userId,
+                             appcode,
+                             level_type,
+                             level_id,
+                             enterprise_id,
+                           }: {
     userId: number;
     appcode: string;
     level_type: string;
     level_id: number;
-    organization_id: number;
+    enterprise_id: number;
   }) {
     // Step 1: Resolve roles
     const roleCodes = await this.menuRepository.resolveUserRoles(
@@ -174,17 +164,17 @@ export class ModuleAccessService {
 
     // Step 3: If level_type is SCH, check school status using raw query
     if (level_type === 'SCH') {
-      const schoolRepo =  this.reflectionHelper.getRepoService('SSOSchool');
+      const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
 
       const school = await schoolRepo.findOne({
         where: {
-          id: level_id
-        }
+          id: level_id,
+        },
       });
 
       const resolveStatus = await this.listMasterService.getResolvedListCode(
         STATUS_INACTIVE,
-        organization_id || 0,
+        enterprise_id || 0,
       );
 
       if (!school || school.status === resolveStatus.id) {