rez_core 2.0.95 → 2.0.97

package/package.json

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

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

@@ -1,12 +1,11 @@
-import { Injectable, BadRequestException, Inject } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
 import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
+import { EntityTableColumnService } from 'src/module/meta/service/entity-table-column.service';
+import { EntityTableService } from 'src/module/meta/service/entity-table.service';
 import { DataSource } from 'typeorm';
-import { SavedFilterService } from './saved-filter.service';
 import { FilterRequestDto } from '../dto/filter-request.dto';
-import { EntityTableService } from 'src/module/meta/service/entity-table.service';
-import { EntityTableColumnService } from 'src/module/meta/service/entity-table-column.service';
-import { get } from 'http';
+import { SavedFilterService } from './saved-filter.service';
 
 @Injectable()
 export class FilterService {
@@ -19,7 +18,7 @@ export class FilterService {
     @Inject('SavedFilterService')
     private readonly savedFilterService: SavedFilterService,
   ) {}
-  private readonly skipLevelFilterEntities = ['USR', 'UPR'];
+  private readonly skipLevelFilterEntities = [];
 
   private async gettab_value_counts(
     tableName: string,
@@ -129,11 +128,7 @@ export class FilterService {
 
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
-    if (
-      level_type &&
-      level_id &&
-      !this.skipLevelFilterEntities.includes(entity_type)
-    ) {
+    if (level_type && level_id) {
       baseWhere.push({
         query: 'e.level_type = :level_type AND e.level_id = :level_id',
         params: {

package/src/module/master/service/master.service.ts

@@ -411,11 +411,11 @@ export class MasterService {
       row.entity_type = entityType;
       row.organization_id = loggedInUser.organization_id;
 
-      const rowErrors =
-        await this.entityValidationService.validateExcelEntityData(
-          row,
-          entityMaster,
-        );
+      const rowErrors = await this.entityValidationService.validateEntityData(
+        row,
+        entityMaster,
+        loggedInUser,
+      );
 
       const existingError = errors.find((e) => e.row === i + 1);
 
@@ -466,13 +466,13 @@ export class MasterService {
         .andWhere(`${entityMaster.db_table_name}.level_id = :levelId`, {
           levelId: loggedInUser.level_id,
         });
-    
+
       const existing = await qb.limit(1).getRawOne();
 
       row.entity_type = entityType;
       row.organization_id = loggedInUser.organization_id;
-      row.status="ACTIVE"
-      
+      row.status = 'ACTIVE';
+
       let errors = [];
       if (existing) {
         if (duplicateHandling === 'skip_duplicates') continue;

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

@@ -47,6 +47,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
       await this.entityValidationService.validateEntityData(
         entityData,
         entityMaster,
+        loggedInUser,
       );
     if (validationErrors.length > 0) {
       throw new BadRequestException({

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

@@ -49,6 +49,7 @@ export class EntityValidationService {
     attributeData: AttributeMaster[],
     entityType: string,
     db_table_name: string,
+    loggedInUser: any,
   ): Promise<ValidationError[]> {
     const errors: ValidationError[] = [];
 
@@ -64,12 +65,16 @@ export class EntityValidationService {
 
         // Add AND condition for organization_id if present
         const orgId = entityData.organization_id;
+        const level_type = loggedInUser.level_type;
+        const level_id = loggedInUser.level_id;
 
         if (orgId !== undefined && orgId !== null) {
           qb = qb.andWhere(
-            `${db_table_name}.organization_id = :organization_id`,
+            `${db_table_name}.organization_id = :organization_id AND ${db_table_name}.level_type = :level_type AND ${db_table_name}.level_id = :level_id`,
             {
               organization_id: orgId,
+              level_type: level_type,
+              level_id: level_id,
             },
           );
         }
@@ -119,6 +124,7 @@ export class EntityValidationService {
   async validateEntityData(
     entityData: Record<string, any>,
     entityMaster,
+    loggedInUser: any,
   ): Promise<ValidationError[]> {
     const attributes =
       await this.attributeMasterService.findAttributesByMappedEntityType(
@@ -131,6 +137,7 @@ export class EntityValidationService {
       attributes,
       entityData.entity_type,
       entityMaster.db_table_name,
+      loggedInUser,
     );
     const regexErros = await this.validateRegexFields(entityData, attributes);
     return [...requiredErrors, ...uniqueErrors, ...regexErros];

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

@@ -5,6 +5,7 @@ import { Role } from 'src/module/user/entity/role.entity';
 import { ModuleAccess } from '../entity/module-access.entity';
 import { ModuleAction } from '../entity/module-action.entity';
 import { ModuleData } from '../entity/module.entity';
+import { level } from 'winston';
 
 @Injectable()
 export class ModuleAccessRepository {
@@ -34,22 +35,20 @@ export class ModuleAccessRepository {
     const where: any = { appcode };
     if (level_type) where.level_type = level_type;
     if (level_id !== undefined) where.level_id = String(level_id);
-  
+
     const roles = await this.roleRepo.find({ where });
-  
+
     return roles.map((role) => ({
       label: role.name,
       value: role.id,
     }));
   }
-  
-  
 
   async getModules({ appcode }: { appcode: string }) {
     const modules = await this.moduleRepo.find({
       where: { module_level: 'MAINMOD', appcode },
     });
-  
+
     return modules
       .map((mod) => ({
         label: mod.name,
@@ -58,8 +57,12 @@ export class ModuleAccessRepository {
       }))
       .sort((a, b) => a.group.localeCompare(b.group));
   }
-  
-  async getAccessListing(roleIds: number[], appcode: string, levelType: string) {
+
+  async getAccessListing(
+    roleIds: number[],
+    appcode: string,
+    levelType: string,
+  ) {
     const roles = await this.roleRepo.find({
       where: { id: In(roleIds), appcode },
     });
@@ -70,7 +73,6 @@ export class ModuleAccessRepository {
       where: {
         role_code: In(roleCodes),
         appcode,
-        level_type: levelType,
       },
     });
 
@@ -83,6 +85,7 @@ export class ModuleAccessRepository {
           action: access.action_type,
           access: access.access_flag,
           code: access.module_code,
+          level_type: access.level_type,
         })),
     }));
   }
@@ -90,54 +93,62 @@ export class ModuleAccessRepository {
   async getAllModulesByLevel(mainModIds: string[], appcode: string, levelType) {
     const mainModules =
       mainModIds.length === 1 && mainModIds[0] === '-1'
-        ? await this.moduleRepo.find({ where: { module_level: 'MAINMOD', appcode } })
+        ? await this.moduleRepo.find({
+            where: { module_level: 'MAINMOD', appcode },
+          })
         : await this.moduleRepo.find({
             where: { id: In(mainModIds), module_level: 'MAINMOD', appcode },
           });
-  
+
     if (!mainModules.length) return {};
-  
+
     const wbsCodes = mainModules.map((mod) => mod.wbs_code);
-  
+
     const allModules = await this.moduleRepo
       .createQueryBuilder('module')
       .where(
-        wbsCodes.map((code) => `module.wbs_code LIKE :code${code}`).join(' OR '),
+        wbsCodes
+          .map((code) => `module.wbs_code LIKE :code${code}`)
+          .join(' OR '),
         Object.fromEntries(wbsCodes.map((code) => [`code${code}`, `${code}%`])),
       )
       .andWhere('module.appcode = :appcode', { appcode })
       .getMany();
-  
+
     const moduleCodes = allModules.map((m) => m.module_code);
-  
+
     const allActions = await this.moduleActionRepo.find({
       where: { module_code: In(moduleCodes) },
     });
-  
+
     // Map actions by module_code with full permission object
-    const actionMap = allActions.reduce((acc, action) => {
-      if (!acc[action.module_code]) acc[action.module_code] = [];
-      acc[action.module_code].push({
-        action: action.action_type,
-        name: action.action_name,
-        // You can also include action_type here if needed
-      });
-      return acc;
-    }, {} as Record<string, { action: string; name: string }[]>);
-  
+    const actionMap = allActions.reduce(
+      (acc, action) => {
+        if (!acc[action.module_code]) acc[action.module_code] = [];
+        acc[action.module_code].push({
+          action: action.action_type,
+          name: action.action_name,
+          // You can also include action_type here if needed
+        });
+        return acc;
+      },
+      {} as Record<string, { action: string; name: string }[]>,
+    );
+
     const levelsToReturn = levelType === 'ORG' ? ['ORG', 'SCH'] : ['SCH'];
-  
+
     const groupedByLevel: Record<string, any[]> = {};
-  
+
     for (const lvl of levelsToReturn) {
       const filteredModules = allModules.filter((m) => m.level_type === lvl);
-  
+
       const buildHierarchy = (parentWbs: string): any[] =>
         filteredModules
           .filter(
             (mod) =>
               mod.wbs_code.startsWith(`${parentWbs}.`) &&
-              mod.wbs_code.split('.').length === parentWbs.split('.').length + 1,
+              mod.wbs_code.split('.').length ===
+                parentWbs.split('.').length + 1,
           )
           .map((mod) => ({
             name: mod.name,
@@ -145,7 +156,7 @@ export class ModuleAccessRepository {
             permission: actionMap[mod.module_code] || [],
             submod: buildHierarchy(mod.wbs_code),
           }));
-  
+
       const levelModules = mainModules
         .filter((mod) => mod.level_type === lvl)
         .map((mod) => ({
@@ -154,14 +165,13 @@ export class ModuleAccessRepository {
           permission: actionMap[mod.module_code] || [],
           submod: buildHierarchy(mod.wbs_code),
         }));
-  
+
       if (levelModules.length) {
         groupedByLevel[lvl] = levelModules;
       }
     }
     return groupedByLevel;
   }
-  
 
   async updateModuleAccess(
     accessList: {