Merge branch 'main' into dependabot/github_actions/actions/setup-node-6

graduta · web-flow · commit d779e6f3d367 · 2025-11-12T14:45:55.000+01:00
diff --git a/lib/domain/enums/StatusAcronyms.js b/lib/domain/enums/StatusAcronyms.js
@@ -12,6 +12,7 @@
  */
 
 const statusAcronyms = Object.freeze({
+    PENDING: 'P',
     STANDBY: 'S',
     DEPLOYED: 'D',
     CONFIGURED: 'C',
diff --git a/lib/public/views/Runs/Details/runDetailsComponent.js b/lib/public/views/Runs/Details/runDetailsComponent.js
@@ -518,7 +518,7 @@ export const runDetailsComponent = (runDetailsModel, router) => runDetailsModel.
                                                     formatFloat(run.phaseShiftAtStartBeam2) ?? '-',
                                                     h('strong', ' | '),
                                                     h('small', 'end: '),
-                                                    formatFloat(run.phaseShiftAtEndBea21) ?? '-',
+                                                    formatFloat(run.phaseShiftAtEndBeam2) ?? '-',
                                                 ]),
                                             ]),
                                         ]),
diff --git a/lib/server/kafka/AliEcsSynchronizer.js b/lib/server/kafka/AliEcsSynchronizer.js
@@ -85,12 +85,24 @@ class AliEcsSynchronizer {
             }
 
             if (transition === 'STOP_ACTIVITY' || transition === 'GO_ERROR') {
+                const eorReasons = [];
+                if (userName === 'LHC') {
+                    this._logger.infoMessage(`Run ${runNumber} stopped by LHC user, adding adequate EOR reason`);
+                    eorReasons.push({
+                        category: 'LHC',
+                        title: 'Dump',
+                        description: 'Run stopped due to LHC dump',
+                    });
+                }
                 runService
                     .createOrUpdate(
                         runNumber,
                         environmentId,
                         { timeO2End: timestamp.toNumber() },
-                        { userO2Stop: { userIdentifier: { externalUserId }, name: userName } },
+                        {
+                            userO2Stop: { userIdentifier: { externalUserId }, name: userName },
+                            eorReasons,
+                        },
                     )
                     .catch((error) => this._logger.errorMessage(`Failed to save run end for ${runNumber}: ${error.message}`));
             }
diff --git a/lib/server/services/run/RunService.js b/lib/server/services/run/RunService.js
@@ -212,27 +212,28 @@ class RunService {
     }
 
     /**
-     * Get or create a run by its run number, using environment info if it applies
+     * Create or Update a run by its run number, using environment info if it applies
      *
      * @param {number} runNumber the run number of the run to create
      * @param {string} environmentId the id of the environment containing the run
      * @param {Partial<Run>} [partialRun] optional runs properties to define
      * @param {Object} [relations] run relations to create/update
      * @param {GetOrCreateUserPayload} [relations.userO2Start] if not null, the identifier of the user that started the run
      * @param {GetOrCreateUserPayload} [relations.userO2Stop] if not null, the identifier of the user that stopped the run
+     * @param {EorReason[]} [relations.eorReasons] if not null, the list of end of run reasons to apply to the run (will replace existing ones)
      * @return {Promise<Run>} resolves with the run
      */
     createOrUpdate(runNumber, environmentId, partialRun, relations) {
-        return dataSource.transaction(async () => {
-            // If the given environment do not exist we consider that it should not be stored in database, and same for the runs related to it
+        return dataSource.transaction(async (transaction) => {
+            // If given environment does not exist we should not store the run in database
             if (!await getEnvironment(environmentId)) {
                 return;
             }
 
             const existingRun = await getRun({ runNumber });
 
             if (existingRun) {
-                await this.update({ runNumber }, { runPatch: partialRun, relations });
+                return await this.update({ runNumber }, { runPatch: partialRun, relations }, transaction);
             } else {
                 const { rawConfiguration } = await getEnvironmentOrFail(environmentId);
 
@@ -274,9 +275,11 @@ class RunService {
      * @param {string|null} [relations.lhcPeriodName=null] if not null, the name of lhc period for which the run should be assigned
      * @param {GetOrCreateUserPayload|null} [relations.userO2Start=null] if not null, the identifier of the user that started the run
      * @param {GetOrCreateUserPayload|null} [relations.userO2Stop=null] if not null, the identifier of the user that stopped the run
+     * @param {string[]} [relations.flpRoles] if present, the list of flp roles to create alongside the run
+     * @param {Object} [transaction] optional transaction where the creation must be done
      * @return {Promise<Run>} resolve with the created run instance
      */
-    async create(newRun, relations) {
+    async create(newRun, relations, transaction) {
         const { runTypeName = null, lhcPeriodName = null, userO2Start = null, userO2Stop = null, flpRoles } = relations || {};
 
         return dataSource.transaction(async () => {
@@ -311,7 +314,7 @@ class RunService {
             }
 
             return this.get({ runId }, { runType: true, detectors: true, lhcPeriod: true, flpRoles });
-        });
+        }, { transaction });
     }
 
     /**
@@ -336,9 +339,10 @@ class RunService {
      * @param {GetOrCreateUserPayload|null} [payload.relations.userO2Start=null] if not null, the identifier of the user that started the run
      * @param {GetOrCreateUserPayload|null} [payload.relations.userO2Stop=null] if not null, the identifier of the user that stopped the run
      * @param {string} [payload.relations.lhcPeriodName] if not null, the name of lhc period for which the run should be assigned
+     * @param {Object} [transaction] optional transaction where the update must be done
      * @return {Promise<Run>} resolve with the resulting run
      */
-    async update(identifier, payload) {
+    async update(identifier, payload, transaction) {
         const { runPatch = {}, relations = {}, metadata = {} } = payload;
         const {
             tagsTexts = null, eorReasons = null, runTypeName = null,
@@ -405,7 +409,7 @@ class RunService {
 
                 await logRunDetectorQualityChange(run.runNumber, updatedRunDetectors, transaction, user, detectorsQualitiesChangeReason);
             }
-        });
+        }, { transaction });
 
         return this.get(identifier, { tags: true, runType: true, detectors: true, eorReasons: true, lhcPeriod: true });
     }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aliceo2/bookkeeping",
-  "version": "1.13.1",
+  "version": "1.14.0",
   "author": "ALICEO2",
   "scripts": {
     "coverage": "nyc npm test && npm run coverage:report",
@@ -45,14 +45,14 @@
     "proto/"
   ],
   "devDependencies": {
-    "@eslint/js": "^9.38.0",
+    "@eslint/js": "^9.39.1",
     "@stylistic/eslint-plugin-js": "^4.4.1",
     "@types/d3": "7.4.0",
     "chai": "4.5.0",
     "date-and-time": "3.6.0",
     "eslint": "^9.36.0",
     "eslint-plugin-jsdoc": "^61.1.9",
-    "globals": "^16.4.0",
+    "globals": "^16.5.0",
     "js-yaml": "4.1.0",
     "mocha": "11.7.0",
     "nodemon": "3.1.3",
diff --git a/test/lib/server/services/run/RunService.test.js b/test/lib/server/services/run/RunService.test.js
@@ -359,7 +359,7 @@ module.exports = () => {
 
         const run = await runService.update(
             { runNumber },
-            { relations: { eorReasons: eorReasons } },
+            { relations: { eorReasons } },
         );
 
         expect(run.eorReasons).to.lengthOf(2);
@@ -391,7 +391,7 @@ module.exports = () => {
 
         const run = await runService.update(
             { runNumber },
-            { relations: { eorReasons: eorReasons } },
+            { relations: { eorReasons } },
         );
 
         expect(run.eorReasons).to.lengthOf(2);
@@ -431,7 +431,7 @@ module.exports = () => {
 
         const run = await runService.update(
             { runNumber },
-            { relations: { eorReasons: eorReasons } },
+            { relations: { eorReasons } },
         );
 
         // Should only include the valid ones without throwing for invalid one (is simply excluded)
@@ -453,7 +453,7 @@ module.exports = () => {
 
         const run = await runService.update(
             { runNumber },
-            { relations: { eorReasons: eorReasons } },
+            { relations: { eorReasons } },
         );
 
         expect(run.eorReasons).to.lengthOf(0);
@@ -485,7 +485,7 @@ module.exports = () => {
 
         const run = await runService.update(
             { runNumber },
-            { relations: { eorReasons: eorReasons } },
+            { relations: { eorReasons } },
         );
 
         // EorReasons should only include the one that does not have an id
@@ -733,4 +733,26 @@ module.exports = () => {
         expect(run.userIdO2Stop).to.equal(2);
         expect(run.flpRoles.map(({ name }) => name)).to.deep.equal(['fake-flp1', 'fake-flp2', 'fake-ctp-host']);
     });
+
+    it('should successfully update a run with provided EOR reasons via the createOrUpdate', async () => {
+        const run = await runService.createOrUpdate(
+            1234,
+            'CmCvjNbg',
+            {  },
+            {
+                eorReasons: [
+                    {
+                        category: 'DETECTORS',
+                        title: 'TPC',
+                        description: 'Run stopped due to LHC dump',
+                    },
+                ],
+            },
+        );
+        // console.log(run);
+        expect(run.eorReasons).to.have.lengthOf(1);
+        expect(run.eorReasons[0].category).to.equal('DETECTORS');
+        expect(run.eorReasons[0].title).to.equal('TPC');
+        expect(run.eorReasons[0].description).to.equal('Run stopped due to LHC dump');
+    });
 };
