[O2B-1505] Fixed validateTime error handling, removed unused code, TODO validate tests

Author: Houwie7000

lib/domain/dtos/filters/NumericalComparisonDto.js

@@ -24,3 +24,5 @@ exports.FloatComparisonDto = Joi.object({
     operator: Joi.string().valid(...NUMERICAL_COMPARISON_OPERATORS),
     limit: Joi.number().min(0),
 });
+
+exports.NUMERICAL_COMPARISON_OPERATORS = NUMERICAL_COMPARISON_OPERATORS;

lib/public/views/LhcFills/LhcFills.js

@@ -29,7 +29,7 @@ export default class LhcFills extends Observable {
         this.model = model;
 
         // Sub-models
-        this._overviewModel = new LhcFillsOverviewModel(model, true);
+        this._overviewModel = new LhcFillsOverviewModel(true);
         this._overviewModel.bubbleTo(this);
 
         this._detailsModel = new LhcFillDetailsModel();

lib/public/views/LhcFills/Overview/LhcFillsOverviewModel.js

@@ -31,7 +31,7 @@ export class LhcFillsOverviewModel extends OverviewPageModel {
      * @param {model} model global model
      * @param {boolean} [stableBeamsOnly=false] if true, overview will load stable beam only
      */
-    constructor(model, stableBeamsOnly = false) {
+    constructor(stableBeamsOnly = false) {
         super();
 
         this._filteringModel = new FilteringModel({

lib/utilities/validateTime.js

@@ -11,20 +11,30 @@
  * or submit itself to any jurisdiction.
  */
 import Joi from 'joi';
+import { NUMERICAL_COMPARISON_OPERATORS } from '../domain/dtos/filters/NumericalComparisonDto.js';
 
 const joiTimeDurationErrorText = 'Invalid duration value';
 
 /**
  * Transform digital time in string format
  *
- * @param {*} incomingValue  The time to transform
- * @returns {number} The value as seconds (Number)
+ * @param {string} incomingValue  The time to transform
+ * @param {*} helpers The Joi helpers object
+ * @returns {number|import("joi").ValidationError} The value if transformation passes, as seconds (Number)
  */
-export const transformTime = (incomingValue) => {
-    // Extract time to seconds...
-    const [hoursStr, minutesStr, secondsStr] = incomingValue.split(':');
+export const transformTime = (incomingValue, helpers) => {
+    try {
+        // Extract time to seconds...
+        const [hoursStr, minutesStr, secondsStr] = incomingValue.split(':');
 
-    return Number(hoursStr) * 3600 + Number(minutesStr) * 60 + Number(secondsStr);
+        const hours = Number(hoursStr);
+        const minutes = Number(minutesStr);
+        const seconds = Number(secondsStr);
+
+        return hours * 3600 + minutes * 60 + seconds;
+    } catch (error) {
+        return helpers.error('any.invalid', { message: `Validation error: ${error?.message ?? 'failed to transform time'}` });
+    }
 };
 
 /**
@@ -36,7 +46,6 @@ export const validateTimeDuration = Joi.object({
     limit: Joi.string().trim().pattern(/^\d+:[0-5]?\d:[0-5]?\d$/).custom(transformTime).messages({
         'string.pattern.base': joiTimeDurationErrorText,
         'string.base': joiTimeDurationErrorText,
-        'any.invalid': joiTimeDurationErrorText,
     }),
-    operator: Joi.string().trim().min(1).max(2),
+    operator: Joi.string().valid(...NUMERICAL_COMPARISON_OPERATORS),
 });