Skip to content

Commit 7f3ff5e

Browse files
author
GuustMetz
committed
feat: implement setTimeRangeQuery in GetAllRunsUseCase
1 parent 8ab2a60 commit 7f3ff5e

1 file changed

Lines changed: 6 additions & 11 deletions

File tree

lib/usecases/run/GetAllRunsUseCase.js

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const { qcFlagSummaryService } = require('../../server/services/qualityControlFl
2525
const { DetectorType } = require('../../domain/enums/DetectorTypes.js');
2626
const { unpackNumberRange } = require('../../utilities/rangeUtils.js');
2727
const { splitStringToStringsTrimmed } = require('../../utilities/stringUtils.js');
28+
const { setTimeRangeQuery } = require('../../utilities/setTimeRangeQuery.js');
2829

2930
/**
3031
* GetAllRunsUseCase
@@ -151,21 +152,15 @@ class GetAllRunsUseCase {
151152
}
152153

153154
if (o2start) {
154-
const from = o2start.from !== undefined ? o2start.from : 0;
155-
const to = o2start.to !== undefined ? o2start.to : new Date().getTime();
156-
filteringQueryBuilder.where('timeO2Start').between(from, to);
155+
setTimeRangeQuery(o2start, 'timeO2Start', filteringQueryBuilder);
157156
}
158-
157+
159158
if (o2end) {
160-
const from = o2end.from !== undefined ? o2end.from : 0;
161-
const to = o2end.to !== undefined ? o2end.to : new Date().getTime();
162-
filteringQueryBuilder.where('timeO2End').between(from, to);
159+
setTimeRangeQuery(o2end, 'timeO2End', filteringQueryBuilder);
163160
}
164-
161+
165162
if (updatedAt) {
166-
const from = updatedAt.from ?? 0;
167-
const to = updatedAt.to ?? new Date().getTime();
168-
filteringQueryBuilder.where('updatedAt').between(from, to);
163+
setTimeRangeQuery(updatedAt, 'updatedAt', filteringQueryBuilder);
169164
}
170165

171166
if (triggerValues) {

0 commit comments

Comments
 (0)