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

fixed closed schools #101

Merged
merged 1 commit into from
Nov 16, 2023
Merged

fixed closed schools #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 32 additions & 5 deletions backend/src/routes/institute-router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ const { checkToken } = require("../components/auth");
const {removeFieldsByCriteria, createList, addDistrictLabels, districtNumberSort, isAllowedSchoolCategory } = require("../components/utils");
const { listCache, codeCache } = require("../components/cache");

const schoolListOptions = { fields: ["mincode", "displayName", "schoolId"], fieldToInclude: "closedDate", valueToInclude: null, sortField: "mincode" };
const districtListOptions = { fields: ["displayName", "districtId","districtNumber"] ,fieldToInclude: "districtStatusCode", valueToInclude: "ACTIVE", sortField: "districtNumber"};
const authorityListOptions = { fields: ["displayName", "authorityNumber","independentAuthorityId"], fieldToInclude: "closedDate", valueToInclude: null, sortField: "authorityNumber" };
const schoolListOptions = { fields: ["mincode", "displayName", "schoolId, closedDate"], fieldToInclude: "closedDate", valueToInclude: null, sortField: "mincode" };
const districtListOptions = { fields: ["displayName", "districtId","districtNumber, closedDate"] ,fieldToInclude: "districtStatusCode", valueToInclude: "ACTIVE", sortField: "districtNumber"};
const authorityListOptions = { fields: ["displayName", "authorityNumber","independentAuthorityId", "closedDate"], sortField: "authorityNumber" };
const openSchoolListOptions = { fields: [
"schoolId",
"districtId",
Expand Down Expand Up @@ -114,11 +114,38 @@ async function getOffshoreSchoolList(req, res) {
async function getAuthorityList(req, res) {

if (await !listCache.has("authoritylist")) {
const url = `${config.get("server:instituteAPIURL")}/institute/authority`;

let currentDate = new Date().toISOString().substring(0, 19)
const params = [
{
condition: null,
searchCriteriaList: [
{
key: 'closedDate',
operation: 'eq',
value: null,
valueType: 'STRING',
condition: 'OR'
},
{
key: 'closedDate',
operation: 'lte',
value: currentDate,
valueType: 'DATE_TIME',
condition: 'OR'
}
]
}
];

const jsonString = JSON.stringify(params)
const encodedParams = encodeURIComponent(jsonString)

const url = `${config.get('server:instituteAPIURL')}/institute/authority/paginated?pageSize=1000&searchCriteriaList=${encodedParams}`;
axios
.get(url, { headers: { Authorization: `Bearer ${req.accessToken}` } })
.then((response) => {
const authorityList = createList(response.data, authorityListOptions);
const authorityList = createList(response.data.content, authorityListOptions);

res.json(authorityList);
listCache.set("authoritylist", authorityList);
Expand Down
Loading