@@ -26,7 +26,6 @@ const { DetectorType } = require('../../domain/enums/DetectorTypes.js');
2626const { unpackNumberRange } = require ( '../../utilities/rangeUtils.js' ) ;
2727const { splitStringToStringsTrimmed } = require ( '../../utilities/stringUtils.js' ) ;
2828const { setTimeRangeQuery } = require ( '../../utilities/setTimeRangeQuery.js' ) ;
29- const { runSummary } = require ( '../../server/views/runs/summary.js' ) ;
3029
3130/**
3231 * GetAllRunsUseCase
@@ -492,9 +491,18 @@ class GetAllRunsUseCase {
492491 const { count, rows } = await RunRepository . findAndCountAll ( filteringQueryBuilder ) ;
493492
494493 const fetchQueryBuilder = new QueryBuilder ( ) ;
495- fetchQueryBuilder . selectAttributes ( [ ...runSummary . attributes ] ) ;
496- fetchQueryBuilder . includeAll ( [ ...runSummary . include ] ) ;
497-
494+ fetchQueryBuilder . include ( { association : 'runType' } ) ;
495+ fetchQueryBuilder . include ( { association : 'lhcFill' } ) ;
496+ fetchQueryBuilder . include ( { association : 'tags' } ) ;
497+ fetchQueryBuilder . include ( { association : 'detectors' } ) ;
498+ fetchQueryBuilder . include ( {
499+ association : 'eorReasons' ,
500+ include : {
501+ association : 'reasonType' ,
502+ attributes : [ 'category' , 'title' ] ,
503+ } ,
504+ } ) ;
505+ fetchQueryBuilder . include ( { association : 'lhcPeriod' } ) ;
498506 fetchQueryBuilder . where ( 'id' ) . oneOf ( ...rows . map ( ( { id } ) => id ) ) ;
499507 for ( const property in sort ) {
500508 fetchQueryBuilder . orderBy ( property , sort [ property ] ) ;
@@ -516,7 +524,6 @@ class GetAllRunsUseCase {
516524
517525 const qcFlagsAssociationDef = {
518526 association : 'qcFlags' ,
519- attributes : [ 'id' , 'detectorId' ] ,
520527 required : false ,
521528 separate : true ,
522529 order : [ [ 'from' , 'ASC' ] ] ,
@@ -528,8 +535,8 @@ class GetAllRunsUseCase {
528535 )` ) ,
529536 ] } ,
530537 include : [
531- { association : 'effectivePeriods' , required : true , separate : true , attributes : [ 'from' , 'to' ] } ,
532- { association : 'flagType' , attributes : [ 'name' ] } ,
538+ { association : 'effectivePeriods' , required : true , separate : true } ,
539+ { association : 'flagType' } ,
533540 { association : 'detector' , required : true } ,
534541 { association : 'createdBy' } ,
535542 ] ,
@@ -550,9 +557,9 @@ class GetAllRunsUseCase {
550557 }
551558 }
552559
553- const runs = await RunRepository . findAll ( fetchQueryBuilder ) ;
560+ const runs = ( await RunRepository . findAll ( fetchQueryBuilder ) ) . map ( runAdapter . toEntity ) ;
554561
555- return { count, runs : runs . map ( runAdapter . toSummary ) } ;
562+ return { count, runs } ;
556563 }
557564}
558565
0 commit comments