merge main

.github/workflows/bookkeeping.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Copy coverage from container
         run: docker cp $(docker ps -aqlf "name=bookkeeping_application"):/usr/src/app/coverage/coverage-final.json .
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
 
   linter:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.79.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%400.79.0)
+* Notable changes for users:
+  * A log template for on-call has been created
+  * Improved formatting of on-call logs
+
 ## [0.78.1](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%400.78.1)
 * Notable change for developers:
   * All dependencies has been added to the bundle dependencies

lib/application.js

@@ -20,8 +20,8 @@ const { monalisa: monalisaConfig } = ServicesConfig;
 const { handleLostRunsAndEnvironments } = require('./server/services/housekeeping/handleLostRunsAndEnvironments.js');
 const { isInTestMode } = require('./utilities/env-utils.js');
 const { ScheduledProcessesManager } = require('./server/services/ScheduledProcessesManager.js');
-const { MonALISASynchronizer } = require('./server/monalisa-synchronization/MonALISASynchronizer');
-const { createMonALISAClient } = require('./server/monalisa-synchronization/MonALISAClient');
+const { MonAlisaSynchronizer } = require('./server/monalisa-synchronization/MonAlisaSynchronizer');
+const { createMonAlisaClient } = require('./server/monalisa-synchronization/MonAlisaClient');
 
 /**
  * Bookkeeping Application
@@ -56,9 +56,9 @@ class BookkeepingApplication {
             }
 
             if (monalisaConfig.enableSynchronization) {
-                const monALISASynchronizer = await this.createMonALISASynchronizer();
+                const monAlisaSynchronizer = await this.createMonAlisaSynchronizer();
                 this.scheduledProcessesManager.schedule(
-                    () => monALISASynchronizer.synchronizeDataPassesFromMonALISA(),
+                    () => monAlisaSynchronizer.synchronize(),
                     {
                         wait: 10 * 1000,
                         every: monalisaConfig.synchronizationPeriod,
@@ -84,13 +84,14 @@ class BookkeepingApplication {
     }
 
     /**
-     * Instantiate MonALISA synchronizer with global configuration
-     * @return {MonALISASynchronizer} instance
+     * Instantiate MonAlisa synchronizer with global configuration
+     * @return {MonAlisaSynchronizer} instance
      */
-    async createMonALISASynchronizer() {
-        return new MonALISASynchronizer(await createMonALISAClient({
+    async createMonAlisaSynchronizer() {
+        return new MonAlisaSynchronizer(await createMonAlisaClient({
             dataPassesUrl: monalisaConfig.dataPassesUrl,
             dataPassDetailsUrl: monalisaConfig.dataPassDetailsUrl,
+            simulationPassesUrl: monalisaConfig.simulationPassesUrl,
             yearLowerLimit: monalisaConfig.dataPassesYearLowerLimit,
             userCertificatePath: monalisaConfig.userCertificate.path,
             certificatePassphrase: monalisaConfig.userCertificate.passphrase,

lib/config/services.js

@@ -17,6 +17,7 @@ const {
     DATA_PASSES_YEAR_LOWER_LIMIT,
     MONALISA_DATA_PASSES_URL,
     MONALISA_DATA_PASS_DETAILS_URL,
+    MONALISA_SIMULATION_PASSES_URL,
     MONALISA_ENABLE_SYNCHRONIZATION,
     MONALISA_SYNCHRONIZATION_PERIODS,
 } = process.env ?? {};
@@ -49,6 +50,8 @@ exports.services = {
         dataPassesUrl: MONALISA_DATA_PASSES_URL,
         dataPassDetailsUrl: MONALISA_DATA_PASS_DETAILS_URL,
 
+        simulationPassesUrl: MONALISA_SIMULATION_PASSES_URL,
+
         enableSynchronization: MONALISA_ENABLE_SYNCHRONIZATION?.toLowerCase() === 'true',
         synchronizationPeriod: Number(MONALISA_SYNCHRONIZATION_PERIODS) || 3600000, //  1h in milisecond
     },

lib/database/adapters/DataPassAdapter.js

@@ -38,7 +38,8 @@ class DataPassAdapter {
             lastRunNumber,
         } = databaseObject;
 
-        const runsCount = databaseObject.get('runsCount');
+        const { runs } = databaseObject;
+        const runsCount = runs ? runs[0]?.get('count') ?? 0 : null;
 
         return {
             id,

lib/database/adapters/LhcFillAdapter.js

@@ -24,6 +24,11 @@ class LhcFillAdapter {
          */
         this.runAdapter = null;
 
+        /**
+         * @type {LhcFillStatisticsAdapter|null}
+         */
+        this.statisticsAdapter = null;
+
         this.toEntity = this.toEntity.bind(this);
         this.toDatabase = this.toDatabase.bind(this);
     }
@@ -43,8 +48,10 @@ class LhcFillAdapter {
             beamType,
             fillingSchemeName,
             runs: sequelizeRuns,
+            statistics: sequelizeStatistics,
         } = databaseObject;
 
+        const statistics = sequelizeStatistics ? this.statisticsAdapter.toEntity(sequelizeStatistics) : null;
         const runs = (sequelizeRuns || []).map(this.runAdapter.toEntity);
 
         return {
@@ -54,6 +61,7 @@ class LhcFillAdapter {
             stableBeamsDuration,
             beamType,
             fillingSchemeName,
+            statistics,
             runs,
         };
     }

lib/database/adapters/LhcPeriodAdapter.js

@@ -29,7 +29,8 @@ class LhcPeriodAdapter {
      * @param {SequelizeLhcPeriod} databaseObject Object to convert.
      * @returns {LhcPeriod} Converted entity object.
      */
-    toEntity({ id, name }) {
+    toEntity(databaseObject) {
+        const { id, name } = databaseObject;
         return { id, name };
     }
 

lib/database/adapters/LhcPeriodStatisticsAdapter.js

@@ -31,20 +31,21 @@ class LhcPeriodStatisticsAdapter {
      */
     toEntity(databaseObject) {
         const { id, avgCenterOfMassEnergy, lhcPeriod } = databaseObject;
-        const distinctEnergies = databaseObject.get('distinctEnergies');
-        const beamType = databaseObject.get('beamType');
-        const dataPassesCount = databaseObject.get('dataPassesCount');
+
         const runsCount = databaseObject.get('runsCount');
-        const entity = {
+        const distinctEnergies = databaseObject.get('distinctEnergies')?.split(',').map((energy) => parseFloat(energy)) || [];
+        const beamTypes = databaseObject.get('beamTypes')?.split(',') || [];
+        const dataPassesCount = databaseObject.get('dataPassesCount');
+
+        return {
             id,
             avgCenterOfMassEnergy,
-            distinctEnergies: distinctEnergies?.split(',').map((energy) => Number(energy)) ?? [],
-            beamType,
-            dataPassesCount,
             runsCount,
+            distinctEnergies,
+            beamTypes,
+            dataPassesCount,
+            lhcPeriod: lhcPeriod ? this.lhcPeriodAdapter.toEntity(lhcPeriod) : null,
         };
-        entity.lhcPeriod = lhcPeriod ? this.lhcPeriodAdapter.toEntity(lhcPeriod) : null;
-        return entity;
     }
 }
 

lib/database/adapters/QualityControlFlagAdapter.js

@@ -21,8 +21,7 @@ class QualityControlFlagAdapter {
     constructor() {
         this.toEntity = this.toEntity.bind(this);
 
-        this.qualityControlFlagReasonAdapter = null;
-        this.qualityControlFlagVerificationAdapter = null;
+        this.qualityControlFlagTypeAdapter = null;
         this.userAdapter = null;
     }
 
@@ -35,36 +34,30 @@ class QualityControlFlagAdapter {
     toEntity(databaseObject) {
         const {
             id,
-            timeStart,
-            timeEnd,
+            from,
+            to,
             comment,
-            provenance,
             createdAt,
-            dataPassId,
             runNumber,
-            detectorId,
-            userId,
+            dplDetectorId,
+            createdById,
             user,
-            flagReasonId,
-            flagReason,
-            verifications,
+            flagTypeId,
+            flagType,
         } = databaseObject;
 
         return {
             id,
-            timeStart: timeStart ? new Date(timeStart).getTime() : null,
-            timeEnd: timeEnd ? new Date(timeEnd).getTime() : null,
+            from: from ? new Date(from).getTime() : null,
+            to: to ? new Date(to).getTime() : null,
             comment: comment ?? null,
-            provenance,
-            createdAt: createdAt ? new Date(createdAt).getTime() : null,
-            dataPassId,
             runNumber,
-            detectorId,
-            userId,
+            dplDetectorId,
+            createdById,
             user: user ? this.userAdapter.toEntity(user) : null,
-            flagReasonId,
-            flagReason: flagReason ? this.qualityControlFlagReasonAdapter.toEntity(flagReason) : null,
-            verifications: verifications?.map(this.qualityControlFlagVerificationAdapter.toEntity) ?? null,
+            flagTypeId,
+            flagType: flagType ? this.qualityControlFlagTypeAdapter.toEntity(flagType) : null,
+            createdAt: createdAt ? new Date(createdAt).getTime() : null,
         };
     }
 }

lib/database/adapters/QualityControlFlagReasonAdapter.js → lib/database/adapters/QualityControlFlagTypeAdapter.js

@@ -12,9 +12,9 @@
  */
 
 /**
- * QualityControlFlagReasonAdapter
+ * QualityControlFlagTypeAdapter
  */
-class QualityControlFlagReasonAdapter {
+class QualityControlFlagTypeAdapter {
     /**
      * Constructor
      */
@@ -25,26 +25,28 @@ class QualityControlFlagReasonAdapter {
     /**
      * Converts the given database object to an entity object.
      *
-     * @param {SequelizeQualityControlFlagReason} databaseObject Object to convert.
-     * @returns {QualityControlFlagReason} Converted entity object.
+     * @param {SequelizeQualityControlFlagType} databaseObject Object to convert.
+     * @returns {QualityControlFlagType} Converted entity object.
      */
     toEntity(databaseObject) {
         const {
             id,
             name,
             method,
             bad,
-            obsolate,
+            archived,
+            archivedAt,
         } = databaseObject;
 
         return {
             id,
             name,
             method,
             bad,
-            obsolate,
+            archived,
+            archivedAt: archivedAt ? new Date(archivedAt).getTime() : null,
         };
     }
 }
 
-module.exports = { QualityControlFlagReasonAdapter };
+module.exports = { QualityControlFlagTypeAdapter };

lib/database/adapters/QualityControlFlagVerificationAdapter.js → lib/database/adapters/SimulationPassAdapter.js

@@ -12,42 +12,50 @@
  */
 
 /**
- * QualityControlFlagVerificationAdapter
+ * SimulationPassAdapter
  */
-class QualityControlFlagVerificationAdapter {
+class SimulationPassAdapter {
     /**
      * Constructor
      */
     constructor() {
         this.toEntity = this.toEntity.bind(this);
-        this.userAdapter = null;
     }
 
     /**
      * Converts the given database object to an entity object.
      *
-     * @param {SequelizeQualityControlFlagVerification} databaseObject Object to convert.
-     * @returns {QualityControlFlagVerification} Converted entity object.
+     * @param {SequelizeSimulationPass} databaseObject Object to convert.
+     * @returns {SimulationPass} Converted entity object.
      */
     toEntity(databaseObject) {
         const {
             id,
-            comment,
-            userId,
-            user,
-            createdAt,
-            qualityControlFlagId,
+            name,
+            jiraId,
+            description,
+            pwg,
+            requestedEventsCount,
+            generatedEventsCount,
+            outputSize,
         } = databaseObject;
 
+        const dataPassesCount = databaseObject.get('dataPassesCount');
+        const runsCount = databaseObject.get('runsCount');
+
         return {
             id,
-            userId,
-            user: user ? this.userAdapter.toEntity(user) : null,
-            comment: comment ?? null,
-            createdAt: createdAt ? new Date(createdAt).getTime() : null,
-            qualityControlFlagId,
+            name,
+            jiraId,
+            description,
+            pwg,
+            requestedEventsCount,
+            generatedEventsCount,
+            outputSize,
+            runsCount,
+            dataPassesCount,
         };
     }
 }
 
-module.exports = { QualityControlFlagVerificationAdapter };
+module.exports = SimulationPassAdapter;

lib/database/adapters/index.js

@@ -38,8 +38,8 @@ const LhcPeriodAdapter = require('./LhcPeriodAdapter');
 const LhcPeriodStatisticsAdapter = require('./LhcPeriodStatisticsAdapter');
 const DataPassAdapter = require('./DataPassAdapter');
 const { QualityControlFlagAdapter } = require('./QualityControlFlagAdapter');
-const { QualityControlFlagReasonAdapter } = require('./QualityControlFlagReasonAdapter');
-const { QualityControlFlagVerificationAdapter } = require('./QualityControlFlagVerificationAdapter');
+const { QualityControlFlagTypeAdapter } = require('./QualityControlFlagTypeAdapter');
+const SimulationPassAdapter = require('./SimulationPassAdapter.js');
 
 const attachmentAdapter = new AttachmentAdapter();
 const detectorAdapter = new DetectorAdapter();
@@ -68,8 +68,8 @@ const lhcPeriodAdapter = new LhcPeriodAdapter();
 const lhcPeriodStatisticsAdapter = new LhcPeriodStatisticsAdapter();
 const dataPassAdapter = new DataPassAdapter();
 const qualityControlFlagAdapter = new QualityControlFlagAdapter();
-const qualityControlFlagReasonAdapter = new QualityControlFlagReasonAdapter();
-const qualityControlFlagVerificationAdapter = new QualityControlFlagVerificationAdapter();
+const qualityControlFlagTypeAdapter = new QualityControlFlagTypeAdapter();
+const simulationPassAdapter = new SimulationPassAdapter();
 
 // Fill dependencies
 dplDetectorAdapter.dplProcessExecutionAdapter = dplProcessExecutionAdapter;
@@ -92,6 +92,7 @@ flpRoleAdapter.runAdapter = runAdapter;
 hostAdapter.dplProcessExecutionAdapter = dplProcessExecutionAdapter;
 
 lhcFillAdapter.runAdapter = runAdapter;
+lhcFillAdapter.statisticsAdapter = lhcFillStatisticsAdapter;
 
 logAdapter.runAdapter = runAdapter;
 logAdapter.attachmentAdapter = attachmentAdapter;
@@ -112,10 +113,7 @@ runAdapter.lhcPeriodAdapter = lhcPeriodAdapter;
 lhcPeriodStatisticsAdapter.lhcPeriodAdapter = lhcPeriodAdapter;
 
 qualityControlFlagAdapter.userAdapter = userAdapter;
-qualityControlFlagAdapter.qualityControlFlagReasonAdapter = qualityControlFlagReasonAdapter;
-qualityControlFlagAdapter.qualityControlFlagVerificationAdapter = qualityControlFlagVerificationAdapter;
-
-qualityControlFlagVerificationAdapter.userAdapter = userAdapter;
+qualityControlFlagAdapter.qualityControlFlagTypeAdapter = qualityControlFlagTypeAdapter;
 
 module.exports = {
     attachmentAdapter,
@@ -145,6 +143,6 @@ module.exports = {
     lhcPeriodStatisticsAdapter,
     dataPassAdapter,
     qualityControlFlagAdapter,
-    qualityControlFlagReasonAdapter,
-    qualityControlFlagVerificationAdapter,
+    qualityControlFlagTypeAdapter,
+    simulationPassAdapter,
 };