rez_core 2.0.44 → 2.0.46

package/package.json

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

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

@@ -27,8 +27,6 @@ export class OrganizationController {
     const userId = req.user.userData?.id;
     const appcode = req.user.userData?.appcode;
 
-    console.log(userId, appcode, 'userId, appcode');
-
     return await this.orgService.getOrganizationHierarchy(userId, appcode);
   }
 }

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

@@ -8,4 +8,7 @@ export class SchoolData extends BaseEntity {
 
   @Column({ name: 'brand_code', nullable: true })
   brand_code: string;
+
+  @Column({ name: 'location', nullable: true })
+  location: string;
 }

package/src/module/enterprise/repository/school.repository.ts

@@ -35,7 +35,6 @@ export class SchoolRepository {
       .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
       .getRawMany();
 
-    console.log(hasOrgAccess);
     if (hasOrgAccess.length > 0) {
       // Return nested Org -> Brand -> School structure
       const schools = await this.dataSource
@@ -43,10 +42,12 @@ export class SchoolRepository {
         .select([
           'org.id AS org_id',
           'org.name AS org_name',
+          'org.address AS org_address',
           'br.id AS brand_id',
           'br.name AS brand_name',
           'sch.id AS school_id',
           'sch.name AS school_name',
+          'sch.location AS school_location',
         ])
         .from('cr_school', 'sch')
         .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
@@ -59,16 +60,19 @@ export class SchoolRepository {
         const {
           org_id,
           org_name,
+          org_address,
           brand_id,
           brand_name,
           school_id,
           school_name,
+          school_location,
         } = row;
 
         if (!result[org_id]) {
           result[org_id] = {
             org_id,
             org_name,
+            org_address,
             brands: {},
           };
         }
@@ -82,6 +86,7 @@ export class SchoolRepository {
         result[org_id].brands[brand_id].schools.push({
           school_id,
           school_name,
+          school_location,
         });
       }
 
@@ -98,6 +103,7 @@ export class SchoolRepository {
           'brand.name AS brand_name',
           'school.id AS school_id',
           'school.name AS school_name',
+          'school.location AS school_location',
         ])
         .from('cr_user_role_mapping', 'urm')
         .innerJoin('cr_brand', 'brand', 'brand.id = urm.level_id')
@@ -130,7 +136,13 @@ export class SchoolRepository {
       // 4. Group by brand
       const result = {};
       for (const row of allMappings) {
-        const { brand_id, brand_name, school_id, school_name } = row;
+        const {
+          brand_id,
+          brand_name,
+          school_id,
+          school_name,
+          school_location,
+        } = row;
 
         if (!result[brand_id]) {
           result[brand_id] = {
@@ -145,7 +157,11 @@ export class SchoolRepository {
           school_id &&
           !result[brand_id].schools.some((s) => s.school_id === school_id)
         ) {
-          result[brand_id].schools.push({ school_id, school_name });
+          result[brand_id].schools.push({
+            school_id,
+            school_name,
+            school_location,
+          });
         }
       }
 

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

@@ -25,4 +25,7 @@ export class AppMaster extends BaseEntity {
 
   @Column({ name: 'backgroudColor', type: 'varchar', nullable: true })
   backgroudColor: string;
+
+  @Column({ name: 'iconName', type: 'varchar', nullable: true })
+  iconName: string;
 }

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

@@ -13,22 +13,25 @@ export class AppMasterService {
     const app_code =
       await this.userRoleMappingRepository.findDistinctAppcodeByUserId(userId);
 
-    const result: Record<string, any> = {};
+    const finalResult: any[] = [];
 
     if (app_code.appcode.length > 0) {
       const resolvedData = await Promise.all(
         app_code.appcode.map(async (element) => {
           const data =
             await this.appMasterRepository.getAppMasterDataByAppCode(element);
-          return { [element]: data };
+          return data || [];
         }),
       );
 
-      resolvedData.forEach((entry) => {
-        Object.assign(result, entry);
+      resolvedData.flat().forEach((item) => {
+        finalResult.push({
+          key: item.name,
+          details: item,
+        });
       });
     }
 
-    return result;
+    return finalResult;
   }
 }

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

@@ -9,34 +9,44 @@ import { UserData } from '../entity/user.entity';
 export class RoleRepository {
   constructor(
     @InjectRepository(Role)
-    private readonly roleRepo: Repository<Role>
+    private readonly roleRepo: Repository<Role>,
   ) {}
 
   async findByCode(code: string): Promise<Role | null> {
     return this.roleRepo.findOne({ where: { code } });
   }
 
-
   public async isRoleNameExists(
     name: string,
-    options?: { excludeRoleId?: number; organization_id?: number }
+    options?: { excludeRoleId?: number; organization_id?: number },
   ): Promise<boolean> {
     const query = this.roleRepo
       .createQueryBuilder('role')
       .where('role.name = :name', { name });
-  
+
     if (options?.excludeRoleId) {
-      query.andWhere('role.id != :excludeRoleId', { excludeRoleId: options.excludeRoleId });
+      query.andWhere('role.id != :excludeRoleId', {
+        excludeRoleId: options.excludeRoleId,
+      });
     }
-  
+
     if (options?.organization_id !== undefined) {
       query.andWhere('role.organization_id = :organization_id', {
         organization_id: options.organization_id,
       });
     }
-  
+
     const existingRole = await query.getOne();
     return !!existingRole;
   }
-  
+
+  async find(data): Promise<Role[] | null> {
+    return this.roleRepo.find({
+      where: {
+        ...(data.is_factory !== undefined && { is_factory: data.is_factory }),
+        ...(data.level_id !== undefined && { level_id: data.level_id }),
+        ...(data.level_type !== undefined && { level_type: data.level_type }),
+      },
+    });
+  }
 }

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

@@ -28,10 +28,14 @@ export class RoleService extends EntityServiceImpl {
     appcode?: string,
   ): Promise<BaseEntity> {
     let role = entityData as Role;
-    if(appcode){
-      role.appcode = appcode ;
+    if (appcode) {
+      role.appcode = appcode;
     }
-    if (await this.roleRepository.isRoleNameExists(role.name,{organization_id:entityData.organization_id})) {
+    if (
+      await this.roleRepository.isRoleNameExists(role.name, {
+        organization_id: entityData.organization_id,
+      })
+    ) {
       throw new BadRequestException('Role name already exists.');
     }
 
@@ -102,13 +106,16 @@ export class RoleService extends EntityServiceImpl {
     }
 
     if (
-      await this.roleRepository.isRoleNameExists(entityData.name, {excludeRoleId:entityData.id,organization_id:loggedInUser?.organization_id})
+      await this.roleRepository.isRoleNameExists(entityData.name, {
+        excludeRoleId: entityData.id,
+        organization_id: loggedInUser?.organization_id,
+      })
     ) {
       throw new BadRequestException('Role name already exists.');
     }
 
-  const {copy_from_role_id, ...persistableData} = role;
-  const updatedRole = await super.updateEntity(persistableData, loggedInUser);
+    const { copy_from_role_id, ...persistableData } = role;
+    const updatedRole = await super.updateEntity(persistableData, loggedInUser);
 
     if (role.copy_from_role_id) {
       const sourceRole = await this.getEntityData(
@@ -140,4 +147,12 @@ export class RoleService extends EntityServiceImpl {
     }
     return updatedRole;
   }
+
+  async getDefaultRole(data: {
+    is_factory?: boolean;
+    level_id?: number;
+    level_type?: string;
+  }): Promise<Role[] | null> {
+    return await this.roleRepository.find(data);
+  }
 }