rez_core 2.2.7 → 2.2.8
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.
|
@@ -13,6 +13,7 @@ exports.SchoolRepository = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const typeorm_1 = require("typeorm");
|
|
15
15
|
const user_role_mapping_entity_1 = require("../../user/entity/user-role-mapping.entity");
|
|
16
|
+
const global_constant_1 = require("../../../constant/global.constant");
|
|
16
17
|
let SchoolRepository = class SchoolRepository {
|
|
17
18
|
constructor(dataSource) {
|
|
18
19
|
this.dataSource = dataSource;
|
|
@@ -46,6 +47,15 @@ let SchoolRepository = class SchoolRepository {
|
|
|
46
47
|
if (hasOrgAccess[0]?.urm_level_id == 1) {
|
|
47
48
|
currentORGLevel_id = org_id;
|
|
48
49
|
}
|
|
50
|
+
const resolvedInactiveStatus = await this.dataSource
|
|
51
|
+
.createQueryBuilder()
|
|
52
|
+
.select('*')
|
|
53
|
+
.from('cr_list_master_items', 'cli')
|
|
54
|
+
.where('cli.code = :code AND cli.organization_id = :orgId', {
|
|
55
|
+
code: global_constant_1.STATUS_INACTIVE,
|
|
56
|
+
orgId: org_id,
|
|
57
|
+
})
|
|
58
|
+
.getRawOne();
|
|
49
59
|
if (hasOrgAccess.length > 0) {
|
|
50
60
|
const schools = await this.dataSource
|
|
51
61
|
.createQueryBuilder()
|
|
@@ -120,9 +130,12 @@ let SchoolRepository = class SchoolRepository {
|
|
|
120
130
|
orgId: org_id,
|
|
121
131
|
})
|
|
122
132
|
.getRawOne();
|
|
133
|
+
const finalSchoolName = schoolStatus?.id === resolvedInactiveStatus?.id
|
|
134
|
+
? `${school_name} [INACTIVE]`
|
|
135
|
+
: school_name;
|
|
123
136
|
result[org_id].brands[brand_id].schools.push({
|
|
124
137
|
school_id,
|
|
125
|
-
school_name,
|
|
138
|
+
school_name: finalSchoolName,
|
|
126
139
|
school_location,
|
|
127
140
|
status: schoolStatus ? schoolStatus.name : school_status,
|
|
128
141
|
type: 'School',
|
|
@@ -202,11 +215,14 @@ let SchoolRepository = class SchoolRepository {
|
|
|
202
215
|
schools: [],
|
|
203
216
|
};
|
|
204
217
|
}
|
|
218
|
+
const finalSchoolName = school_status === resolvedInactiveStatus?.id
|
|
219
|
+
? `${school_name} [INACTIVE]`
|
|
220
|
+
: school_name;
|
|
205
221
|
if (school_id &&
|
|
206
222
|
!result[brand_id].schools.some((s) => s.school_id === school_id)) {
|
|
207
223
|
result[brand_id].schools.push({
|
|
208
224
|
school_id,
|
|
209
|
-
school_name,
|
|
225
|
+
school_name: finalSchoolName,
|
|
210
226
|
school_location,
|
|
211
227
|
status: school_status,
|
|
212
228
|
type: 'School',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,qCAAiD;AAEjD,yFAAkF;
|
|
1
|
+
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
|