Skip to content

Commit

Permalink
[EPICSYSTEM-23] Pcp feed, add dateUpdated filter to search
Browse files Browse the repository at this point in the history
  • Loading branch information
tolkamps1 committed Mar 6, 2024
1 parent 8917ab9 commit 178665e
Showing 1 changed file with 43 additions and 29 deletions.
72 changes: 43 additions & 29 deletions api/helpers/aggregators.js
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

0 comments on commit 178665e

Please sign in to comment.