fixes

Author: xsalonx

lib/database/repositories/QcFlagRepository.js

@@ -113,7 +113,6 @@ class QcFlagRepository extends Repository {
                 gaq_periods.data_pass_id,
                 gaq_periods.run_number,
                 gaq_periods.coverage_ratio,
-<<<<<<< HEAD
                 IF(
                     COUNT(DISTINCT qcf.id) = COUNT( DISTINCT gaqd.detector_id),
                     qc_flag_block_significance(qcft.bad, qcft.monte_carlo_reproducible),
@@ -142,32 +141,6 @@ class QcFlagRepository extends Repository {
                 AND (qcfep.from IS NULL OR qcfep.\`from\` < gaq_periods.\`to\`)
                 AND (qcfep.to IS NULL OR qcfep.\`to\` > gaq_periods.\`from\`)
 
-=======
-                IF(COUNT(DISTINCT qcf.id) > 0, qc_flag_block_significance(qcft.bad, qcft.monte_carlo_reproducible), NULL) AS significance,
-                GROUP_CONCAT( DISTINCT qcfv.flag_id ) AS verified_flags_list,
-                GROUP_CONCAT( DISTINCT qcfep.flag_id ) AS flags_list
-
-            FROM gaq_periods
-
-            INNER JOIN global_aggregated_quality_detectors AS gaqd
-                ON gaqd.data_pass_id = gaq_periods.data_pass_id
-                AND gaqd.run_number = gaq_periods.run_number
-
-            LEFT JOIN (
-                data_pass_quality_control_flag AS dpqcf
-                INNER JOIN quality_control_flags AS qcf ON dpqcf.quality_control_flag_id = qcf.id
-                INNER JOIN quality_control_flag_types AS qcft ON qcft.id = qcf.flag_type_id
-                INNER JOIN quality_control_flag_effective_periods AS qcfep ON qcf.id = qcfep.flag_id
-                LEFT JOIN quality_control_flag_verifications AS qcfv ON qcfv.flag_id = qcf.id
-            ) 
-                ON gaq_periods.data_pass_id = dpqcf.data_pass_id
-                AND qcf.run_number = gaq_periods.run_number
-                AND gaqd.detector_id = qcf.detector_id
-                AND gaq_periods.run_number = qcf.run_number
-                AND (qcfep.from IS NULL OR qcfep.\`from\` < gaq_periods.\`to\`)
-                AND (qcfep.to IS NULL OR qcfep.\`to\` > gaq_periods.\`from\`)
-
->>>>>>> main
             WHERE gaq_periods.data_pass_id = :dataPassId
             GROUP BY gaq_periods.data_pass_id, gaq_periods.run_number, gaq_periods.\`from\`, gaq_periods.to
         `;
@@ -187,27 +160,25 @@ class QcFlagRepository extends Repository {
                 GROUP BY gaq.data_pass_id, gaq.run_number;
             `;
         const [rows] = await this.model.sequelize.query(summaryQuery, { replacements: { dataPassId } });
-        const entries = rows.map(
-            ({
-                run_number,
-                bad_coverage,
-                mcr_coverage,
-                good_coverage,
-                flags_list,
-                verifiedd_flags_list,
-                undefined_quality_periods_count,
-            }) => [
-                run_number,
-                {
-                    badCoverage: parseFloat(bad_coverage ?? '0'),
-                    mcReproducibleCoverage: parseFloat(mcr_coverage ?? '0'),
-                    goodCoverage: parseFloat(good_coverage ?? '0'),
-                    flagsIds: [...new Set(flags_list?.split(','))],
-                    verifiedFlagsIds: [...new Set(verifiedd_flags_list?.split(','))],
-                    undefinedQualityPeriodsCount: undefined_quality_periods_count,
-                },
-            ],
-        );
+        const entries = rows.map(({
+            run_number,
+            bad_coverage,
+            mcr_coverage,
+            good_coverage,
+            flags_list,
+            verifiedd_flags_list,
+            undefined_quality_periods_count,
+        }) => [
+            run_number,
+            {
+                badCoverage: parseFloat(bad_coverage ?? '0'),
+                mcReproducibleCoverage: parseFloat(mcr_coverage ?? '0'),
+                goodCoverage: parseFloat(good_coverage ?? '0'),
+                flagsIds: [...new Set(flags_list?.split(','))],
+                verifiedFlagsIds: [...new Set(verifiedd_flags_list?.split(','))],
+                undefinedQualityPeriodsCount: undefined_quality_periods_count,
+            },
+        ]);
 
         return Object.fromEntries(entries);
     }

test/lib/server/services/qualityControlFlag/QcFlagService.test.js

@@ -372,11 +372,7 @@ module.exports = () => {
             );
         });
 
-<<<<<<< HEAD
-        it.skip('should fail to create quality control flag because qc flag `from` timestamp is smaller than run.startTime', async () => {
-=======
         it('should return empty when creating quality control flag because `from` timestamp is smaller than run.startTime', async () => {
->>>>>>> main
             const period = {
                 from: new Date('2019-08-08 11:36:40').getTime(),
                 to: new Date('2019-08-09 05:40:00').getTime(),
@@ -400,11 +396,7 @@ module.exports = () => {
             assert.strictEqual(response.length, 0, 'Response should be empty array');
         });
 
-<<<<<<< HEAD
-        it.skip('should fail to create quality control flag because qc flag `from` timestamp is greater than `to` timestamp', async () => {
-=======
         it('should return empty when creating quality control flag because `from` timestamp is greater than `to` timestamp', async () => {
->>>>>>> main
             const qcFlag = {
                 from: new Date('2019-08-09 04:16:40').getTime(), // Failing property
                 to: new Date('2019-08-08 21:20:00').getTime(), // Failing property