rez_core 2.2.7 → 2.2.8

package/package.json

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

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

@@ -3,6 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { DataSource, Repository } from 'typeorm';
 // import { SchoolData } from '../entity/school.entity';
 import { UserRoleMapping } from 'src/module/user/entity/user-role-mapping.entity';
+import { STATUS_INACTIVE } from 'src/constant/global.constant';
 
 @Injectable()
 export class SchoolRepository {
@@ -43,6 +44,16 @@ export class SchoolRepository {
       currentORGLevel_id = org_id;
     }
 
+    const resolvedInactiveStatus = await this.dataSource
+      .createQueryBuilder()
+      .select('*')
+      .from('cr_list_master_items', 'cli')
+      .where('cli.code = :code AND cli.organization_id = :orgId', {
+        code: STATUS_INACTIVE,
+        orgId: org_id,
+      })
+      .getRawOne();
+
     if (hasOrgAccess.length > 0) {
       const schools = await this.dataSource
         .createQueryBuilder()
@@ -142,9 +153,14 @@ export class SchoolRepository {
             })
             .getRawOne();
 
+          const finalSchoolName =
+            schoolStatus?.id === resolvedInactiveStatus?.id
+              ? `${school_name} [INACTIVE]`
+              : school_name;
+
           result[org_id].brands[brand_id].schools.push({
             school_id,
-            school_name,
+            school_name: finalSchoolName,
             school_location,
             status: schoolStatus ? schoolStatus.name : school_status,
             type: 'School',
@@ -238,13 +254,18 @@ export class SchoolRepository {
           };
         }
 
+        const finalSchoolName =
+          school_status === resolvedInactiveStatus?.id
+            ? `${school_name} [INACTIVE]`
+            : school_name;
+
         if (
           school_id &&
           !result[brand_id].schools.some((s) => s.school_id === school_id)
         ) {
           result[brand_id].schools.push({
             school_id,
-            school_name,
+            school_name: finalSchoolName,
             school_location,
             status: school_status,
             type: 'School',