Fix runservice incorrect passing of transaction

Author: graduta

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 });
     }