fix sql queries

Author: xsalonx

lib/database/repositories/QcFlagRepository.js

@@ -58,33 +58,32 @@ class QcFlagRepository extends Repository {
     async findGaqPeriods(dataPassId, runNumber) {
         const query = `
             SELECT
-                gaq_periods.data_pass_id AS dataPassId,
-                gaq_periods.run_number AS runNumber,
-                gaq_periods.\`from\` AS \`from\`,
-                gaq_periods.\`to\` AS \`to\`,
+                gp.data_pass_id AS dataPassId,
+                gp.run_number AS runNumber,
+                gp.\`from\` AS \`from\`,
+                gp.\`to\` AS \`to\`,
                 group_concat(qcf.id) AS contributingFlagIds,
-                gaq_periods.coverage_ratio AS coverage_ratio
+                gp.coverage_ratio AS coverage_ratio
 
             FROM quality_control_flags AS qcf
-            INNER JOIN quality_control_flag_effective_periods AS qcfep
-                ON qcf.id = qcfep.flag_id
+            INNER JOIN quality_control_flag_effective_periods AS qcfep ON qcf.id = qcfep.flag_id
             INNER JOIN data_pass_quality_control_flag AS dpqcf ON dpqcf.quality_control_flag_id = qcf.id
-            INNER JOIN gaq_periods AS gaq_periods ON gaq_periods.data_pass_id = dpqcf.data_pass_id
+            INNER JOIN gaq_periods AS gp ON gp.data_pass_id = dpqcf.data_pass_id
             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
-                    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.\`from\`)
-                        AND (qcfep.\`to\`   IS NULL OR gaq_periods.\`to\` <= qcfep.\`to\`)
+                ON gaqd.data_pass_id = gp.data_pass_id
+                AND gaqd.run_number = gp.run_number
+                AND gaqd.detector_id = qcf.detector_id
+                AND gp.run_number = qcf.run_number
+                AND (qcfep.\`from\` IS NULL OR qcfep.\`from\` <= gp.\`from\`)
+                AND (qcfep.\`to\`   IS NULL OR gp.\`to\` <= qcfep.\`to\`)
     
-            WHERE gaq_periods.data_pass_id = ${dataPassId}
-                ${runNumber ? `AND gaq_periods.run_number = ${runNumber}` : ''}
+            WHERE gp.data_pass_id = ${dataPassId}
+                ${runNumber ? `AND gp.run_number = ${runNumber}` : ''}
     
-            GROUP BY gaq_periods.run_number,
-                gaq_periods.data_pass_id,
-                gaq_periods.\`from\`,
-                gaq_periods.\`to\`;
+            GROUP BY gp.run_number,
+                gp.data_pass_id,
+                gp.\`from\`,
+                gp.\`to\`;
             `;
 
         const [rows] = await this.model.sequelize.query(query);
@@ -118,7 +117,7 @@ class QcFlagRepository extends Repository {
                 gp.data_pass_id,
                 gp.run_number,
                 gp.coverage_ratio,
-                qc_flag_block_significance(qcft.bad, qcft.monte_carlo_reproducible) AS significance,
+                IF(COUNT(DISTINCT qcf.id) > 0, qc_flag_block_significance(qcft.bad, qcft.monte_carlo_reproducible), NULL) AS significance,
                 COUNT(DISTINCT gaqd.detector_id) - COUNT(DISTINCT qcf.id) AS undefined_quality_periods_count,
                 GROUP_CONCAT( DISTINCT qcfv.flag_id ) AS verified_flags_list,
                 GROUP_CONCAT( DISTINCT qcfep.flag_id ) AS flags_list
@@ -154,7 +153,7 @@ class QcFlagRepository extends Repository {
                     qc_flag_block_significance_coverage(gaq.significance, coverage_ratio, 'bad')  AS bad_coverage,
                     qc_flag_block_significance_coverage(gaq.significance, coverage_ratio, 'mcr')  AS mcr_coverage,
                     qc_flag_block_significance_coverage(gaq.significance, coverage_ratio, 'good') AS good_coverage,
-                    SUM(coverage_ratio)                                                           AS total_coverage,
+                    SUM(IF(gaq.significance IS NOT NULL, coverage_ratio, 0))                      AS total_coverage,
                     SUM(undefined_quality_periods_count)                                          AS undefined_quality_periods_count,
                     GROUP_CONCAT(verified_flags_list)                                             AS verified_flags_list,
                     GROUP_CONCAT(flags_list)                                                      AS flags_list