dp/fix-date-handling

theopensystemslab · Oct 6, 2023 · 262a35b · 262a35b
1 parent 65f2218
commit 262a35b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/api.planx.uk/modules/webhooks/service/lowcalSessionEvents/schema.ts b/api.planx.uk/modules/webhooks/service/lowcalSessionEvents/schema.ts
@@ -4,7 +4,7 @@ import { ScheduledEventResponse } from "../../../../hasura/metadata";
 
 export const createSessionEventSchema = z.object({
   body: z.object({
-    createdAt: z.string().transform((val) => new Date(val)),
+    createdAt: z.string().pipe(z.coerce.date()),
     payload: z.object({
       sessionId: z.string(),
     }),

diff --git a/api.planx.uk/modules/webhooks/service/paymentRequestEvents/schema.ts b/api.planx.uk/modules/webhooks/service/paymentRequestEvents/schema.ts
@@ -4,7 +4,7 @@ import { ScheduledEventResponse } from "../../../../hasura/metadata";
 
 export const createPaymentEventSchema = z.object({
   body: z.object({
-    createdAt: z.string().transform((val) => new Date(val)),
+    createdAt: z.string().pipe(z.coerce.date()),
     payload: z.object({
       paymentRequestId: z.string(),
     }),

diff --git a/api.planx.uk/shared/middleware/validate.ts b/api.planx.uk/shared/middleware/validate.ts
@@ -13,11 +13,18 @@ export const validate =
     next: NextFunction,
   ) => {
     try {
-      schema.parse({
+      const parsedReq = schema.parse({
         params: req.params,
         body: req.body,
         query: req.query,
       });
+
+      // Assign parsed values to the request object
+      // Required for schemas to transform or coerce raw requests
+      req.params = parsedReq.params;
+      req.body = parsedReq.body;
+      req.query = parsedReq.query;
+
       return next();
     } catch (error) {
       console.error(error);