7

Author: NarrowsProjects

lib/usecases/run/GetAllRunsUseCase.js

@@ -26,7 +26,6 @@ const { DetectorType } = require('../../domain/enums/DetectorTypes.js');
 const { unpackNumberRange } = require('../../utilities/rangeUtils.js');
 const { splitStringToStringsTrimmed } = require('../../utilities/stringUtils.js');
 const { setTimeRangeQuery } = require('../../utilities/setTimeRangeQuery.js');
-const { runSummary } = require('../../server/views/runs/summary.js');
 
 /**
  * GetAllRunsUseCase
@@ -492,9 +491,18 @@ class GetAllRunsUseCase {
         const { count, rows } = await RunRepository.findAndCountAll(filteringQueryBuilder);
 
         const fetchQueryBuilder = new QueryBuilder();
-        fetchQueryBuilder.selectAttributes([...runSummary.attributes]);
-        fetchQueryBuilder.includeAll([...runSummary.include]);
-
+        fetchQueryBuilder.include({ association: 'runType' });
+        fetchQueryBuilder.include({ association: 'lhcFill' });
+        fetchQueryBuilder.include({ association: 'tags' });
+        fetchQueryBuilder.include({ association: 'detectors' });
+        fetchQueryBuilder.include({
+            association: 'eorReasons',
+            include: {
+                association: 'reasonType',
+                attributes: ['category', 'title'],
+            },
+        });
+        fetchQueryBuilder.include({ association: 'lhcPeriod' });
         fetchQueryBuilder.where('id').oneOf(...rows.map(({ id }) => id));
         for (const property in sort) {
             fetchQueryBuilder.orderBy(property, sort[property]);
@@ -516,7 +524,6 @@ class GetAllRunsUseCase {
 
             const qcFlagsAssociationDef = {
                 association: 'qcFlags',
-                attributes: ['id', 'detectorId'],
                 required: false,
                 separate: true,
                 order: [['from', 'ASC']],
@@ -528,10 +535,10 @@ class GetAllRunsUseCase {
                     )`),
                 ] },
                 include: [
-                    { association: 'effectivePeriods', required: true, separate: true, attributes: ['from', 'to'] },
-                    { association: 'flagType', attributes: ['name'] },
-                    { association: 'detector', attributes: ['name'], required: true },
-                    { association: 'createdBy', attributes: [], required: true },
+                    { association: 'effectivePeriods', required: true, separate: true },
+                    { association: 'flagType' },
+                    { association: 'detector', required: true },
+                    { association: 'createdBy' },
                 ],
             };
 
@@ -550,9 +557,9 @@ class GetAllRunsUseCase {
             }
         }
 
-        const runs = await RunRepository.findAll(fetchQueryBuilder);
+        const runs = (await RunRepository.findAll(fetchQueryBuilder)).map(runAdapter.toEntity);
 
-        return { count, runs: runs.map(runAdapter.toSummary) };
+        return { count, runs };
     }
 }