validation(refactor): remove functions and add new issue

digitalservicebund · Dec 23, 2024 · 548c16a · 548c16a
1 parent a4900ea
commit 548c16a
Showing 1 changed file with 8 additions and 47 deletions.
diff --git a/app/domains/fluggastrechte/formular/services/validation.ts b/app/domains/fluggastrechte/formular/services/validation.ts
@@ -7,53 +7,6 @@ function convertToTimestamp(date: string, time: string): number {
   const [hours, minutes] = time.split(":").map(Number);
   return new Date(year, month - 1, day, hours, minutes).getTime();
 }
-function convertToDate(date: string): number {
-  const [day, month, year] = date.split(".").map(Number);
-  return new Date(year, month - 1, day).getTime();
-}
-
-export function getArrivalTimeDelayValidator(
-  baseSchema: ValidationMultipleFieldsBaseSchema,
-) {
-  return baseSchema.refine(
-    (data) => {
-      const arrivalTimestamp = convertToTimestamp(
-        data.tatsaechlicherAnkunftsDatum,
-        data.tatsaechlicherAnkunftsZeit,
-      );
-      const departureTimestamp = convertToTimestamp(
-        data.direktAbflugsDatum,
-        data.direktAbflugsZeit,
-      );
-
-      const minimumTimeDifferenceInMs = 3 * 60 * 60 * 1000; // 3 hours in milliseconds
-      const actualTimeDifferenceInMs = arrivalTimestamp - departureTimestamp;
-      return actualTimeDifferenceInMs >= minimumTimeDifferenceInMs;
-    },
-    {
-      message: "invalidTimeDelay",
-      path: ["tatsaechlicherAnkunftsZeit"],
-    },
-  );
-}
-
-export function getArrivalDateValidator(
-  baseSchema: ValidationMultipleFieldsBaseSchema,
-) {
-  return baseSchema.refine(
-    (data) => {
-      const arrivalDate = convertToDate(data.tatsaechlicherAnkunftsDatum);
-      const departureDate = convertToDate(data.direktAbflugsDatum);
-
-      const actualTimeDifferenceInMs = arrivalDate - departureDate;
-      return actualTimeDifferenceInMs >= 0;
-    },
-    {
-      message: "invalidDate",
-      path: ["tatsaechlicherAnkunftsDatum"],
-    },
-  );
-}
 
 export function validateDepartureAfterArrival(
   baseSchema: ValidationMultipleFieldsBaseSchema,
@@ -70,6 +23,14 @@ export function validateDepartureAfterArrival(
     );
 
     if (departureDateTime > arrivalDateTime) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "too_late",
+        path: ["direktAnkunftsZeit"],
+        fatal: true,
+      });
+
+      // add new issue to invalidate this field as well
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
         message: "too_late",