Merge branch 'main' into dependabot/npm_and_yarn/aliceo2/web-ui-2.10.0

Author: graduta

.github/CODEOWNERS

@@ -1 +1,2 @@
 * @graduta
+* @isaachilly

.github/workflows/bookkeeping.yml

@@ -10,6 +10,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   parallel_tests:
     name: ${{ matrix.test_type }}

.github/workflows/docker.yml

@@ -9,6 +9,10 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   linter:
     runs-on: ubuntu-latest

lib/server/controllers/lhcPeriodStatistics.controller.js

@@ -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,

lib/server/services/lhcPeriod/LhcPeriodStatisticsService.js

@@ -21,6 +21,12 @@ const { NotFoundError } = require('../../errors/NotFoundError');
 const { RunDefinition } = require('../../../domain/enums/RunDefinition.js');
 const { NonPhysicsProductionsNamesWords } = require('../../../domain/enums/NonPhysicsProductionsNamesWords.js');
 
+const sortExpressionMap = {
+    name: (sequelize) => sequelize.col('`lhcPeriod`.`name`'),
+    year: (sequelize) => sequelize.literal('SUBSTRING(lhcPeriod.name, 4, 2)'),
+    pdpBeamTypes: (sequelize) => sequelize.literal('pdpBeamTypes'),
+};
+
 /**
  * @typedef LhcPeriodIdentifier object to uniquely identify a lhc period
  * @property {string} [name] the lhc period name
@@ -85,22 +91,9 @@ class LhcPeriodStatisticsService {
         sort,
     } = {}) {
         const queryBuilder = this.prepareQueryBuilder();
-
         if (sort) {
             for (const property in sort) {
-                let expression;
-                switch (property) {
-                    case 'name':
-                        expression = (sequelize) => sequelize.col('`lhcPeriod`.`name`');
-                        break;
-                    case 'year':
-                        expression = (sequelize) => sequelize.literal('SUBSTRING(lhcPeriod.name, 4, 2)');
-                        break;
-                    case 'pdpBeamTypes':
-                        expression = (sequelize) => sequelize.literal('pdpBeamTypes');
-                        break;
-                }
-
+                const expression = sortExpressionMap[property];
                 queryBuilder.orderBy(expression ?? property, sort[property]);
             }
         }

package-lock.json

@@ -39,7 +39,7 @@
     "mkdirp": "3.0.1",
     "multer": "2.1.1",
     "node-fetch": "3.3.1",
-    "protobufjs": "8.0.1",
+    "protobufjs": "8.0.2",
     "sequelize": "6.37.8",
     "umzug": "3.8.2"
   },