Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/lib/domain/dtos/stdRequest.dto.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ const emptyDataRequestDTO = Joi.object({
* query.filter - object for building sequelize where-cluase
*/
const stdDataRequestDTO = Joi.object({
query: tokenDTO.keys({ filter: Joi.object({}).unknown(true) }), //TODO make more strict
query: tokenDTO.keys({
filter: Joi.object({}).unknown(true),
page: Joi.object({
limit: Joi.number(),
offset: Joi.number(),
}) }), //TODO make more strict
params: emptyDTO,
body: emptyDTO,
});
Expand Down
9 changes: 6 additions & 3 deletions app/lib/services/dataPasses/DataPassService.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ class DataPassService {
* @param {Object} query - Filtering query definiton from http request
* @returns {Promise<DataPass[]>} Promise object represents the result of this use case.
*/
async getAll({ filter }) {
async getAll({ filter, page }) {
const periods = await DataPassRepository.findAll({
where: filterToSequelizeWhereClause(filter),
...page,
});
return periods.map((dataPass) => dataPassAdapter.toEntity(dataPass));
}
Expand All @@ -43,12 +44,13 @@ class DataPassService {
* @param {Object} query - Filtering query definiton from http request,... #TODO
* @returns {Promise<DataPass[]>} Promise object represents the result of this use case.
*/
async getDataPassesPerPeriod(periodId, { filter }) {
async getDataPassesPerPeriod(periodId, { filter, page }) {
const runs = await DataPassRepository.findAll({
where: {
period_id: periodId,
...filterToSequelizeWhereClause(filter),
},
...page,
});
return runs.map((dataPass) => dataPassAdapter.toEntity(dataPass));
}
Expand All @@ -59,7 +61,7 @@ class DataPassService {
* @param {Object} query - Filtering query definiton from http request,... #TODO
* @returns {Promise<DataPass[]>} Promise object represents the result of this use case.
*/
async getAnchoredToSimulationPass(simulationPassId, { filter }) {
async getAnchoredToSimulationPass(simulationPassId, { filter, page }) {
const runs = await DataPassRepository.findAll({
include: [
{
Expand All @@ -77,6 +79,7 @@ class DataPassService {
where: {
...filterToSequelizeWhereClause(filter),
},
...page,
});
return runs.map((dataPass) => dataPassAdapter.toEntity(dataPass));
}
Expand Down
3 changes: 2 additions & 1 deletion app/lib/services/periods/PeriodService.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class PeriodService {
* @param {Object} query - Filtering query definiton from http request,... #TODO
* @returns {Promise<Period[]>} Promise object represents the result of this use case.
*/
async getAll({ filter }) {
async getAll({ filter, page }) {
const periods = await PeriodRepository.findAll({
include: [
{
Expand Down Expand Up @@ -61,6 +61,7 @@ class PeriodService {
group: ['Period.id', 'BeamType.id'],

where: filterToSequelizeWhereClause(filter),
...page,
});
return periods.map((period) => periodAdapter.toEntity(period));
}
Expand Down
3 changes: 2 additions & 1 deletion app/lib/services/qualityControl/QualityControlService.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class QualityControlService {
* @param {Object} query - Filtering query definiton from http request,... #TODO
* @returns {Promise<Quality[]>} Promise object represents the result of this use case.
*/
async getAllTimeBasedFlags({ filter }) {
async getAllTimeBasedFlags({ filter, page }) {
const qualityFlags = await QualityControlFlagRepository.findAll({
include: [
{
Expand All @@ -51,6 +51,7 @@ class QualityControlService {
},
],
where: filterToSequelizeWhereClause(filter),
...page,
});
return qualityFlags.map((qualityFlags) => qualityControlFlagAdapter.toEntity(qualityFlags));
}
Expand Down
12 changes: 8 additions & 4 deletions app/lib/services/runs/RunService.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ class RunService {
* @param {Object} query - Filtering query definiton from http request,... #TODO
* @returns {Promise<Run[]>} Promise object represents the result of this use case.
*/
async getAll({ filter }) {
async getAll({ filter, page }) {
const runs = await RunRepository.findAllWithDetectors({
where: filterToSequelizeWhereClause(filter),
...page,
});
return runs.map((run) => runAdapter.toEntity(run));
}
Expand All @@ -45,12 +46,13 @@ class RunService {
* @param {Object} query - Filtering query definiton from http request,... #TODO
* @returns {Promise<Run[]>} Promise object represents the result of this use case.
*/
async getRunsPerPeriod(periodId, { filter }) {
async getRunsPerPeriod(periodId, { filter, page }) {
const runs = await RunRepository.findAllWithDetectors({
where: {
period_id: periodId,
...filterToSequelizeWhereClause(filter),
},
...page,
});
return runs.map((run) => runAdapter.toEntity(run));
}
Expand All @@ -61,7 +63,7 @@ class RunService {
* @param {Object} query - Filtering query definiton from http request,... #TODO
* @returns {Promise<Run[]>} Promise object represents the result of this use case.
*/
async getRunsPerDataPass(dataPassId, { filter }) {
async getRunsPerDataPass(dataPassId, { filter, page }) {
const runs = await RunRepository.findAllWithDetectors({
include: [
{
Expand All @@ -78,6 +80,7 @@ class RunService {
where: {
...filterToSequelizeWhereClause(filter),
},
...page,
});
return runs.map((run) => runAdapter.toEntity(run));
}
Expand All @@ -88,7 +91,7 @@ class RunService {
* @param {Object} query - Filtering query definiton from http request,... #TODO
* @returns {Promise<Run[]>} Promise object represents the result of this use case.
*/
async getRunsPerSimulationPass(simulationPassId, { filter }) {
async getRunsPerSimulationPass(simulationPassId, { filter, page }) {
const runs = await RunRepository.findAllWithDetectors({
include: [
{
Expand All @@ -105,6 +108,7 @@ class RunService {
where: {
...filterToSequelizeWhereClause(filter),
},
...page,
});
return runs.map((run) => runAdapter.toEntity(run));
}
Expand Down