rez_core 2.2.104 → 2.2.105
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.
|
@@ -69,16 +69,16 @@ let SchoolRepository = class SchoolRepository {
|
|
|
69
69
|
'brand_profile.status AS brand_status',
|
|
70
70
|
'school.id AS school_id',
|
|
71
71
|
'school.name AS school_name',
|
|
72
|
-
'
|
|
72
|
+
'address.area AS school_location',
|
|
73
73
|
'school.status AS school_status',
|
|
74
74
|
])
|
|
75
75
|
.from('cr_organization', 'org')
|
|
76
76
|
.innerJoin('cr_organization', 'brn', "brn.type = 'BRN'")
|
|
77
77
|
.innerJoin('eth_brand_profile', 'brand_profile', 'brand_profile.parent_id = brn.id AND brand_profile.organization_id = org.id')
|
|
78
78
|
.innerJoin('eth_school_profile', 'school', 'school.brand_id = brn.id')
|
|
79
|
-
.
|
|
80
|
-
orgId: currentORGLevel_id
|
|
81
|
-
|
|
79
|
+
.innerJoin('eth_address', 'address', 'address.parent_id = school.id')
|
|
80
|
+
.where('org.id = :orgId', { orgId: currentORGLevel_id })
|
|
81
|
+
.distinct(true)
|
|
82
82
|
.getRawMany();
|
|
83
83
|
if (schools.length > 0) {
|
|
84
84
|
const result = {};
|
|
@@ -174,15 +174,17 @@ let SchoolRepository = class SchoolRepository {
|
|
|
174
174
|
'brand.status AS brand_status',
|
|
175
175
|
'school.id AS school_id',
|
|
176
176
|
'school.name AS school_name',
|
|
177
|
-
'
|
|
177
|
+
'address.area AS school_location',
|
|
178
178
|
'school.status AS school_status',
|
|
179
179
|
])
|
|
180
180
|
.from('cr_user_role_mapping', 'urm')
|
|
181
181
|
.innerJoin('cr_organization', 'brand', 'brand.id = urm.level_id')
|
|
182
182
|
.innerJoin('eth_school_profile', 'school', 'school.brand_id = brand.id')
|
|
183
|
+
.innerJoin('eth_address', 'address', 'address.parent_id = school.id')
|
|
183
184
|
.where('urm.user_id = :userId', { userId })
|
|
184
185
|
.andWhere('urm.appcode = :appCode', { appCode })
|
|
185
186
|
.andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
|
|
187
|
+
.distinct(true)
|
|
186
188
|
.getRawMany();
|
|
187
189
|
const schMappings = await this.dataSource
|
|
188
190
|
.createQueryBuilder()
|
|
@@ -192,15 +194,17 @@ let SchoolRepository = class SchoolRepository {
|
|
|
192
194
|
'brand.status AS brand_status',
|
|
193
195
|
'school.id AS school_id',
|
|
194
196
|
'school.name AS school_name',
|
|
195
|
-
'
|
|
197
|
+
'address.area AS school_location',
|
|
196
198
|
'school.status AS school_status',
|
|
197
199
|
])
|
|
198
200
|
.from('cr_user_role_mapping', 'urm')
|
|
199
201
|
.innerJoin('eth_school_profile', 'school', 'school.id = urm.level_id')
|
|
200
202
|
.innerJoin('cr_organization', 'brand', 'brand.id = school.brand_id')
|
|
203
|
+
.innerJoin('eth_address', 'address', 'address.parent_id = school.id')
|
|
201
204
|
.where('urm.user_id = :userId', { userId })
|
|
202
205
|
.andWhere('urm.appcode = :appCode', { appCode })
|
|
203
206
|
.andWhere('urm.level_type = :levelType', { levelType: 'SCH' })
|
|
207
|
+
.distinct(true)
|
|
204
208
|
.getRawMany();
|
|
205
209
|
const allMappings = [...brnMappings, ...schMappings];
|
|
206
210
|
const result = {};
|
|
@@ -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;AAClF,uEAA+D;AAGxD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,cAAc,CAAC,KAAa;QAChC,OAAO,MAAM,IAAI,CAAC,UAAU;aACzB,kBAAkB,EAAE;aACpB,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;aACb,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC;aACjC,KAAK,CAAC,8BAA8B,EAAE,EAAE,KAAK,EAAE,CAAC;aAChD,UAAU,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAAa;QAClC,OAAO,MAAM,IAAI,CAAC,UAAU;aACzB,kBAAkB,EAAE;aACpB,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;aACb,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC;aACjC,KAAK,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,CAAC;aACzC,UAAU,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,MAAc,EAAE,OAAe,EAAE,MAAM;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,0CAAe,CAAC,CAAC;QAEpE,MAAM,YAAY,GAAG,MAAM,YAAY;aACpC,kBAAkB,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;aAC/C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;aAC7D,UAAU,EAAE,CAAC;QAEhB,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAE1C,IAAI,kBAAkB,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC;QACvD,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,IAAI,CAAC,EAAE,CAAC;YACvC,kBAAkB,GAAG,MAAM,CAAC;QAC9B,CAAC;QAED,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,UAAU;aACjD,kBAAkB,EAAE;aACpB,MAAM,CAAC,GAAG,CAAC;aACX,IAAI,CAAC,sBAAsB,EAAE,KAAK,CAAC;aACnC,KAAK,CAAC,mDAAmD,EAAE;YAC1D,IAAI,EAAE,iCAAe;YACrB,KAAK,EAAE,MAAM;SACd,CAAC;aACD,SAAS,EAAE,CAAC;QAEf,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;iBAClC,kBAAkB,EAAE;iBACpB,MAAM,CAAC;gBACN,kBAAkB;gBAClB,sBAAsB;gBACtB,4BAA4B;gBAC5B,0BAA0B;gBAE1B,oBAAoB;gBACpB,kCAAkC;gBAClC,sCAAsC;gBAEtC,wBAAwB;gBACxB,4BAA4B;gBAC5B,
|
|
1
|
+
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
|