From b070979723a87bff8152e1ff55053c48c19e992f Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Wed, 6 Nov 2024 16:22:34 +0100 Subject: [PATCH] Allow new shipcalls up to 1 day in the past for serverside validation --- .../BreCal/validators/input_validation_shipcall.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/BreCal/validators/input_validation_shipcall.py b/src/server/BreCal/validators/input_validation_shipcall.py index 1c9733a..a6d1555 100644 --- a/src/server/BreCal/validators/input_validation_shipcall.py +++ b/src/server/BreCal/validators/input_validation_shipcall.py @@ -372,7 +372,7 @@ class InputValidationShipcall(): if (eta is None) and (etd is None): return - time_in_a_year = time_now.replace(time_now.year + 1) + time_in_a_year = datetime.datetime.now().replace(datetime.datetime.now().year + 1) if type_ is None: raise ValidationError({"type":f"when providing 'eta' or 'etd', one must provide the type of the shipcall, so the datetimes can be verified."}) @@ -430,18 +430,18 @@ class InputValidationShipcall(): return @staticmethod - def check_tidal_window_in_future(type_, time_now, tidal_window_from, tidal_window_to): + def check_tidal_window_in_future(type_, time_ref, tidal_window_from, tidal_window_to): - time_in_a_year = time_now.replace(time_now.year + 1) + time_in_a_year = datetime.datetime.now().replace(datetime.datetime.now().year + 1) if tidal_window_to is not None: - if not tidal_window_to >= time_now: + if not tidal_window_to >= time_ref: raise ValidationError({"tidal_window_to":f"'tidal_window_to' must be in the future. Incorrect datetime provided."}) if tidal_window_to > time_in_a_year: raise ValidationError({"tidal_window_to":f"'tidal_window_to' is more than a year in the future. Found: {tidal_window_to}."}) if tidal_window_from is not None: - if not tidal_window_from >= time_now: + if not tidal_window_from >= time_ref: raise ValidationError({"tidal_window_from":f"'tidal_window_from' must be in the future. Incorrect datetime provided."}) if tidal_window_from > time_in_a_year: raise ValidationError({"tidal_window_from":f"'tidal_window_from' is more than a year in the future. Found: {tidal_window_from}."})