rez_core 2.1.19 → 2.1.21

package/package.json

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

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

@@ -31,6 +31,7 @@ export class SchoolRepository {
         'org.id AS org_id',
         'org.name AS org_name',
         'org.address AS org_address',
+        'org.type AS type',
 
         // Full brand columns
         'br.id AS brand_id',
@@ -40,16 +41,12 @@ export class SchoolRepository {
         'br.parent_type AS brand_parent_type',
         'br.parent_id AS brand_parent_id',
         'br.code AS brand_code',
-        'br.created_by AS brand_created_by',
-        'br.created_date AS brand_created_date',
-        'br.modified_by AS brand_modified_by',
-        'br.modified_date AS brand_modified_date',
         'br.enterprise_id AS brand_enterprise_id',
         'br.organization_id AS brand_organization_id',
         'br.appcode AS brand_appcode',
         'br.level_id AS brand_level_id',
         'br.level_type AS brand_level_type',
-        'br.type AS brand_type',
+        'br.type AS type',
 
         // Full school columns
         'sch.id AS school_id',
@@ -59,16 +56,12 @@ export class SchoolRepository {
         'sch.parent_type AS school_parent_type',
         'sch.parent_id AS school_parent_id',
         'sch.code AS school_code',
-        'sch.created_by AS school_created_by',
-        'sch.created_date AS school_created_date',
-        'sch.modified_by AS school_modified_by',
-        'sch.modified_date AS school_modified_date',
         'sch.enterprise_id AS school_enterprise_id',
         'sch.organization_id AS school_organization_id',
         'sch.appcode AS school_appcode',
         'sch.level_id AS school_level_id',
         'sch.level_type AS school_level_type',
-        'sch.type AS school_type',
+        'sch.type AS type',
       ])
       .from('cr_school', 'sch')
       .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
@@ -79,29 +72,18 @@ export class SchoolRepository {
     const result = {};
 
     for (const row of data) {
-      const {
-        org_id,
-        org_name,
-        org_address,
+      const { org_id, org_name, org_address, level_type, brand_id } = row;
 
-        brand_id,
-        ...brandFields
-
-        // include only brand fields prefixed with brand_
-      } = row;
-
-      const {
-        school_id,
-        ...schoolFields
-
-        // include only school fields prefixed with school_
-      } = row;
+      // const {
+      //   school_id,ol_
+      // } = row;
 
       if (!result[org_id]) {
         result[org_id] = {
           org_id,
           org_name,
           org_address,
+          level_type,
           brands: {},
         };
       }