Merge remote-tracking branch 'origin/main' into bug/fhattinf/O2B-1139…

…/Refreshtagslistwhenatagisupdated/created
AliceO2Group · Dec 3, 2024 · 529cfcd · 529cfcd
2 parents 1663b76 + 8ce02ce
commit 529cfcd
Show file tree

Hide file tree

Showing 10 changed files with 345 additions and 133 deletions.
diff --git a/.github/workflows/bookkeeping.yml b/.github/workflows/bookkeeping.yml
@@ -67,9 +67,9 @@ jobs:
         env:
           TEST_TYPE: ${{ matrix.test_type }}
       - name: Upload Coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
-          file: ./coverage/lcov.info
+          files: ./coverage/lcov.info
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
           TEST_TYPE: ${{ matrix.test_type }}

diff --git a/lib/database/migrations/20241105090940-store-run-and-qcflags-timestamps-in-ms.js b/lib/database/migrations/20241105090940-store-run-and-qcflags-timestamps-in-ms.js
@@ -0,0 +1,266 @@
+'use strict';
+
+const TIME_START_END_TO_DATETIME_3 = `
+    ALTER TABLE runs
+        CHANGE COLUMN time_start time_start DATETIME(3) AS (COALESCE(time_trg_start, time_trg_end)) VIRTUAL,
+        CHANGE COLUMN time_end time_end DATETIME(3) AS (COALESCE(time_trg_end, time_o2_end)) VIRTUAL;
+`;
+
+const TIME_START_END_TO_DATETIME = `
+    ALTER TABLE runs
+        CHANGE COLUMN time_start time_start DATETIME AS (COALESCE(time_trg_start, time_trg_end)) VIRTUAL,
+        CHANGE COLUMN time_end time_end DATETIME AS (COALESCE(time_trg_end, time_o2_end)) VIRTUAL;
+`;
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+    up: async (queryInterface, Sequelize) => queryInterface.sequelize.transaction(async (transaction) => {
+        await queryInterface.changeColumn(
+            'runs',
+            'time_o2_start',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'time_trg_start',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'first_tf_timestamp',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'last_tf_timestamp',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'time_trg_end',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'time_o2_end',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flags',
+            'from',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flags',
+            'to',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flags',
+            'created_at',
+            {
+                type: Sequelize.DATE(3),
+                allowNull: false,
+                defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flags',
+            'updated_at',
+            {
+                type: Sequelize.DATE(3),
+                allowNull: false,
+                defaultValue: Sequelize.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flag_effective_periods',
+            'from',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flag_effective_periods',
+            'to',
+            {
+                type: Sequelize.DATE(3),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flag_effective_periods',
+            'created_at',
+            {
+                type: Sequelize.DATE(3),
+                allowNull: false,
+                defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flag_effective_periods',
+            'updated_at',
+            {
+                type: Sequelize.DATE(3),
+                allowNull: false,
+                defaultValue: Sequelize.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
+            },
+            { transaction },
+        );
+
+        await queryInterface.sequelize.query(TIME_START_END_TO_DATETIME_3, { transaction });
+    }),
+
+    down: async (queryInterface, Sequelize) => queryInterface.sequelize.transaction(async (transaction) => {
+        await queryInterface.changeColumn(
+            'runs',
+            'time_o2_start',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'time_trg_start',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'first_tf_timestamp',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'last_tf_timestamp',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'time_trg_end',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'runs',
+            'time_o2_end',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flags',
+            'from',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flags',
+            'to',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flags',
+            'created_at',
+            {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flags',
+            'updated_at',
+            {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flag_effective_periods',
+            'from',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flag_effective_periods',
+            'to',
+            {
+                type: Sequelize.DATE,
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flag_effective_periods',
+            'created_at',
+            {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
+            },
+            { transaction },
+        );
+        await queryInterface.changeColumn(
+            'quality_control_flag_effective_periods',
+            'updated_at',
+            {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
+            },
+            { transaction },
+        );
+
+        await queryInterface.sequelize.query(TIME_START_END_TO_DATETIME, { transaction });
+    }),
+};
diff --git a/lib/database/repositories/EnvironmentHistoryItemRepository.js b/lib/database/repositories/EnvironmentHistoryItemRepository.js
@@ -29,8 +29,8 @@ const getHistoryDistributionQuery = ({ from, to }) => `
         FROM environments e
         INNER JOIN environments_history_items AS ehi 
         ON e.id = ehi.environment_id
-    	WHERE e.updated_at >= '${timestampToMysql(from)}'
-    	AND e.created_at < '${timestampToMysql(to)}'
+    	WHERE e.updated_at >= '${timestampToMysql(from, true)}'
+    	AND e.created_at < '${timestampToMysql(to, true)}'
         GROUP BY e.id
         HAVING FIND_IN_SET('DESTROYED', statusHistory) > 0 OR FIND_IN_SET('ERROR', statusHistory) > 0
     ) AS statusHistoryByEnvironmentId

diff --git a/lib/server/services/run/setO2StopOfLostRuns.js b/lib/server/services/run/setO2StopOfLostRuns.js
@@ -29,8 +29,8 @@ exports.setO2StopOfLostRuns = async (runNumbersOfRunningRuns, modificationTimePe
         WHERE time_o2_end IS NULL
           AND time_trg_end IS NULL
           AND COALESCE(time_trg_start, time_o2_start) IS NOT NULL
-          AND COALESCE(time_trg_start, time_o2_start) >= '${timestampToMysql(modificationTimePeriod.from)}'
-          AND COALESCE(time_trg_start, time_o2_start) < '${timestampToMysql(modificationTimePeriod.to)}'
+          AND COALESCE(time_trg_start, time_o2_start) >= '${timestampToMysql(modificationTimePeriod.from, true)}'
+          AND COALESCE(time_trg_start, time_o2_start) < '${timestampToMysql(modificationTimePeriod.to, true)}'
     `;
     if (runNumbersOfRunningRuns.length > 0) {
         fetchQuery += ` AND run_number NOT IN (${runNumbersOfRunningRuns.join(',')})`;

diff --git a/lib/server/utilities/timestampToMysql.js b/lib/server/utilities/timestampToMysql.js
@@ -15,6 +15,11 @@
  * Convert a UNIX timestamp (in ms) to a MySQL date expression
  *
  * @param {number} timestamp the timestamp to convert
+ * @param {boolean} [milliseconds=false] if true, milliseconds will be stored in database
  * @return {string} the resulting SQL date
  */
-exports.timestampToMysql = (timestamp) => new Date(timestamp).toISOString().slice(0, 19).replace('T', ' ');
+exports.timestampToMysql = (timestamp, milliseconds = false) => {
+    let dateIso = new Date(timestamp).toISOString();
+    dateIso = dateIso.slice(0, milliseconds ? 23 : 19);
+    return dateIso.replace('T', ' ');
+};