Skip to content

[O2B-1583] Sort lhc period overview page by id and not name #2151

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

Open
graduta wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

[O2B-1583] Sort lhc period overview page by id and not name #2151

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion lib/server/controllers/lhcPeriodStatistics.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const listLhcPeriodStatisticsHandler = async (req, res) => {
);
if (validatedDTO) {
try {
const { filter, page: { limit = ApiConfig.pagination.limit, offset } = {}, sort = { name: 'DESC' } } = validatedDTO.query;
const { filter, page: { limit = ApiConfig.pagination.limit, offset } = {}, sort = { id: 'DESC' } } = validatedDTO.query;
const { count, rows: items } = await lhcPeriodStatisticsService.getAllForPhysicsRuns({
filter,
limit,
Expand Down
4 changes: 3 additions & 1 deletion lib/server/services/lhcPeriod/LhcPeriodStatisticsService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@ class LhcPeriodStatisticsService {
sort,
} = {}) {
const queryBuilder = this.prepareQueryBuilder();

if (sort) {
for (const property in sort) {
let expression;
Copy link
Copy Markdown
Collaborator

@NarrowsProjects NarrowsProjects May 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that all the current expressions are hardcoded (and presumably all future expressions too), I'd argue that you could safely replace the switch statement with a lookup table where you pass the result to a sequelize.literal() function call.

        const expressionMap = {
            id: '`lhcPeriod`.`id`',
            name: '`lhcPeriod`.`name`',
            year: 'SUBSTRING(lhcPeriod.name, 4, 2)',
            pdpBeamTypes: 'pdpBeamTypes',
        };

        if (sort) {
            for (const property in sort) {
                let expression;

                if (property in expressionMap) {
                    expression = (sequelize) => sequelize.literal(expressionMap[property]);
                }

                queryBuilder.orderBy(expression ?? property, sort[property]);
            }
        }

switch (property) {
case 'id':
expression = (sequelize) => sequelize.col('`lhcPeriod`.`id`');;
break;
case 'name':
expression = (sequelize) => sequelize.col('`lhcPeriod`.`name`');
break;
Expand Down
Loading