Skip to content
Closed
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: 7 additions & 0 deletions lib/domain/dtos/filters/RunFilterDto.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ const EorReasonFilterDto = Joi.object({
});

exports.RunFilterDto = Joi.object({
beamModes: CustomJoi.stringArray().items(Joi.string()
.trim()
.pattern(/^[A-Z]+(?: [A-Z]+)*$/)
.messages({
'string.pattern.base':
'Beam modes "{{#value}}" must contain only uppercase letters and single spaces between words.',
})),
runNumbers: Joi.string().trim().custom(validateRange).messages({
[RANGE_INVALID]: '{{#message}}',
'string.base': 'Run numbers must be comma-separated numbers or ranges (e.g. 12,15-18)',
Expand Down
5 changes: 5 additions & 0 deletions lib/usecases/run/GetAllRunsUseCase.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class GetAllRunsUseCase {
inelasticInteractionRateAtEnd,
gaq,
detectorsQc,
beamModes,
} = filter;

if (runNumbers) {
Expand Down Expand Up @@ -113,6 +114,10 @@ class GetAllRunsUseCase {
filteringQueryBuilder.where('definition').oneOf(...definitions);
}

if (beamModes) {
filteringQueryBuilder.where('lhcBeamMode').oneOf(...beamModes);
}

if (eorReason) {
const eorReasonTypeWhere = {};
if (eorReason.category) {
Expand Down
31 changes: 31 additions & 0 deletions test/api/runs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,37 @@ module.exports = () => {
expect(runs).to.lengthOf(20);
});

it('should successfully filter with single beamMode', async () => {
const response = await request(server).get('/api/runs?filter[beamModes]=STABLE BEAMS');

expect(response.status).to.equal(200);
const { data: runs } = response.body;

expect(runs).to.lengthOf(5);
});

it('should successfully filter with multiple beamModes', async () => {
const response = await request(server).get('/api/runs?filter[beamModes]=STABLE BEAMS,NO BEAM');

expect(response.status).to.equal(200);
const { data: runs } = response.body;

expect(runs).to.lengthOf(6);
});

it('should return 400 if beamModes filter has the incorrect format', async () => {
const beamModeString = '*THERE\'S NON LETTERS IN HERE';
const response = await request(server).get(`/api/runs?filter[beamModes]=${beamModeString}`);


expect(response.status).to.equal(400);

const { errors: [error] } = response.body;

expect(error.title).to.equal('Invalid Attribute');
expect(error.detail).to.equal(`Beam modes "${beamModeString}" must contain only uppercase letters and single spaces between words.`);
});

it('should successfully filter on multiple specified run numbers', async () => {
const response = await request(server).get('/api/runs?filter[runNumbers]=17,18');

Expand Down
26 changes: 26 additions & 0 deletions test/lib/usecases/run/GetAllRunsUseCase.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,32 @@ module.exports = () => {
}
});

it('should successfully filter on beamModes', async () => {
const singleBeamMode = ['STABLE BEAMS'];
const multipleBeamMode = ['STABLE BEAMS', 'NO BEAM'];
const nonExistentBeamMode = ['DOES NOT EXIST'];

getAllRunsDto.query = { filter: { beamModes: singleBeamMode } };
{
const { runs } = await new GetAllRunsUseCase().execute(getAllRunsDto);
expect(runs).to.have.lengthOf(5);
expect(runs.every(({ lhcBeamMode }) => singleBeamMode.includes(lhcBeamMode))).to.be.true;
}

getAllRunsDto.query = { filter: { beamModes: multipleBeamMode } };
{
const { runs } = await new GetAllRunsUseCase().execute(getAllRunsDto);
expect(runs).to.have.lengthOf(6);
expect(runs.every(({ lhcBeamMode }) => multipleBeamMode.includes(lhcBeamMode))).to.be.true;
}

getAllRunsDto.query = { filter: { beamModes: nonExistentBeamMode } };
{
const { runs } = await new GetAllRunsUseCase().execute(getAllRunsDto);
expect(runs).to.have.lengthOf(0);
}
});

it('should successfully filter on run definition', async () => {
const PHYSICS_COUNT = 7;
const COSMICS_COUNT = 2;
Expand Down
Loading