Skip to content

Commit bba5117

Browse files
committed
api test
1 parent 44bbe8f commit bba5117

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

lib/server/services/dataPasses/DataPassService.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class DataPassService {
119119
* @property {boolean} [filter.includeTest]
120120
* @property {boolean} [filter.includeDebug]
121121
*/
122-
const { ids, names, lhcPeriodIds, simulationPassIds, includeTest = false, includeDebug = false } = filter;
122+
const { ids, names, lhcPeriodIds, simulationPassIds } = filter;
123123
if (lhcPeriodIds) {
124124
queryBuilder.where('lhcPeriodId').oneOf(...lhcPeriodIds);
125125
}
@@ -132,16 +132,16 @@ class DataPassService {
132132
if (names) {
133133
queryBuilder.where('name').oneOf(...names);
134134
}
135-
if (!includeTest) {
136-
queryBuilder.where('name').not().substring(NonPhysicsProductionsNamesWords.TEST);
137-
}
138-
if (!includeDebug) {
139-
queryBuilder.where('name').not().substring(NonPhysicsProductionsNamesWords.DEBUG);
140-
}
141135
}
142136

143-
const { count, rows } = await DataPassRepository.findAndCountAll(queryBuilder);
137+
if (!filter?.includeTest) {
138+
queryBuilder.where('name').not().substring(NonPhysicsProductionsNamesWords.TEST);
139+
}
140+
if (!filter?.includeDebug) {
141+
queryBuilder.where('name').not().substring(NonPhysicsProductionsNamesWords.DEBUG);
142+
}
144143

144+
const { count, rows } = await DataPassRepository.findAndCountAll(queryBuilder);
145145
const dataPassesVersions = await DataPassVersionRepository.findAll({
146146
include: 'statusHistory',
147147
where: { dataPassId: { [Op.in]: rows.map(({ id }) => id) } },

0 commit comments

Comments
 (0)