Merge pull request #129 from bcgov/filterschoollist

added schoolcategory codes and facility type lavbels to schools
bcgov · Nov 24, 2023 · ad041a5 · ad041a5
2 parents 70e064a + ae53d09
commit ad041a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/backend/src/routes/district-router.js b/backend/src/routes/district-router.js
@@ -314,9 +314,12 @@ async function getDistrict(req, res) {
     });
 
     const contactTypeCodes = await getDistrictCodes(req);
+    const schoolCategoryCodes = await listCache.get("categoryCodes")
+    const facilityCodes = await listCache.get("facilityCodes")
     const districtContactCodeTypes = await listCache.get("codesList")
     const nonPublicContactTypeCodes = getNonPublicContactTypeCodes(contactTypeCodes);
 
+
     const districtDataPublic = removeContacts(
       districtDataResponse.data,
       nonPublicContactTypeCodes
@@ -328,8 +331,10 @@ async function getDistrict(req, res) {
     districtDataPublicWithLabels.contacts = filterByPubliclyAvailableCodes(districtDataPublicWithLabels.contacts,"districtContactTypeCode",getArrayofPubliclyAvailableCodes(districtContactCodeTypes.codesList.districtContactTypeCodes, "districtContactTypeCode"))
     districtDataPublicWithLabels.contacts = filterByExpiryDate(districtDataPublicWithLabels.contacts)
 
-
-
+
+    districtSchoolsResponse.data.content = normalizeJsonObject(districtSchoolsResponse.data.content, schoolCategoryCodes, "schoolCategoryCode",  null, ["label", "description"]);
+    districtSchoolsResponse.data.content = normalizeJsonObject(districtSchoolsResponse.data.content, facilityCodes, "faciltyTypeCode",  null, ["label", "description"]);
+
     const districtJSON = {
       districtData: districtDataPublicWithLabels,
       districtSchools: districtSchoolsResponse.data.content,

diff --git a/backend/src/routes/institute-router.js b/backend/src/routes/institute-router.js
@@ -394,7 +394,6 @@ async function getCategoryCodes(req, res) {
 }
 async function getSchoolList(req, res) {
   if (await !listCache.has("schoollist")) {
-    console.log("NEW LIST")
     const url = `${config.get("server:instituteAPIURL")}/institute/school`; // Update the URL according to your API endpoint
     axios
       .get(url, { headers: { Authorization: `Bearer ${req.accessToken}` } })