rez_core 5.0.131 → 5.0.134

package/package.json

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

package/src/config/bull.config.ts

@@ -13,9 +13,9 @@ export class BullConfigService implements SharedBullConfigurationFactory {
   createSharedConfiguration(): BullModuleOptions {
     return {
       redis: {
-        host: this.configService.get<string>('REDIS_HOST', 'localhost'),
+        host: this.configService.get<string>('REDIS_HOST', '43.205.35.45'),
         port: this.configService.get<number>('REDIS_PORT', 6379),
-        password: this.configService.get<string>('REDIS_PASSWORD'),
+        password: this.configService.get<string>('REDIS_PASSWORD','Rezolut123'),
         db: this.configService.get<number>('REDIS_DB', 0),
         // Enable offline queue to handle Redis disconnections
         enableOfflineQueue: true,

package/src/module/meta/entity/app-master.entity.ts

@@ -31,4 +31,7 @@ export class AppMaster extends BaseEntity {
 
   @Column({ name: 'version', type: 'varchar', nullable: true })
   version: string;
+
+   @Column({ name: 'show_in_ui', type: 'boolean', nullable: true })
+  show_in_ui: string;
 }

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

@@ -71,18 +71,18 @@ export class EntityDynamicService {
     // -------------------------------------------------------
     // AUTO-CODE GENERATION (POSTGRES SAFE)
     // -------------------------------------------------------
-    if (!entityData.code && entityData.entity_type) {
+    const entityMaster = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.organization_id)
+
+    if (!entityData.code && entityData.entity_type && entityMaster) {
       // Extract integer suffix
-      const result = await this.entityManager.query(
-        `
-            SELECT MAX(id) AS max_seq_no
-            FROM ${tableName}
-            WHERE entity_type = $1
-        `,
-        [entityData.entity_type],
-      );
+      const repo = this.reflectionHelper.getRepoService(entityMaster.entity_data_class);
+
+      const result = await repo
+        .createQueryBuilder()
+        .select('MAX(id)', 'seq_no')
+        .getRawOne();
 
-      let maxSeq = Number(result?.[0]?.max_seq_no) || 0;
+      let maxSeq = Number(result?.max_seq_no) || 0;
       maxSeq++;
       entityData.code = `${entityData.entity_type}${maxSeq}`;
     }

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

@@ -19,10 +19,10 @@ export class UserSessionService {
     private readonly clockIDGenService: ClockIDGenService,
     private configService: ConfigService,
     @InjectRepository(UserData)
-    private readonly  userDataRepository:Repository<UserData>,
+    private readonly userDataRepository: Repository<UserData>,
     @InjectRepository(UserRoleMapping)
-    private readonly  userRoleMappingRepository:Repository<UserRoleMapping>,
-    private readonly reflectionHelper: ReflectionHelper
+    private readonly userRoleMappingRepository: Repository<UserRoleMapping>,
+    private readonly reflectionHelper: ReflectionHelper,
   ) {}
   async createSession(user, appcode?: string, accessInfo?: any) {
     const sessionToken = this.clockIDGenService.idGenerator('SES');
@@ -98,8 +98,8 @@ export class UserSessionService {
       getUserDetails = await this.userDataRepository.findOne({
         where: {
           id: currentUser.id,
-        }
-      })
+        },
+      });
     }
 
     if (getUserDetails?.organization_id == 1 && payload.level_type == 'ORG') {
@@ -122,56 +122,82 @@ export class UserSessionService {
   }
 
   async checkIfUserHasMapping(
-    userId: number,
-    appcode: string,
-    levelType: string,
-    levelId: string,
-  ): Promise<boolean> {
-
-    const count = await this.userRoleMappingRepository
-      .createQueryBuilder("urm")
-      .where("urm.user_id = :userId", { userId })
-      .andWhere("urm.appcode = :appcode", { appcode })
-      .andWhere("urm.level_type = :levelType", { levelType })
-      .andWhere("urm.level_id = :levelId", { levelId })
-      .getCount();
-
-    return count > 0;
-  }
+  userId: number,
+  appcode: string,
+  levelType: string,
+  levelId: string,
+): Promise<boolean> {
+  // Get repositories dynamically via reflectionHelper
+  const userRoleMappingRepo =
+    this.reflectionHelper.getRepoService('UserRoleMapping');
+  const appMasterRepo =
+    this.reflectionHelper.getRepoService('AppMaster');
+
+  // Use QueryBuilder with proper aliases
+  const count = await userRoleMappingRepo
+    .createQueryBuilder('urm')
+    .innerJoin(
+      appMasterRepo.metadata.tableName,
+      'app',
+      'app.appcode = urm.appcode',
+    )
+    .where('urm.user_id = :userId', { userId })
+    .andWhere('urm.appcode = :appcode', { appcode })
+    .andWhere('urm.level_type = :levelType', { levelType })
+    .andWhere('urm.level_id = :levelId', { levelId })
+    .andWhere('app.show_in_ui = true')
+    .getCount();
+
+  return count > 0;
+}
+
 
   async getUserRoleMappingForApp(userId: number, appcode: string) {
-    const mapping = await this.userRoleMappingRepository
-      .createQueryBuilder('sso_user_role_mapping')
-      .where('sso_user_role_mapping.user_id = :userId', { userId })
-      .andWhere('sso_user_role_mapping.appcode = :appcode', { appcode })
-      .getOne();
-
-    // If not found or is already ORG/SCH, return directly
-    if (!mapping || mapping.level_type !== 'BRN') {
-      return mapping;
-    }
+  // Get repos dynamically
+  const userRoleMappingRepo =
+    this.reflectionHelper.getRepoService('UserRoleMapping');
+
+  const appMasterRepo =
+    this.reflectionHelper.getRepoService('AppMaster');
+
+  // Build dynamic join using metadata
+  const mapping = await userRoleMappingRepo
+    .createQueryBuilder('urm')
+    .innerJoin(
+      appMasterRepo.metadata.tableName,
+      'app',
+      'app.appcode = urm.appcode',
+    )
+    .where('urm.user_id = :userId', { userId })
+    .andWhere('urm.appcode = :appcode', { appcode })
+    .andWhere('app.show_in_ui = true')
+    .getOne();
+
+  // If not found or level_type is not BRN → return
+  if (!mapping || mapping.level_type !== 'BRN') {
+    return mapping;
+  }
 
-    //DONE
-    // If BRN, resolve first SCH under this brand
-    const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
-    const schools = await schoolRepo.findOne({
-      where: {
-        brand_id: mapping.level_id
-      },
-      order: {
-        id: "ASC"
-      }
-    });
+  // Resolve SCH under BRN
+  const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
 
-    if (schools) {
-      return {
-        ...mapping,
-        level_type: 'SCH',
-        level_id: schools.id,
-      };
-    }
+  const school = await schoolRepo.findOne({
+    where: {
+      brand_id: mapping.level_id,
+    },
+    order: { id: 'ASC' },
+  });
 
-    // No SCH found under BRN
-    return null;
+  if (school) {
+    return {
+      ...mapping,
+      level_type: 'SCH',
+      level_id: school.id,
+    };
   }
+
+  // If no SCH found
+  return null;
+}
+
 }

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>