[O2B-1503] ranges accepted by fill numbers filter

Author: Houwie7000

lib/usecases/lhcFill/GetAllLhcFillsUseCase.js

@@ -38,6 +38,8 @@ class GetAllLhcFillsUseCase {
         const { filter, page = {} } = query;
         const { limit = ApiConfig.pagination.limit, offset = 0 } = page;
 
+        const SEARCH_ITEMS_SEPARATOR = ',';
+
         const queryBuilder = new QueryBuilder();
 
         if (filter) {
@@ -48,11 +50,37 @@ class GetAllLhcFillsUseCase {
             }
 
             if (fillNumbers) {
-                const fillNumbersSplit = fillNumbers.split(',');
+                /*
+                 * Split by SEARCH_ITEMS_SEPARATOR. Don't validate for only numbers
+                 * Boolean trick: https://michaeluloth.com/javascript-filter-boolean/
+                 */
+                const fillNumberCriteria = fillNumbers.split(SEARCH_ITEMS_SEPARATOR)
+                    .map((runNumbers) => runNumbers.trim())
+                    .filter(Boolean);
+
+                // Set to prevent duplicate values.
+                const fillNumberSet = new Set();
+
+                fillNumberCriteria.forEach((fillNumber) => {
+                    if (fillNumber.includes('-')) {
+                        const [start, end] = fillNumber.split('-').map((n) => parseInt(n, 10));
+                        if (!Number.isNaN(start) && !Number.isNaN(end)) {
+                            for (let i = start; i <= end; i++) {
+                                fillNumberSet.add(i);
+                            }
+                        }
+                    } else {
+                        if (!Number.isNaN(fillNumber)) {
+                            fillNumberSet.add(Number(fillNumber));
+                        }
+                    }
+                });
+
+                const finalFillnumberList = Array.from(fillNumberSet);
 
-                const fillNumbersValidated = fillNumbersSplit.filter((number) => !Number.isNaN(number));
-                if (fillNumbersValidated.length > 0) {
-                    queryBuilder.where('fillNumber').oneOf(...fillNumbersValidated);
+                // Check that the final fill numbers list contains at least one valid fill number
+                if (finalFillnumberList.length > 0) {
+                    queryBuilder.where('fillNumber').oneOf(...finalFillnumberList);
                 }
             }
         }

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

@@ -65,6 +65,18 @@ module.exports = () => {
         });
     })
 
+    it('should only contain specified fill numbers, range', async () => {
+        getAllLhcFillsDto.query = { filter: { hasStableBeams: true, fillNumbers: '1-3,6' } };
+        const { lhcFills } = await new GetAllLhcFillsUseCase().execute(getAllLhcFillsDto);
+
+    
+        expect(lhcFills).to.be.an('array').and.lengthOf(4)
+
+        lhcFills.forEach((lhcFill) => {
+            expect(lhcFill.fillNumber).oneOf([1,2,3,6])
+        });
+    })
+
     it('should only contain specified fill numbers, whitespace', async () => {
         getAllLhcFillsDto.query = { filter: { hasStableBeams: true, fillNumbers: ' 6 , 3 ' } };
         const { lhcFills } = await new GetAllLhcFillsUseCase().execute(getAllLhcFillsDto);