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

[EPICSYSTEM-23] Pcp feed, add dateUpdated filter to search #741

Merged
merged 1 commit into from
Mar 7, 2024
Merged

[EPICSYSTEM-23] Pcp feed, add dateUpdated filter to search #741

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
72 changes: 43 additions & 29 deletions api/helpers/aggregators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,38 +261,48 @@ const generateExpArray = async (field, roles, schemaName) => {
}

switch (item) {
case 'decisionDateStart':
for(let field of fields) {
handleDateStartItem(orArray, field, decodeURIComponent(entry));
}
break;
case 'decisionDateEnd':
for(let field of fields) {
handleDateEndItem(orArray, field, decodeURIComponent(entry));
}
break;
case 'dateAddedStart':
handleDateStartItem(orArray, ['dateAdded'], decodeURIComponent(entry));
break;
case 'dateAddedEnd':
handleDateEndItem(orArray, ['dateAdded'], decodeURIComponent(entry));
break;
case 'datePostedStart':
handleDateStartItem(orArray, ['datePosted'], decodeURIComponent(entry));
break;
case 'datePostedEnd':
handleDateEndItem(orArray, ['datePosted'], decodeURIComponent(entry));
break;
default:
if (schemaName === constants.PROJECT) {
for(let field of fields) {
orArray.push(getConvertedValue(field, decodeURIComponent(entry)));
case 'dateUpdatedStart':
for (let field of fields) {
handleDateStartItem(orArray, field, decodeURIComponent(entry));
}
break;
} else {
orArray.push(getConvertedValue(fields[0], decodeURIComponent(entry)));
case 'dateUpdatedEnd':
for (let field of fields) {
handleDateEndItem(orArray, field, decodeURIComponent(entry));
}
break;
}
case 'decisionDateStart':
for (let field of fields) {
handleDateStartItem(orArray, field, decodeURIComponent(entry));
}
break;
case 'decisionDateEnd':
for (let field of fields) {
handleDateEndItem(orArray, field, decodeURIComponent(entry));
}
break;
case 'dateAddedStart':
handleDateStartItem(orArray, ['dateAdded'], decodeURIComponent(entry));
break;
case 'dateAddedEnd':
handleDateEndItem(orArray, ['dateAdded'], decodeURIComponent(entry));
break;
case 'datePostedStart':
handleDateStartItem(orArray, ['datePosted'], decodeURIComponent(entry));
break;
case 'datePostedEnd':
handleDateEndItem(orArray, ['datePosted'], decodeURIComponent(entry));
break;
default:
if (schemaName === constants.PROJECT) {
for (let field of fields) {
orArray.push(getConvertedValue(field, decodeURIComponent(entry)));
}
break;
} else {
orArray.push(getConvertedValue(fields[0], decodeURIComponent(entry)));
break;
}
}

expArray.push({ $or: orArray });
Expand All @@ -317,6 +327,10 @@ const handleProjectTerms = (item) => {
item = 'decisionDate';
}

if (item === 'dateUpdatedStart' || item === 'dateUpdatedEnd') {
item = 'dateUpdated';
}

// prepend for embedded fields
let legislations = ['legislation_1996', 'legislation_2002', 'legislation_2018'];
for (let legis of legislations) {
Expand Down
Loading