Skip to content

fix(PM-1650): Added sorting to copilot requests API #850

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

Merged
merged 4 commits into from
Aug 20, 2025
Merged

fix(PM-1650): Added sorting to copilot requests API #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8343b9
fix: added sorting functionality
hentrymartin Aug 19, 2025
dea96ef
fix: added sorting functionality
hentrymartin Aug 19, 2025
8989bbe
fix: added sorting functionality
hentrymartin Aug 19, 2025
07e16d1
fix: sorting
hentrymartin Aug 19, 2025
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ workflows:
context : org-global
filters:
branches:
only: ['develop', 'migration-setup', 'pm-1611']
only: ['develop', 'migration-setup', 'pm-1650_1']
- deployProd:
context : org-global
filters:
Expand Down
33 changes: 30 additions & 3 deletions src/routes/copilotRequest/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,38 @@ module.exports = [
if (sort.indexOf(' ') === -1) {
sort += ' asc';
}
const sortableProps = ['createdAt asc', 'createdAt desc'];
const sortableProps = [
'createdAt asc',
'createdAt desc',
'projectName asc',
'projectName desc',
'opportunityTitle asc',
'opportunityTitle desc',
'projectType asc',
'projectType desc',
'status asc',
'status desc',
];
if (_.indexOf(sortableProps, sort) < 0) {
return util.handleError('Invalid sort criteria', null, req, next);
}
const sortParams = sort.split(' ');
let sortParams = sort.split(' ');
let order = [[sortParams[0], sortParams[1]]];
const relationBasedSortParams = ['projectName'];
const jsonBasedSortParams = ['opportunityTitle', 'projectType'];
if (relationBasedSortParams.includes(sortParams[0])) {
order = [
[{model: models.Project, as: 'project'}, 'name', sortParams[1]],
['id', 'DESC']
]
}

if (jsonBasedSortParams.includes(sortParams[0])) {
order = [
[models.sequelize.literal(`("CopilotRequest"."data"->>'${sortParams[0]}')`), sortParams[1]],
['id', 'DESC'],
]
}

const whereCondition = projectId ? { projectId } : {};

Expand All @@ -41,7 +68,7 @@ module.exports = [
{ model: models.CopilotOpportunity, as: 'copilotOpportunity', required: false },
{ model: models.Project, as: 'project', required: false },
],
order: [[sortParams[0], sortParams[1]]],
order,
limit: pageSize,
offset,
distinct: true,
Expand Down