rez_core 2.0.0 → 2.0.1

package/package.json

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

package/src/module/enterprise/entity/enterprise.entity.ts

@@ -29,8 +29,8 @@ export class EnterpriseData {
   @Column({ name: 'modified_date', type: 'datetime', nullable: true })
   modified_date: Date;
 
-  @Column({ name: 'app_code', type: 'varchar', nullable: true, length: 50 })
-  app_code: string;
+  @Column({ name: 'appcode', type: 'varchar', nullable: true, length: 50 })
+  appcode: string;
 
   @Column({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 })
   app_url_name: string;

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

@@ -11,8 +11,8 @@ export class OrganizationData {
   @Column({ name: 'code', nullable: true })
   code: string;
 
-  @Column({ name: 'app_code', nullable: true })
-  appCode: string;
+  @Column({ name: 'appcode', nullable: true })
+  appcode: string;
 
   @Column({ name: 'name', nullable: true })
   name: string;

package/src/module/filter/entity/saved-filter-master.entity.ts

@@ -9,9 +9,6 @@ export class SavedFilterMaster extends BaseEntity {
     this.entity_type = ENTITYTYPE_SAVEDFILTERMASTER;
   }
 
-  @Column({ length: 50, type: 'varchar', nullable: true })
-  app_code: string;
-
   @Column({ length: 50, type: 'varchar', nullable: true })
   mapped_entity_type: string;
 

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

@@ -257,17 +257,27 @@ export class MasterService {
               continue;
             }
 
+            const existingError = errors.find((e) => e.row === i + 1);
+
             if (refData[0].organization_id !== loggedInUser.organization_id) {
-              errors.push({
-                row: i + 1,
-                errors: [
-                  {
-                    field: attr.name,
-                    message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
-                  },
-                ],
-              });
-              continue;
+              if (existingError) {
+                existingError.errors.push({
+                  field: attr.name,
+                  message: `Reference entity not found for code: ${row[attr.attribute_key]} does not belong to the organization`,
+                });
+                continue;
+              } else {
+                errors.push({
+                  row: i + 1,
+                  errors: [
+                    {
+                      field: attr.name,
+                      message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
+                    },
+                  ],
+                });
+                continue;
+              }
             }
 
             row[attr.attribute_key] = refData[0].id;
@@ -407,11 +417,17 @@ export class MasterService {
           entityMaster,
         );
 
+      const existingError = errors.find((e) => e.row === i + 1);
+
       if (rowErrors?.length > 0) {
-        errors.push({
-          row: i + 1,
-          errors: rowErrors,
-        });
+        if (existingError) {
+          existingError.errors.push(...rowErrors);
+        } else {
+          errors.push({
+            row: i + 1,
+            errors: rowErrors,
+          });
+        }
       }
     }
 
@@ -419,7 +435,7 @@ export class MasterService {
       throw new BadRequestException({
         status: false,
         message: `Validation errors found in the uploaded data.`,
-        details: errors,
+        error: errors,
       });
     }
 

package/src/module/meta/entity/entity-table-column.entity.ts

@@ -9,8 +9,7 @@ export class EntityTableColumn extends BaseEntity {
     this.entity_type = ENTITYTYPE_ENTITYTABLECOLUMN;
   }
 
-  @Column({ name: 'app_code', nullable: true })
-  app_code: string;
+
 
   @Column({ name: 'mapped_entity_type', nullable: true })
   mapped_entity_type: string;

package/src/module/meta/entity/entity-table.entity.ts

@@ -9,8 +9,6 @@ export class EntityTable extends BaseEntity {
     this.entity_type = ENTITYTYPE_ENTITYTABLE;
   }
 
-  @Column({ name: 'app_code', nullable: true })
-  app_code: string;
 
   @Column({ name: 'mapped_entity_type', nullable: true })
   mapped_entity_type: string;

package/src/module/module/controller/menu.controller.ts

@@ -10,6 +10,7 @@ export class MenuController {
   @Get()
   async getMenu(@Request() req) {
     const userId = req.user.userId;
-    return this.menuService.getUserMenu(userId);
+    const appcode = req.user.appcode;
+    return this.menuService.getUserMenu(userId,appcode);
   }
 }

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

@@ -45,8 +45,8 @@ export class ModuleAccessController {
   @Get('ui-config')
   async getModuleUIConfig(@Query('module_code') moduleCode: string, @Request() req) {
     const userId = req.user.userId;
-  
-    const roles = await this.menuRepository.getUserRoles(userId); // returns ['1', '4']
+    const appcode = req.user.appcode;
+    const roles = await this.menuRepository.getUserRoles(userId,appcode); // returns ['1', '4']
   
     if (!roles || roles.length === 0) {
       throw new BadRequestException('User has no roles');

package/src/module/module/entity/menu.entity.ts

@@ -34,4 +34,7 @@ export class MenuData {
 
   @Column({ type: 'int', nullable: true })
   ui_visible: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  appcode: string;
 }

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

@@ -18,5 +18,5 @@ export class ModuleAccess {
   action_type: string;
 
   @Column({type: 'varchar', length: 100, nullable: true})
-  app_code: string;
+  appcode: string;
 }

package/src/module/module/entity/module.entity.ts

@@ -40,4 +40,7 @@ export class ModuleData {
 
   @Column({ type: 'json', nullable: true })
   ui_config: JSON;
+  
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  appcode: string;
 }

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

@@ -14,59 +14,64 @@ export class MenuRepository extends Repository<MenuData> {
   /**
    * Get all role IDs assigned to a user.
    */
-  async getUserRoles(userId: number): Promise<number[]> {
+  async getUserRoles(userId: number, appcode: string): Promise<number[]> {
     const roles = await this.dataSource
       .getRepository(UserRoleMapping)
-      .createQueryBuilder('userRoleMapping')
-      .select('userRoleMapping.role_id')
-      .where('userRoleMapping.user_id = :userId', { userId })
-      .getMany();
-
-    return roles.map((role) => role.role_id);
+      .createQueryBuilder('urm')
+      .innerJoin('cr_role', 'role', 'role.id = urm.role_id') // manual join
+      .select('urm.role_id')
+      .where('urm.user_id = :userId', { userId })
+      .andWhere('role.appcode = :appcode', { appcode })
+      .getRawMany();
+  
+    return roles. map((r) => r.urm_role_id);
   }
+  
 
   /**
    * Get module codes that the user has access to based on their role IDs.
-   */
-  async getAccessibleModules(roleIds: number[]): Promise<string[]> {
-    // Get role codes from role IDs
-    const roleCodes = await this.dataSource
-      .getRepository(Role)
-      .createQueryBuilder('role')
-      .select('role.code')
-      .where('role.id IN (:...roleIds)', { roleIds })
-      .getMany();
+   */async getAccessibleModules(roleIds: number[], appCode: string): Promise<string[]> {
+  // Get role codes from role IDs
+  const roleCodes = await this.dataSource
+  .getRepository(Role)
+  .createQueryBuilder('role')
+  .select('role.code')
+  .where('role.id IN (:...roleIds)', { roleIds })
+  .getMany();
 
-    const codes = roleCodes.map((role) => role.code);
+const codes = roleCodes.map((role) => role.code);
 
-    if (codes.length === 0) {
-      return [];
-    }
+if (codes.length === 0) {
+  return [];
+}
 
-    // Get accessible modules using role codes
-    const modules = await this.dataSource
-      .getRepository(ModuleAccess)
-      .createQueryBuilder('moduleAccess')
-      .select('moduleAccess.module_code')
-      .where('moduleAccess.role_code IN (:...codes)', { codes })
-      .andWhere('moduleAccess.access_flag > 0')
-      .getMany();
+// Get accessible modules using role codes and appCode
+const modules = await this.dataSource
+  .getRepository(ModuleAccess)
+  .createQueryBuilder('moduleAccess')
+  .select('moduleAccess.module_code')
+  .where('moduleAccess.role_code IN (:...codes)', { codes })
+  .andWhere('moduleAccess.access_flag > 0')
+  .andWhere('LOWER(moduleAccess.appcode) = LOWER(:appCode)', { appCode }) // case-insensitive
+  .getMany();
 
-    return modules.map((module) => module.module_code);
-  }
+return modules.map((module) => module.module_code);
+}
 
-  async getMenuItems(moduleCodes: string[]): Promise<MenuData[]> {
-    const menuItems = await this.createQueryBuilder('menu')
-      .leftJoin('cr_module', 'module', 'menu.module_code = module.module_code')
-      .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
-      .select([
-        'menu.*',
-        'module.component_name AS component',
-        'module.title AS title',
-        'module.entity_type AS entity_type',
-      ])
-      .getRawMany();
+async getMenuItems(moduleCodes: string[], appcode: string): Promise<MenuData[]> {
+  const menuItems = await this.createQueryBuilder('menu')
+    .leftJoin('cr_module', 'module', 'menu.module_code = module.module_code')
+    .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
+    .andWhere('LOWER(module.appcode) = LOWER(:appcode)', { appcode }) // appcode filter
+    .select([
+      'menu.*',
+      'module.component_name AS component',
+      'module.title AS title',
+      'module.entity_type AS entity_type',
+    ])
+    .getRawMany();
+
+  return menuItems;
+}
 
-    return menuItems;
-  }
 }

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

@@ -122,7 +122,7 @@ export class ModuleAccessRepository {
             role_code: access.role_code,
             module_code: access.module_code,
             action_type: access.action_type,
-            app_code: access.app_code,
+            appcode: access.app_code,
           },
         });
 

package/src/module/module/service/menu.service.ts

@@ -9,22 +9,22 @@ export class MenuService {
   /**
    * Fetch and construct menu hierarchy for a given user.
    */
-  async getUserMenu(userId: number) {
+  async getUserMenu(userId: number,appcode:string): Promise<{ menu: any[] }> {
     // Step 1: Get the roles of the user
-    const roleCodes = await this.menuRepository.getUserRoles(userId);
+    const roleCodes = await this.menuRepository.getUserRoles(userId,appcode);
     if (!roleCodes.length) {
       return { menu: [] }; // Return empty menu if user has no roles
     }
 
     // Step 2: Get the modules the user has access to
     const moduleCodes =
-      await this.menuRepository.getAccessibleModules(roleCodes);
+      await this.menuRepository.getAccessibleModules(roleCodes,appcode);
     if (!moduleCodes.length) {
       return { menu: [] }; // Return empty menu if no accessible modules
     }
 
     // Step 3: Get the menu items based on accessible modules
-    const menuItems = await this.menuRepository.getMenuItems(moduleCodes);
+    const menuItems = await this.menuRepository.getMenuItems(moduleCodes,appcode);
 
     // Step 4: Build hierarchical menu structure
     const menuTree = this.buildMenuHierarchy(menuItems);

package/src/module/user/entity/role.entity.ts

@@ -10,9 +10,6 @@ export class Role extends BaseEntity {
     this.entity_type = ENTITYTYPE_ROLE;
   }
 
-  @Column({ length: 50, type: 'varchar', nullable: true })
-  app_code: string;
-
   @Column({ type: 'int', nullable: true })
   is_system: number;
 

package/src/module/user/entity/user-role-mapping.entity.ts

@@ -23,4 +23,7 @@ export class UserRoleMapping {
 
   @Column({ type: 'int', nullable: true })
   is_default: number;
+
+  @Column({type: 'varchar'})
+  appcode: string;
 }

package/src/module/user/service/role.service.ts

@@ -51,7 +51,7 @@ export class RoleService extends EntityServiceImpl {
           module_code: perm.module_code,
           action_type: perm.action_type,
           access_flag: perm.access_flag,
-          app_code: perm.app_code,
+          appcode: perm.appcode,
         }),
       );
 
@@ -128,7 +128,7 @@ export class RoleService extends EntityServiceImpl {
           module_code: perm.module_code,
           action_type: perm.action_type,
           access_flag: perm.access_flag,
-          app_code: perm.app_code,
+          appcode: perm.appcode,
         }),
       );