rez_core 2.1.22 → 2.1.24

package/dist/module/enterprise/controller/organization.controller.d.ts

@@ -8,5 +8,7 @@ export declare class OrganizationController {
     getOrganizationDropdown(req: Request & {
         user: any;
     }): Promise<import("../entity/organization.entity").OrganizationData[]>;
-    getOrganizationHierarchy(): Promise<any[]>;
+    getOrganizationHierarchy(req: Request & {
+        user: any;
+    }): Promise<any[]>;
 }

package/dist/module/enterprise/controller/organization.controller.js

@@ -26,8 +26,10 @@ let OrganizationController = class OrganizationController {
         const userData = req.user.userData;
         return this.orgService.findById(userData?.organization_id);
     }
-    async getOrganizationHierarchy() {
-        return await this.orgService.getOrganizationHierarchy();
+    async getOrganizationHierarchy(req) {
+        const userId = req.user.userData?.id;
+        const appcode = req.user.userData?.appcode;
+        return await this.orgService.getOrganizationHierarchy(userId, appcode);
     }
 };
 exports.OrganizationController = OrganizationController;
@@ -42,8 +44,9 @@ __decorate([
 __decorate([
     (0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
     (0, common_1.Get)('hierarchy'),
+    __param(0, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
+    __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], OrganizationController.prototype, "getOrganizationHierarchy", null);
 exports.OrganizationController = OrganizationController = __decorate([

package/dist/module/enterprise/controller/organization.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"organization.controller.js","sourceRoot":"","sources":["../../../../src/module/enterprise/controller/organization.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,0EAAsE;AAEtE,2DAAgE;AAChE,kEAAmE;AAI5D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAA+B,EACR,WAAwB;QAD/C,eAAU,GAAV,UAAU,CAAqB;QACR,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAIE,AAAN,KAAK,CAAC,uBAAuB,CAAQ,GAA4B;QAC/D,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAGnC,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB;QAC5B,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,wBAAwB,EAAE,CAAC;IAC1D,CAAC;CACF,CAAA;AApBY,wDAAsB;AAQ3B;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,EAAC,UAAU,CAAC;IACe,WAAA,IAAA,YAAG,GAAE,CAAA;;;;qEAKnC;AAIK;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,EAAC,WAAW,CAAC;;;;sEAGhB;iCAnBU,sBAAsB;IADlC,IAAA,mBAAU,EAAC,cAAc,CAAC;IAItB,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;qCADO,0CAAmB;QACK,0BAAW;GAHvD,sBAAsB,CAoBlC"}
+{"version":3,"file":"organization.controller.js","sourceRoot":"","sources":["../../../../src/module/enterprise/controller/organization.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,0EAAsE;AAEtE,2DAAgE;AAChE,kEAAmE;AAI5D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,UAA+B,EACR,WAAwB;QAD/C,eAAU,GAAV,UAAU,CAAqB;QACR,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAIE,AAAN,KAAK,CAAC,uBAAuB,CAAQ,GAA4B;QAC/D,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAGnC,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB,CAAQ,GAA4B;QAChE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;QAE3C,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;CACF,CAAA;AAvBY,wDAAsB;AAQ3B;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,EAAC,UAAU,CAAC;IACe,WAAA,IAAA,YAAG,GAAE,CAAA;;;;qEAKnC;AAIK;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,EAAC,WAAW,CAAC;IACe,WAAA,IAAA,YAAG,GAAE,CAAA;;;;sEAKpC;iCAtBU,sBAAsB;IADlC,IAAA,mBAAU,EAAC,cAAc,CAAC;IAItB,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;qCADO,0CAAmB;QACK,0BAAW;GAHvD,sBAAsB,CAuBlC"}

package/dist/module/enterprise/repository/school.repository.d.ts

@@ -6,5 +6,5 @@ export declare class SchoolRepository {
     constructor(schoolRepo: Repository<SchoolData>, dataSource: DataSource);
     findAllByOrgId(brdId: number): Promise<SchoolData[]>;
     findAllByBrandId(brdId: number): Promise<SchoolData[]>;
-    getUserContextDropdown(): Promise<any[]>;
+    getUserContextDropdown(userId: number, appCode: string): Promise<any[]>;
 }

package/dist/module/enterprise/repository/school.repository.js

@@ -17,6 +17,7 @@ const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
 const school_entity_1 = require("../entity/school.entity");
+const user_role_mapping_entity_1 = require("../../user/entity/user-role-mapping.entity");
 let SchoolRepository = class SchoolRepository {
     constructor(schoolRepo, dataSource) {
         this.schoolRepo = schoolRepo;
@@ -32,80 +33,133 @@ let SchoolRepository = class SchoolRepository {
             where: { brand_id: brdId },
         });
     }
-    async getUserContextDropdown() {
-        const data = await this.dataSource
-            .createQueryBuilder()
-            .select([
-            'org.id AS org_id',
-            'org.name AS org_name',
-            'org.address AS org_address',
-            'org.type AS org_type',
-            'br.id AS brand_id',
-            'br.entity_type AS brand_entity_type',
-            'br.name AS brand_name',
-            'br.status AS brand_status',
-            'br.parent_type AS brand_parent_type',
-            'br.parent_id AS brand_parent_id',
-            'br.code AS brand_code',
-            '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',
-            'sch.id AS school_id',
-            'sch.entity_type AS school_entity_type',
-            'sch.name AS school_name',
-            'sch.status AS school_status',
-            'sch.parent_type AS school_parent_type',
-            'sch.parent_id AS school_parent_id',
-            'sch.code AS school_code',
-            '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',
-        ])
-            .from('cr_school', 'sch')
-            .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
-            .innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
-            .orderBy('org.id, br.id, sch.id')
+    async getUserContextDropdown(userId, appCode) {
+        const userRoleRepo = this.dataSource.getRepository(user_role_mapping_entity_1.UserRoleMapping);
+        const hasOrgAccess = await userRoleRepo
+            .createQueryBuilder('urm')
+            .where('urm.user_id = :userId', { userId })
+            .andWhere('urm.appcode = :appCode', { appCode })
+            .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
             .getRawMany();
-        const result = {};
-        for (const row of data) {
-            const { org_id, org_name, org_address, org_type: type, brand_id } = row;
-            if (!result[org_id]) {
-                result[org_id] = {
-                    org_id,
-                    org_name,
-                    org_address,
-                    type,
-                    brands: {},
-                };
-            }
-            if (!result[org_id].brands[brand_id]) {
-                const brandInfo = {};
-                for (const key in row) {
-                    if (key.startsWith('brand_')) {
-                        brandInfo[key.replace('brand_', '')] = row[key];
-                    }
+        if (hasOrgAccess.length > 0) {
+            const schools = await this.dataSource
+                .createQueryBuilder()
+                .select([
+                'org.id AS org_id',
+                'org.name AS org_name',
+                'org.address AS org_address',
+                'org.status AS org_status',
+                'br.id AS brand_id',
+                'br.name AS brand_name',
+                'br.status AS brand_status',
+                'sch.id AS school_id',
+                'sch.name AS school_name',
+                'sch.location AS school_location',
+                'sch.status AS school_status',
+            ])
+                .from('cr_school', 'sch')
+                .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
+                .innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
+                .where('org.id = :orgId', { orgId: hasOrgAccess[0].urm_level_id })
+                .getRawMany();
+            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] = {
+                        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: [],
+                    };
                 }
-                brandInfo.schools = [];
-                result[org_id].brands[brand_id] = brandInfo;
+                result[org_id].brands[brand_id].schools.push({
+                    school_id,
+                    school_name,
+                    school_location,
+                    status: school_status,
+                    type: 'School',
+                });
             }
-            const schoolInfo = {};
-            for (const key in row) {
-                if (key.startsWith('school_')) {
-                    schoolInfo[key.replace('school_', '')] = row[key];
+            return Object.values(result).map((org) => ({
+                ...org,
+                brands: Object.values(org.brands),
+            }));
+        }
+        else {
+            const brnMappings = await this.dataSource
+                .createQueryBuilder()
+                .select([
+                'brand.id AS brand_id',
+                'brand.name AS brand_name',
+                'brand.status AS brand_status',
+                'school.id AS school_id',
+                'school.name AS school_name',
+                'school.location AS school_location',
+                'school.status AS school_status',
+            ])
+                .from('cr_user_role_mapping', 'urm')
+                .innerJoin('cr_brand', 'brand', 'brand.id = urm.level_id')
+                .innerJoin('cr_school', 'school', 'school.brand_id = brand.id')
+                .where('urm.user_id = :userId', { userId })
+                .andWhere('urm.appcode = :appCode', { appCode })
+                .andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
+                .getRawMany();
+            const schMappings = await this.dataSource
+                .createQueryBuilder()
+                .select([
+                'brand.id AS brand_id',
+                'brand.name AS brand_name',
+                'brand.status AS brand_status',
+                'school.id AS school_id',
+                'school.name AS school_name',
+                'school.location AS school_location',
+                'school.status AS school_status',
+            ])
+                .from('cr_user_role_mapping', 'urm')
+                .innerJoin('cr_school', 'school', 'school.id = urm.level_id')
+                .innerJoin('cr_brand', 'brand', 'brand.id = school.brand_id')
+                .where('urm.user_id = :userId', { userId })
+                .andWhere('urm.appcode = :appCode', { appCode })
+                .andWhere('urm.level_type = :levelType', { levelType: 'SCH' })
+                .getRawMany();
+            const allMappings = [...brnMappings, ...schMappings];
+            const result = {};
+            for (const row of allMappings) {
+                const { brand_id, brand_name, brand_status, school_id, school_name, school_location, school_status, } = row;
+                if (!result[brand_id]) {
+                    result[brand_id] = {
+                        brand_id,
+                        brand_name,
+                        status: brand_status,
+                        type: 'Brand',
+                        schools: [],
+                    };
+                }
+                if (school_id &&
+                    !result[brand_id].schools.some((s) => s.school_id === school_id)) {
+                    result[brand_id].schools.push({
+                        school_id,
+                        school_name,
+                        school_location,
+                        status: school_status,
+                        type: 'School',
+                    });
                 }
             }
-            result[org_id].brands[brand_id].schools.push(schoolInfo);
+            return Object.values(result);
         }
-        return Object.values(result).map((org) => ({
-            ...org,
-            brands: Object.values(org.brands),
-        }));
     }
 };
 exports.SchoolRepository = SchoolRepository;

package/dist/module/enterprise/repository/school.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}

package/dist/module/enterprise/service/organization.service.d.ts

@@ -17,5 +17,5 @@ export declare class OrganizationService {
     findById(id: number | undefined): Promise<OrganizationData[]>;
     update(id: number, organizationDto: Partial<OrganizationData>, manager?: EntityManager): Promise<OrganizationData | null>;
     remove(id: number, manager?: EntityManager): Promise<void>;
-    getOrganizationHierarchy(): Promise<any[]>;
+    getOrganizationHierarchy(userId: number, appCode: string): Promise<any[]>;
 }

package/dist/module/enterprise/service/organization.service.js

@@ -67,8 +67,8 @@ let OrganizationService = class OrganizationService {
             : this.organizationRepository;
         await repo.delete(id);
     }
-    async getOrganizationHierarchy() {
-        return await this.schoolRepository.getUserContextDropdown();
+    async getOrganizationHierarchy(userId, appCode) {
+        return await this.schoolRepository.getUserContextDropdown(userId, appCode);
     }
 };
 exports.OrganizationService = OrganizationService;

package/dist/module/enterprise/service/organization.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":"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"}