[ORCT-192] update legacy endpoint to handle migrated flags

app/config/rct-data/quality/flagReasonColors.js

@@ -16,6 +16,7 @@ const flagReasonColors = {
     neutral: '277DA1',
     bad: '922C40',
     limitedAcceptance: 'DC9750',
+    good: '2C9240',
 };
 
 module.exports = flagReasonColors;

app/lib/database/procedures/flags.js

@@ -31,20 +31,6 @@ const flag_insert = (query) => `
     $do$;
 `;
 
-const flag_update = (query) => {
-    return 'NOT IMPLEMENTED PLEASE REMOVE OLD FLAG INSTANCE';
-    `
-    DO                            
-    $do$
-    BEGIN
-        INSERT INTO quality_control_flags (data_pass_id, run_number, detector_id, flag_type_id, 
-            time_start, time_end, comment, added_by, addition_time, last_modified_by, last_modification_time)
-        VALUES(pass_id, ${query.run_number}, det_id, flag_id, 
-            ${query.time_start}, ${query.time_end}, '${query.comment}', '${query.added_by}', now(), null, null);
-    END
-    $do$;
-`;
-}
 const flag_delete = (query) => `
     DO                            
     $do$
@@ -67,6 +53,5 @@ $do$;
 module.exports = {
     flag_insert,
     flag_delete,
-    flag_update,
     verification_insert
 };

app/lib/database/views/flags_view.js

@@ -12,35 +12,50 @@
  * or submit itself to any jurisdiction.
  */
 
-const flags_view = (query) => {
-    
-    rn = query.run_numbers;
-    let rn_sql = "";
-    if (typeof(rn) === 'object') {
-        rn_sql = rn.join(",");
-    } else if (typeof(rn) === 'string') {
-        rn_sql = rn
-    } else {
-        throw `run_numbers seems to be incorrect ${rn}`
+/**
+ * Build part of sql where clause like 'FIELD_NAME in (...DATA...)';
+ * @param {Array<String>|String} data - data to be used to build logical clause
+ * @param {String} fieldName - field name in database
+ * @param {Boolean} isString - if true values from data are wrapped with single quote
+ * @returns {String|undefined} - logical clause
+ */
+const dataFieldToSQLBelongsLogicalClause = (data, fieldName, isString) => {
+    if (!data) {
+        return undefined;
     }
-
-    let det_sql = "";
-    if (query.detector) {
-        det_sql = `AND ds.name = '${query.detector}'`
+    if (!Array.isArray(data)) {
+        data = [data];
     }
+    const rightOperand = (isString ? data.map((value) => `'${value}'`) : data).join(',');
+    return rightOperand ? `${fieldName} in (${rightOperand})` : undefined;
+}
+
+/**
+ * Build sql query to fetch quality control flags for
+ * one data pass and (if provided) given runs and detector subsystems
+ * @param {Object} query containing data_pass_name (single name), run_numbers (list), detector (list)
+ * @returns {String} sql query
+ */
+const flags_view = (query) => {
+    run_selection_sql = dataFieldToSQLBelongsLogicalClause(query.run_numbers, 'r.run_number')
+    detector_selection_sql = dataFieldToSQLBelongsLogicalClause(query.detector, 'ds.name', true)
+
+    const data_pass_sql = `dp.name = '${query.data_pass_name}'`;
+    const whereClause = [data_pass_sql, run_selection_sql, detector_selection_sql]
+        .filter(_ => _)
+        .join(' AND ');
 
     return `
     SELECT
-        qcf.id, 
-        qcf.time_start, 
-        qcf.time_end, 
+        qcf.id,
+        qcf.entire,
+        EXTRACT(EPOCH FROM COALESCE(qcf.time_start, r.time_trg_start, r.time_o2_start)) * 1000 as time_start, 
+        EXTRACT(EPOCH FROM COALESCE(qcf.time_end, r.time_trg_end, r.time_o2_end)) * 1000 as time_end, 
         ftd.name as flag_reason, 
         qcf.comment,
         r.run_number,
         ds.name as detector,
-        array_agg(v.verified_by) as by,
-        array_agg(v.created_at) as ver_time
-
+        get_verifications(qcf.id) as verifications
 
         FROM quality_control_flags AS qcf
         INNER JOIN data_passes as dp
@@ -54,9 +69,7 @@
         LEFT OUTER JOIN verifications as v
             ON qcf.id = v.qcf_id
 
-        WHERE r.run_number in (${rn_sql}) AND 
-            dp.name = '${query.data_pass_name}'
-            ${det_sql}
+        WHERE ${whereClause}
         GROUP BY qcf.id, qcf.time_start, qcf.time_end, ftd.name, qcf.comment, r.run_number, ds.name
 
     `;

app/lib/database/views/runs_views.js

@@ -12,14 +12,14 @@
  * or submit itself to any jurisdiction.
  */
  const config = require('../../config/configProvider.js');
- const run_detectors_field_in_sql_query = config.rctData.detectors
-     .map(d => `(SELECT get_run_det_data(r.run_number, '${d.toUpperCase()}')) as ${d.toUpperCase()}_detector`)
+ const run_detectors_field_in_sql_query_factory = (dataPassName = null) => config.rctData.detectors
+     .map(d => `(SELECT get_run_det_data(r.run_number, '${d.toUpperCase()}', '${dataPassName}')) as ${d.toUpperCase()}_detector`)
      .join(',\n')
 
 
 const queryForRunsFields = `
         --p.name, 
-        r.run_number, 
+        r.run_number,
         extract( epoch from r.time_o2_start ) * 1000 as time_o2_start,
         extract( epoch from r.time_o2_end ) * 1000 as time_o2_end,
         extract( epoch from r.time_trg_start ) * 1000 as time_trg_start,
@@ -34,7 +34,7 @@ const queryForRunsFields = `
 const runs_per_period_view = (query) => `
         SELECT
             ${queryForRunsFields},
-            ${run_detectors_field_in_sql_query}
+            ${run_detectors_field_in_sql_query_factory()}
         FROM runs AS r
         INNER JOIN periods AS p
             ON p.id = r.period_id
@@ -49,7 +49,7 @@ const runs_per_period_view = (query) => `
 const runs_per_data_pass_view = (query) => `
         SELECT
         ${queryForRunsFields},
-        ${run_detectors_field_in_sql_query}
+        ${run_detectors_field_in_sql_query_factory(query.index)}
         FROM data_passes AS dp
         INNER JOIN data_passes_runs AS dpr
             ON dp.id=dpr.data_pass_id

app/public/components/detectors/detectorIcon.js

@@ -19,7 +19,12 @@
 export default function detectorIcon(navigation, item, index, detectorName, timeBased = false, qualityChangePossible = false) {
     const runDetectorId = `${index}-${item.run_number}-${detectorName}`;
     const runBasedQcModalId = `${runDetectorId}-qc-modal`;
-    const runDetectorQuality = item[`${detectorName.toLowerCase()}_detector`];
+    const runDetectorQualityControlFlag = item[`${detectorName.toLowerCase()}_detector`];
+
+    const { qcf, qcf_bkp } = runDetectorQualityControlFlag;
+    const quality = qcf?.quality || qcf_bkp?.quality;
+    const qcFromBookkeeping = ! qcf?.quality && qcf_bkp?.quality;
+
     return [
         qualityChangePossible
             ? h('.modal', { id: runBasedQcModalId },
@@ -30,14 +35,14 @@
                 }, item, index, detectorName, runDetectorId, timeBased)))
             : '',
 
-        h(`button.btn.pointer.run-quality.${runDetectorQuality}`, {
+        h(`button.btn.pointer.run-quality.${quality ?? 'no-data'}`, {
             id: runDetectorId,
             onclick: () => {
                 if (qualityChangePossible) {
                     showModal(runBasedQcModalId);
                 }
             },
         },
-        runDetectorQuality),
+        quality ?? '.', h('sub', qcFromBookkeeping ? 'sync' : '')),
     ];
 }

app/public/components/flags/flagsVisualization.js

@@ -15,23 +15,17 @@
 import { h } from '/js/src/index.js';
 import flagVisualization from './flagVisualization.js';
 import { RCT } from '../../config.js';
+import { dateFormatter } from '../../utils/dataProcessing/dataProcessingUtils.js';
 const { flagReasonColors } = RCT.quality;
 
 function filterDistinct(a) {
     return a.filter((value, index, array) => array.indexOf(value) === index);
 }
 
-const dateFormatter = (sec) => {
-    const cestOffset = 2 * 60 * 60 * 1000;
-    const localOffset = new Date().getTimezoneOffset() * 60 * 1000;
-    const d = new Date(Number(sec) + cestOffset + localOffset);
-    const dateString = d.toLocaleDateString();
-    const timeString = d.toLocaleTimeString();
-    return h('', h('.skinny', dateString), timeString);
-};
-
 export default function flagsVisualization(runData, flagsData) {
-    const { time_start, time_end } = runData;
+    const { time_o2_start, time_o2_end, time_trg_start, time_trg_end } = runData;
+    const time_start = time_trg_start ?? time_o2_start;
+    const time_end = time_trg_end ?? time_o2_end;
 
     const distinctFlagReasons = filterDistinct(flagsData.map((flag) => flag.flag_reason.replace(/\s+/g, '')));
 
@@ -43,7 +37,10 @@
     const flagColor = (flagReason) => {
         switch (flagReason) {
             case 'LimitedAcceptance':
+            case 'Mixed':
                 return flagReasonColors.limitedAcceptance;
+            case 'Good':
+                return flagReasonColors.good;
             case 'Notbad':
                 return flagReasonColors.neutral;
             case 'CertifiedbyExpert':

app/public/styles/rct/custom/components/run-quality.css

@@ -21,3 +21,13 @@
     background-color: var(--red) !important;
     color: var(--white);
 }
+
+.rct .run-quality.mixed {
+    background-color: var(--orange) !important;
+    color: var(--white);
+}
+
+.rct .run-quality.no-data {
+    background-color: var(--dark-blue) !important;
+    color: var(--white);
+}

app/public/styles/rct/custom/tables/flags.css

@@ -63,8 +63,12 @@
 }
 
 /* Verification time */
-.rct .flags-table .flags-ver_time-cell,
-.rct .flags-table .flags-ver_time-header {
+.rct .flags-table .flags-verification_time-cell,
+.rct .flags-table .flags-verification_time-header {
     min-width: 10em;
     text-align: left;
 }
+
+.verification-border {
+    border-bottom: solid;
+}

app/public/views/flags/Flags.js

@@ -38,7 +38,12 @@ export default class Flags extends Observable {
 
     getFlags(runNumber, detector) {
         const allFlags = this.getAllFlags();
-        const flags = Array.isArray(allFlags) ? allFlags : [];
+        const flags = !Array.isArray(allFlags) ? [] : allFlags.map((flag) => {
+            const { verifications } = flag;
+            flag.verification_time = verifications?.map(({ verification_time }) => verification_time);
+            flag.by = verifications?.map(({ by }) => by);
+            return flag;
+        });
         return flags.filter((e) => e.detector === detector && e.run_number.toString() === runNumber.toString());
     }
 }

app/public/views/flags/table/fields.js

@@ -46,7 +46,7 @@ const fields = [
         display: true,
     },
     {
-        name: 'ver_time',
+        name: 'verification_time',
         display: true,
     },
 ];

app/public/views/runs/runsPerDataPass/overview/qcTypeSelection.js

@@ -72,7 +72,7 @@ export default function qcTypeSelection(navigation, close, item, index, detector
             ? h('.flex-wrap.justify-center.items-center.p-1rem.p-bottom-0',
                 h('button.btn.btn-primary', {
                     onclick: () => navigation.router.go(flagsUrl),
-                }, 'Time based quality'))
+                }, 'Quality Control Flags'))
             : '',
     ]);
 }

app/public/views/runs/runsPerDataPass/table/row.js

@@ -33,7 +33,7 @@ export default function row(
     const detectorCells = visibleFields.filter((field) =>
         shouldDisplayDetectorField(field.name, model.parent.userPreferences.detectorList)).map((field) =>
         h(`td.${pageName}-detector-cell.text-ellipsis`,
-            item[field.name]
+            item[field.name] && (item[field.name]?.qcf_bkp || item[field.name]?.qcf)
                 ? detectorIcon(model.navigation, item, index, detectors.getDetectorName(field.name), true, true)
                 : ''));
 

app/public/views/userView/data/headersSpecials.js

@@ -61,7 +61,7 @@ const flagFields = {
     flag_reason: 'Reason',
     comment: 'Comment',
     by: 'Verified by',
-    ver_time: 'Verification time',
+    verification_time: 'Verification time',
 };
 
 const headersSpecials = {

app/public/views/userView/data/pagesCellsSpecials.js

@@ -109,15 +109,13 @@ pagesCellsSpecials[PN.runsPerPeriod] = {
 pagesCellsSpecials[PN.flags] = {
     time_start: (item) => dateFormatter(item.time_start),
     time_end: (item) => dateFormatter(item.time_end),
-    ver_time: (item) => item.ver_time.isEmpty
-        ? 'unverified'
-        : item.ver_time.map((e) => {
-            if (!e) {
-                return 'unverified';
-            }
-            const date = new Date(e);
-            return dateFormatter(date.getTime());
-        }),
+    by: (item) => ! item.verifications?.length ?
+        'unverified'
+        : item.verifications.map(({ by: verifier }) => h('.verification-border', h('', verifier, h('.skinny.hidden', '.')))),
+    verification_time: (item) => ! item.verifications?.length ?
+        'unverified'
+        : item.verifications.map(({ verification_time }) =>
+            h('.verification-border', dateFormatter(new Date(verification_time).getTime()))),
 };
 
 pagesCellsSpecials[PN.runsPerDataPass] = pagesCellsSpecials[PN.runsPerPeriod];

database/stored-sql-functionalities/functions/get_run_det_data.sql

@@ -1,17 +1,57 @@
 CREATE or REPLACE FUNCTION get_run_det_data(
     _run_number bigint,
-    _detector_name varchar
+    _detector_name varchar,
+    _data_pass_name varchar
 ) 
-    returns varchar
+
+    returns json
 LANGUAGE plpgsql
 AS $body$ 
-DECLARE ret varchar:= null;
+DECLARE ret json:= null;
+
 BEGIN
-    SELECT rd.quality INTO ret -- TODO
-        FROM runs_detectors AS rd 
-        INNER JOIN detectors_subsystems AS ds 
-            ON rd.detector_id = ds.id
-        WHERE rd.run_number = _run_number AND ds.name = _detector_name;
-    return ret::varchar;
+
+    raise notice 'data: % % %', _data_pass_name, _run_number, _detector_name;
+
+    SELECT json_build_object(
+        'qcf', qcf,
+        'qcf_bkp', qcf_bkp
+    ) INTO ret FROM (SELECT
+
+        (SELECT json_build_object(
+            'id', qcf.id, 
+            'quality', lower(ftd.name)
+            )
+        FROM
+            quality_control_flags AS qcf
+            INNER JOIN flag_types_dictionary AS ftd
+                ON ftd.id = qcf.flag_type_id
+            INNER JOIN data_passes as dp
+                ON dp.id = qcf.data_pass_id
+            INNER JOIN detectors_subsystems as ds
+                ON ds.id = qcf.detector_id
+            WHERE
+                dp.name = _data_pass_name AND
+                ds.name = _detector_name AND
+                qcf.run_number = _run_number
+            ORDER BY qcf.updated_at DESC
+            LIMIT 1
+        ) as qcf
+    ,
+
+        (SELECT json_build_object(
+                'quality', rd.quality
+            )
+            FROM runs_detectors AS rd
+            INNER JOIN detectors_subsystems AS ds
+                ON rd.detector_id = ds.id
+            WHERE
+                rd.run_number = _run_number AND
+                ds.name = _detector_name
+        ) as qcf_bkp
+
+    ) as subq;
+
+    return ret;
 END;
 $body$;