remove the combination operator from lhcFills

Author: Guust

lib/domain/dtos/GetAllLogsDto.js

@@ -20,19 +20,15 @@ const { FromToFilterDto } = require('./filters/FromToFilterDto.js');
 
 const RunFilterDto = CustomJoi.stringArray().items(EntityIdDto).single();
 const EnvironmentsFilterDto = CustomJoi.stringArray().items(Joi.string()).single();
-
-const LhcFillFilterDto = Joi.object({
-    values: CustomJoi.stringArray().items(EntityIdDto).single().required(),
-    operation: Joi.string().valid('and', 'or').required(),
-});
+const LhcFillFilterDto = CustomJoi.stringArray().items(EntityIdDto).single();
 
 const FilterDto = Joi.object({
     title: Joi.string().trim(),
     content: Joi.string().trim(),
     author: Joi.string().trim(),
     created: FromToFilterDto,
     tags: TagsFilterDto,
-    lhcFills: LhcFillFilterDto,
+    fillNumbers: LhcFillFilterDto,
     runNumbers: RunFilterDto,
     origin: Joi.string()
         .valid('human', 'process'),

lib/public/views/Logs/ActiveColumns/logsActiveColumns.js

@@ -239,7 +239,7 @@ export const logsActiveColumns = {
          * @return {Component} the filter component
          */
         filter: ({ filteringModel }) => rawTextFilter(
-            filteringModel.get('lhcFills'),
+            filteringModel.get('fillNumbers'),
             {
                 id: 'lhcFillsFilterText',
                 classes: ['w-75', 'mt1'],

lib/public/views/Logs/Overview/LogsOverviewModel.js

@@ -45,7 +45,7 @@ export class LogsOverviewModel extends Observable {
             tags: new TagFilterModel(tagsProvider.items$),
             runNumbers: new RawTextFilterModel(),
             environmentIds: new RawTextFilterModel(),
-            lhcFills: new RawTextFilterModel(),
+            fillNumbers: new RawTextFilterModel(),
             created: new TimeRangeInputModel(),
         });
 
@@ -198,7 +198,7 @@ export class LogsOverviewModel extends Observable {
         const tags = this._filteringModel.get('tags');
         const runNumbers = this._filteringModel.get('runNumbers');
         const environmentIds = this._filteringModel.get('environmentIds');
-        const lhcFills = this._filteringModel.get('lhcFills');
+        const fillNumbers = this._filteringModel.get('fillNumbers');
         const created = this._filteringModel.get('created');
 
         return {
@@ -225,9 +225,8 @@ export class LogsOverviewModel extends Observable {
             ...!environmentIds.isEmpty && {
                 'filter[environmentIds]': environmentIds.normalized,
             },
-            ...!lhcFills.isEmpty && {
-                'filter[lhcFills][values]': lhcFills.normalized,
-                'filter[lhcFills][operation]': this.lhcFillFilterOperation.toLowerCase(),
+            ...!fillNumbers.isEmpty && {
+                'filter[fillNumbers]': fillNumbers.normalized,
             },
         };
     }

lib/usecases/log/GetAllLogsUseCase.js

@@ -39,7 +39,19 @@ const { checkForFilterExclusion } = require('../common/checkForFilterExclusion.j
  * @return {Promise<void>} resolves once the filter has been applied
  */
 const applyFilter = async (dataSource, queryBuilder, filter) => {
-    const { title, content, author, created, origin, parentLog, rootLog, rootOnly, runNumbers, environmentIds } = filter;
+    const {
+        title,
+        content,
+        author,
+        created,
+        origin,
+        parentLog,
+        rootLog,
+        rootOnly,
+        runNumbers,
+        environmentIds,
+        fillNumbers,
+    } = filter;
 
     if (title) {
         queryBuilder.where('title').substring(title);
@@ -126,24 +138,16 @@ const applyFilter = async (dataSource, queryBuilder, filter) => {
         queryBuilder.where('id').oneOf(...logIds);
     }
 
-    if (filter.lhcFills?.values?.length > 0) {
+    if (fillNumbers?.length > 0) {
         const logLhcFillQueryBuilder = dataSource.createQueryBuilder();
         logLhcFillQueryBuilder.include({
             association: 'lhcFill',
-            where: { fill_number: { [Op.in]: filter.lhcFills.values } },
+            where: { fill_number: { [Op.in]: fillNumbers } },
         }).orderBy('logId', 'asc');
 
-        let logLhcFills;
-        switch (filter.lhcFills.operation) {
-            case 'and':
-                logLhcFills = await LogLhcFillsRepository.findAllAndGroup(logLhcFillQueryBuilder);
-                logLhcFills = logLhcFills
-                    .filter((logLhcFill) => filter.lhcFills.values.every((fillNumber) => logLhcFill.fillNumbers.includes(fillNumber)));
-                break;
-            case 'or':
-                logLhcFills = await LogLhcFillsRepository.findAll(logLhcFillQueryBuilder);
-                break;
-        }
+        let logLhcFills = await LogLhcFillsRepository.findAllAndGroup(logLhcFillQueryBuilder);
+        logLhcFills = logLhcFills.filter((logLhcFill) =>
+            fillNumbers.every((fillNumber) => logLhcFill.fillNumbers.includes(fillNumber)));
 
         const logIds = logLhcFills.map((logLhcFill) => logLhcFill.logId);