rez_core 2.1.71 → 2.1.73

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -29,7 +29,8 @@ let OrganizationController = class OrganizationController {
29
29
  async getOrganizationHierarchy(req) {
30
30
  const userId = req.user.userData?.id;
31
31
  const appcode = req.user.userData?.appcode;
32
- return await this.orgService.getOrganizationHierarchy(userId, appcode);
32
+ const org_id = req.user.userData?.organization_id;
33
+ return await this.orgService.getOrganizationHierarchy(userId, appcode, org_id);
33
34
  }
34
35
  };
35
36
  exports.OrganizationController = OrganizationController;
@@ -1 +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,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"}
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,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;QAC3C,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC;QAElD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,wBAAwB,CACnD,MAAM,EACN,OAAO,EACP,MAAM,CACP,CAAC;IACJ,CAAC;CACF,CAAA;AA5BY,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;;;;sEAUpC;iCA3BU,sBAAsB;IADlC,IAAA,mBAAU,EAAC,cAAc,CAAC;IAItB,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;qCADO,0CAAmB;QACK,0BAAW;GAHvD,sBAAsB,CA4BlC"}
@@ -6,5 +6,5 @@ export declare class SchoolRepository {
6
6
  constructor(schoolRepo: Repository<SchoolData>, dataSource: DataSource);
7
7
  findAllByOrgId(brdId: number): Promise<SchoolData[]>;
8
8
  findAllByBrandId(brdId: number): Promise<SchoolData[]>;
9
- getUserContextDropdown(userId: number, appCode: string): Promise<any[]>;
9
+ getUserContextDropdown(userId: number, appCode: string, org_id: any): Promise<any[]>;
10
10
  }
@@ -33,7 +33,7 @@ let SchoolRepository = class SchoolRepository {
33
33
  where: { brand_id: brdId },
34
34
  });
35
35
  }
36
- async getUserContextDropdown(userId, appCode) {
36
+ async getUserContextDropdown(userId, appCode, org_id) {
37
37
  const userRoleRepo = this.dataSource.getRepository(user_role_mapping_entity_1.UserRoleMapping);
38
38
  const hasOrgAccess = await userRoleRepo
39
39
  .createQueryBuilder('urm')
@@ -41,6 +41,12 @@ let SchoolRepository = class SchoolRepository {
41
41
  .andWhere('urm.appcode = :appCode', { appCode })
42
42
  .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
43
43
  .getRawMany();
44
+ console.log('hasOrgAccess before', hasOrgAccess);
45
+ let currentORGLevel_id = hasOrgAccess[0]?.urm_level_id;
46
+ if (hasOrgAccess[0].urm_level_id == 1) {
47
+ currentORGLevel_id = org_id;
48
+ }
49
+ console.log('currentORGLevel_id', currentORGLevel_id);
44
50
  if (hasOrgAccess.length > 0) {
45
51
  const schools = await this.dataSource
46
52
  .createQueryBuilder()
@@ -60,8 +66,9 @@ let SchoolRepository = class SchoolRepository {
60
66
  .from('cr_school', 'sch')
61
67
  .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
62
68
  .innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
63
- .where('org.id = :orgId', { orgId: hasOrgAccess[0].urm_level_id })
69
+ .where('org.id = :orgId', { orgId: currentORGLevel_id })
64
70
  .getRawMany();
71
+ console.log('schools', schools);
65
72
  const result = {};
66
73
  for (const row of schools) {
67
74
  const { org_id, org_name, org_address, org_status, brand_id, brand_name, brand_status, school_id, school_name, school_location, school_status, } = row;
@@ -1 +1 @@
1
- {"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
@@ -17,5 +17,5 @@ export declare class OrganizationService {
17
17
  findById(id: number | undefined): Promise<OrganizationData[]>;
18
18
  update(id: number, organizationDto: Partial<OrganizationData>, manager?: EntityManager): Promise<OrganizationData | null>;
19
19
  remove(id: number, manager?: EntityManager): Promise<void>;
20
- getOrganizationHierarchy(userId: number, appCode: string): Promise<any[]>;
20
+ getOrganizationHierarchy(userId: number, appCode: string, orgId: number): Promise<any[]>;
21
21
  }
@@ -67,8 +67,8 @@ let OrganizationService = class OrganizationService {
67
67
  : this.organizationRepository;
68
68
  await repo.delete(id);
69
69
  }
70
- async getOrganizationHierarchy(userId, appCode) {
71
- return await this.schoolRepository.getUserContextDropdown(userId, appCode);
70
+ async getOrganizationHierarchy(userId, appCode, orgId) {
71
+ return await this.schoolRepository.getUserContextDropdown(userId, appCode, orgId);
72
72
  }
73
73
  };
74
74
  exports.OrganizationService = OrganizationService;
@@ -1 +1 @@
1
- {"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"organization.service.js","sourceRoot":"","sources":["../../../../src/module/enterprise/service/organization.service.ts"],"names":[],"mappings":"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"}