[O2B-1506] Run duration filter tests + backend

Author: Houwie7000

lib/domain/dtos/filters/LhcFillsFilterDto.js

@@ -23,4 +23,8 @@ exports.LhcFillsFilterDto = Joi.object({
         'any.invalid': '{{#message}}',
     }),
     beamDurationOperator: Joi.string().trim().min(1).max(2),
+    runDuration: Joi.string().trim().min(8).max(8).custom(validateTime).messages({
+        'any.invalid': '{{#message}}',
+    }),
+    runDurationOperator: Joi.string().trim().min(1).max(2),
 });

lib/public/views/LhcFills/ActiveColumns/lhcFillsActiveColumns.js

@@ -140,17 +140,17 @@ export const lhcFillsActiveColumns = {
         visible: true,
         size: 'w-8',
         format: (duration) => formatDuration(duration),
-        filter: (lhcFillModel) => runDurationFilter(
-            lhcFillModel.filteringModel.get('runDuration'),
-            lhcFillModel.getRunDurationOperator(),
-            (value) => lhcFillModel.setRunDurationOperator(value),
-        ),
     },
     runsCoverage: {
         name: 'Total runs duration',
         visible: true,
         size: 'w-8',
         format: (duration) => formatDuration(duration),
+        filter: (lhcFillModel) => runDurationFilter(
+            lhcFillModel.filteringModel.get('runDuration'),
+            lhcFillModel.getRunDurationOperator(),
+            (value) => lhcFillModel.setRunDurationOperator(value),
+        ),
     },
     efficiency: {
         name: 'Fill Efficiency',

lib/usecases/lhcFill/GetAllLhcFillsUseCase.js

@@ -42,8 +42,10 @@ class GetAllLhcFillsUseCase {
 
         const queryBuilder = new QueryBuilder();
 
+        let associatedStatisticsRequired = false;
+
         if (filter) {
-            const { hasStableBeams, fillNumbers, beamDurationOperator, beamDuration } = filter;
+            const { hasStableBeams, fillNumbers, beamDurationOperator, beamDuration, runDurationOperator, runDuration } = filter;
             if (hasStableBeams) {
                 // For now, if a stableBeamsStart is present, then a beam is stable
                 queryBuilder.where('stableBeamsStart').not().is(null);
@@ -84,6 +86,12 @@ class GetAllLhcFillsUseCase {
                 }
             }
 
+            // Run duration filter and corresponding operator.
+            if (runDuration && runDurationOperator) {
+                associatedStatisticsRequired = true;
+                queryBuilder.whereAssociation('statistics', 'runsCoverage').applyOperator(runDurationOperator, runDuration);
+            }
+
             // Beam duration filter and corresponding operator.
             if (beamDuration && beamDurationOperator) {
                 queryBuilder.where('stableBeamsDuration').applyOperator(beamDurationOperator, beamDuration);
@@ -96,6 +104,11 @@ class GetAllLhcFillsUseCase {
                 where: { definition: RunDefinition.PHYSICS },
                 required: false,
             });
+            queryBuilder.include({
+                association: 'statistics',
+                required: associatedStatisticsRequired,
+            });
+
             queryBuilder.orderBy('fillNumber', 'desc');
             queryBuilder.limit(limit);
             queryBuilder.offset(offset);

test/lib/usecases/lhcFill/GetAllLhcFillsUseCase.test.js

@@ -149,4 +149,55 @@ module.exports = () => {
             expect(lhcFill.stableBeamsDuration).greaterThan(100)
         });
      })
+
+    it('should only contain specified total run duration, > 04:00:00', async () => {
+        getAllLhcFillsDto.query = { filter: { runDuration: '14400', runDurationOperator: '>' } };
+        const { lhcFills } = await new GetAllLhcFillsUseCase().execute(getAllLhcFillsDto)
+
+        expect(lhcFills).to.be.an('array').and.lengthOf(1)
+        lhcFills.forEach((lhcFill) => {
+            expect(lhcFill.runDuration).greaterThan(14400)
+        });
+    })
+
+    it('should only contain specified total run duration, >= 05:00:00', async () => {
+        getAllLhcFillsDto.query = { filter: { runDuration: '18000', runDurationOperator: '>=' } };
+        const { lhcFills } = await new GetAllLhcFillsUseCase().execute(getAllLhcFillsDto)
+
+        expect(lhcFills).to.be.an('array').and.lengthOf(1)
+        lhcFills.forEach((lhcFill) => {
+            expect(lhcFill.runDuration).greaterThan(18000)
+        });
+    })
+
+    it('should only contain specified total run duration, = 05:00:00', async () => {
+        getAllLhcFillsDto.query = { filter: { runDuration: '18000', runDurationOperator: '=' } };
+        const { lhcFills } = await new GetAllLhcFillsUseCase().execute(getAllLhcFillsDto)
+
+        expect(lhcFills).to.be.an('array').and.lengthOf(1)
+        lhcFills.forEach((lhcFill) => {
+            expect(lhcFill.runDuration).greaterThan(18000)
+        });
+    })
+
+
+    it('should only contain specified total run duration, <= 05:00:00', async () => {
+        getAllLhcFillsDto.query = { filter: { runDuration: '18000', runDurationOperator: '<=' } };
+        const { lhcFills } = await new GetAllLhcFillsUseCase().execute(getAllLhcFillsDto)
+
+        expect(lhcFills).to.be.an('array').and.lengthOf(1)
+        lhcFills.forEach((lhcFill) => {
+            expect(lhcFill.runDuration).greaterThan(18000)
+        });
+    })
+
+    it('should only contain specified total run duration, < 06:30:59', async () => {
+        getAllLhcFillsDto.query = { filter: { runDuration: '23459', runDurationOperator: '<' } };
+        const { lhcFills } = await new GetAllLhcFillsUseCase().execute(getAllLhcFillsDto)
+
+        expect(lhcFills).to.be.an('array').and.lengthOf(1)
+        lhcFills.forEach((lhcFill) => {
+            expect(lhcFill.runDuration).greaterThan(23459)
+        });
+    })
 };

test/public/lhcFills/overview.test.js

@@ -270,7 +270,9 @@ module.exports = () => {
         const filterSBExpect = { selector: 'div.items-baseline:nth-child(2) > div:nth-child(1)', value: 'Stable Beams Only' };
         const filterFillNRExpect = {selector: 'div.items-baseline:nth-child(1) > div:nth-child(1)', value: 'Fill #'}
         const filterSBDurationExpect = {selector: 'div.items-baseline:nth-child(3) > div:nth-child(1)', value: 'SB Duration'}
-        const filterSBDurationPlaceholderExpect = {selector: 'input.w-100:nth-child(2)', value: 'e.g 16:14:15 (HH:MM:SS)'}
+        const filterSBDurationPlaceholderExpect = {selector: '.beam-duration-filter', value: 'e.g 16:14:15 (HH:MM:SS)'}
+        const filterRunDurationExpect = {selector: 'div.flex-row:nth-child(4) > div:nth-child(1)', value: 'Total runs duration'}
+        const filterRunDurationPlaceholderExpect = {selector: '.run-duration-filter', value: 'e.g 16:14:15 (HH:MM:SS)'}
 
 
         await goToPage(page, 'lhc-fill-overview');
@@ -280,6 +282,8 @@ module.exports = () => {
         await expectInnerText(page, filterFillNRExpect.selector, filterFillNRExpect.value);
         await expectInnerText(page, filterSBDurationExpect.selector, filterSBDurationExpect.value);
         await expectAttributeValue(page, filterSBDurationPlaceholderExpect.selector, 'placeholder', filterSBDurationPlaceholderExpect.value);
+        await expectInnerText(page, filterRunDurationExpect.selector, filterRunDurationExpect.value);
+        await expectAttributeValue(page, filterRunDurationPlaceholderExpect.selector, 'placeholder', filterRunDurationPlaceholderExpect.value);
     });