rez_core 2.1.63 → 2.1.65

package/package.json

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

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

@@ -11,4 +11,7 @@ export class LayoutPreference extends BaseEntity {
 
   @Column({ length: 50, nullable: true, type: 'varchar' })
   mapped_entity_type: string;
+
+  @Column({ nullable: true, type: 'json' })
+  navigation_tabs_json: any;
 }

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

@@ -32,6 +32,9 @@ export class ListMasterRepository {
       );
     }
 
+    // sort by created_at in descending order
+    qb.orderBy('item.created_date', 'DESC');
+
     return await qb.getMany();
   }
 }

package/src/module/listmaster/service/list-master-item.service.ts

@@ -1,4 +1,5 @@
 import {
+  BadRequestException,
   forwardRef,
   Inject,
   Injectable,
@@ -64,7 +65,9 @@ export class ListMasterItemService {
       const name = item.name?.trim();
       const code = item.code?.trim();
 
-      if (!name) continue; // Skip invalid item
+      if (!name) {
+        throw new BadRequestException('Name is required and cannot be empty');
+      }
 
       let existingItem;
 

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

@@ -238,6 +238,18 @@ export class ListMasterService {
 
   // createEntity method
   async createEntity(entityData: any, loggedInUser: UserData): Promise<any> {
+    // Trim and validate name and code
+    const name = entityData.name?.trim();
+    const code = entityData.code?.trim();
+
+    if (!name || !code) {
+      throw new BadRequestException(
+        'Name and Code are required and cannot be empty',
+      );
+    }
+
+    entityData.name = name;
+    entityData.code = code;
     entityData.is_factory = entityData.is_factory || 0;
     entityData.source = entityData.source || 'master';
     entityData.status = entityData.status || 'ACTIVE';
@@ -245,16 +257,27 @@ export class ListMasterService {
     entityData.sort_by = entityData.sort_by || 'asc';
     entityData.organization_id = loggedInUser.organization_id;
 
-    // check if a list master with the same type already exists
-    const existingListMaster = await this.listMasterRepo.findOneByCondition({
-      name: entityData.name,
-      code: entityData.code,
+    // Check for duplicate name
+    const nameExists = await this.listMasterRepo.findOneByCondition({
+      name,
+      organization_id: loggedInUser.organization_id,
+    });
+
+    if (nameExists) {
+      throw new BadRequestException(
+        'A List Master with the same name already exists',
+      );
+    }
+
+    // Check for duplicate code
+    const codeExists = await this.listMasterRepo.findOneByCondition({
+      code,
       organization_id: loggedInUser.organization_id,
     });
 
-    if (existingListMaster) {
+    if (codeExists) {
       throw new BadRequestException(
-        'List master with the same name already exists',
+        'A List Master with the same code already exists',
       );
     }
 

package/src/module/user/service/user-session.service.ts

@@ -1,3 +1,4 @@
+import { get } from 'http';
 import { UserSession } from '../entity/user-session.entity';
 import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
 import { BadRequestException, Injectable } from '@nestjs/common';
@@ -7,6 +8,7 @@ import { ConfigService } from '@nestjs/config';
 import { UserRoleMappingService } from './user-role-mapping.service';
 import { DataSource } from 'typeorm';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
+import { UserData } from '../entity/user.entity';
 
 @Injectable()
 export class UserSessionService {
@@ -84,7 +86,19 @@ export class UserSessionService {
       appcode: data.appcode,
     };
 
-    if (payload.organization_id === 1 && payload.level_type === 'ORG') {
+    let getUserDetails;
+
+    if (currentUser) {
+      // Check if user has any role mappings for the given appcode
+      getUserDetails = await this.dataSource.query(
+        `
+        SELECT * from cr_user where id = ?
+      `,
+        [currentUser.id],
+      );
+    }
+
+    if (getUserDetails.organization_id === 1 && payload.level_type === 'ORG') {
       payload.organization_id = payload.level_id;
     }