rez_core 2.1.73 → 2.1.75

package/package.json

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

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

@@ -34,15 +34,11 @@ export class SchoolRepository {
       .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
       .getRawMany();
 
-    console.log('hasOrgAccess before', hasOrgAccess);
-
     let currentORGLevel_id = hasOrgAccess[0]?.urm_level_id;
     if (hasOrgAccess[0].urm_level_id == 1) {
       currentORGLevel_id = org_id;
     }
 
-    console.log('currentORGLevel_id', currentORGLevel_id);
-
     if (hasOrgAccess.length > 0) {
       const schools = await this.dataSource
         .createQueryBuilder()
@@ -65,58 +61,77 @@ export class SchoolRepository {
         .where('org.id = :orgId', { orgId: currentORGLevel_id })
         .getRawMany();
 
-      console.log('schools', schools);
-
-      const result = {};
-      for (const row of schools) {
-        const {
-          org_id,
-          org_name,
-          org_address,
-          org_status,
-          brand_id,
-          brand_name,
-          brand_status,
-          school_id,
-          school_name,
-          school_location,
-          school_status,
-        } = row;
-
-        if (!result[org_id]) {
-          result[org_id] = {
+      if (schools.length > 0) {
+        const result = {};
+        for (const row of schools) {
+          const {
             org_id,
             org_name,
             org_address,
-            status: org_status,
-            type: 'Organization',
-            brands: {},
-          };
-        }
-
-        if (!result[org_id].brands[brand_id]) {
-          result[org_id].brands[brand_id] = {
+            org_status,
             brand_id,
             brand_name,
-            status: brand_status,
-            type: 'Brand',
-            schools: [],
-          };
+            brand_status,
+            school_id,
+            school_name,
+            school_location,
+            school_status,
+          } = row;
+
+          if (!result[org_id]) {
+            result[org_id] = {
+              org_id,
+              org_name,
+              org_address,
+              status: org_status,
+              type: 'Organization',
+              brands: {},
+            };
+          }
+
+          if (!result[org_id].brands[brand_id]) {
+            result[org_id].brands[brand_id] = {
+              brand_id,
+              brand_name,
+              status: brand_status,
+              type: 'Brand',
+              schools: [],
+            };
+          }
+
+          result[org_id].brands[brand_id].schools.push({
+            school_id,
+            school_name,
+            school_location,
+            status: school_status,
+            type: 'School',
+          });
         }
-
-        result[org_id].brands[brand_id].schools.push({
-          school_id,
-          school_name,
-          school_location,
-          status: school_status,
-          type: 'School',
-        });
+        return Object.values(result).map((org: any) => ({
+          ...org,
+          brands: Object.values(org.brands),
+        }));
+      } else {
+        const orgDetails = await this.dataSource.createQueryBuilder();
+
+        orgDetails
+          .select(['*'])
+          .from('cr_organization', 'org')
+          .where('org.id = :orgId', { orgId: currentORGLevel_id });
+
+        const orgResult = await orgDetails.getRawOne();
+
+        return [
+          {
+            org_id: currentORGLevel_id,
+            org_name: orgResult.name,
+            org_address: orgResult.address,
+            status: orgResult.status,
+            type: orgResult.type || 'Organization',
+            brands: [],
+          },
+        ];
       }
-
-      return Object.values(result).map((org: any) => ({
-        ...org,
-        brands: Object.values(org.brands),
-      }));
     } else {
       const brnMappings = await this.dataSource
         .createQueryBuilder()

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

@@ -140,7 +140,7 @@ export class ListMasterItemService {
       } catch (error) {
         errors.push({
           row: i,
-          error: [
+          errors: [
             {
               field: 'name',
               message: