Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/v1.6.2 #160

Merged
merged 2 commits into from
Mar 19, 2024
Merged

Release/v1.6.2 #160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96d3c5f
Release/v1.6.2
shaunlumbcgov Mar 19, 2024
f9ab319
updated nonBCDistrictList
shaunlumbcgov Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions backend/src/routes/institute-router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,14 @@ async function createCache(req, res) {
axios
.get(url, { headers: { Authorization: `Bearer ${req.accessToken}` } })
.then((response) => {
//const districtList = response.data;
const filteredNonbBCDistrictList = response.data.filter(district => ["098","102", "103"].includes(district.districtNumber));
const filteredDistrictList = response.data.filter(district => !["098","102", "103"].includes(district.districtNumber));
const districtList = createList(filteredDistrictList, districtListOptions);

const nonBCdistrictList = createList(filteredNonbBCDistrictList, districtListOptions);

listCache.set("nonbcdistrictlist", nonBCdistrictList);
listCache.set("districtlist", districtList);
res.json(districtList);
log.info(req.url);
})
.catch((e) => {
Expand Down Expand Up @@ -511,9 +514,11 @@ async function getDistrictList(req, res) {
.get(url, { headers: { Authorization: `Bearer ${req.accessToken}` } })
.then((response) => {
//const districtList = response.data;
const filteredNonbBCDistrictList = response.data.filter(district => ["098","102", "103"].includes(district.districtNumber));
const filteredDistrictList = response.data.filter(district => !["098","102", "103"].includes(district.districtNumber));
const districtList = createList(filteredDistrictList, districtListOptions);

const nonBCdistrictList = createList(filteredNonbBCDistrictList, districtListOptions);
listCache.set("nonbcdistrictlist", nonBCdistrictList);
listCache.set("districtlist", districtList);
res.json(districtList);
log.info(req.url);
Expand Down Expand Up @@ -547,14 +552,16 @@ async function getDistrictContactsAPI(req, res) {
const url = `${config.get("server:instituteAPIURL")}/institute` + req.url;

const districtList = await listCache.get("districtlist");

const nonBCDistrictList = await listCache.get("nonbcdistrictlist");
axios
.get(url, { headers: { Authorization: `Bearer ${req.accessToken}` } })
.then((response) => {
if (req.url.includes("/district/contact/paginated")) {
const jsonData = addDistrictLabels(response.data, districtList);

jsonData.content = jsonData.content.filter(contact => !["8e34ab4d-f387-220b-b54e-2c9a7f380f85","1f93fe68-2d80-fea5-88ba-a684dfa4cc27", "99c19236-5d01-2dff-db90-e2da4511c00c"].includes(contact.districtId));
let nonBCDistrictIds = nonBCDistrictList.map(district => district.districtId);
nonBCDistrictIds.push("8e34ab4d-f387-220b-b54e-2c9a7f380f85");
jsonData.content = jsonData.content.filter(contact => !nonBCDistrictIds.includes(contact.districtId));

res.json(jsonData);
} else {
res.json(response.data);
Expand Down
Loading