rez_core 2.0.44 → 2.0.45

package/package.json

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

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

@@ -43,10 +43,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 +61,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 +87,7 @@ export class SchoolRepository {
         result[org_id].brands[brand_id].schools.push({
           school_id,
           school_name,
+          school_location,
         });
       }
 
@@ -98,6 +104,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 +137,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 +158,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;
   }
 }