From 56d374f019e34046c98f293a9d863da7fd545a4c Mon Sep 17 00:00:00 2001
From: Christel Westerberg <christel.westerberg@scandichotels.com>
Date: Thu, 22 Aug 2024 11:40:40 +0200
Subject: [PATCH] fix: zod validate after cruching data

---
 .../routers/contentstack/loyaltyPage/query.ts | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/server/routers/contentstack/loyaltyPage/query.ts b/server/routers/contentstack/loyaltyPage/query.ts
index 589b39544..34bc7aa24 100644
--- a/server/routers/contentstack/loyaltyPage/query.ts
+++ b/server/routers/contentstack/loyaltyPage/query.ts
@@ -85,18 +85,6 @@ export const loyaltyPageQueryRouter = router({
       throw notFound(response)
     }
 
-    const validatedLoyaltyPage = validateLoyaltyPageSchema.safeParse(
-      response.data.loyalty_page
-    )
-
-    if (!validatedLoyaltyPage.success) {
-      console.error(
-        `Failed to validate Loyaltypage Data - (lang: ${lang}, uid: ${uid})`
-      )
-      console.error(validatedLoyaltyPage.error)
-      return null
-    }
-
     const blocks = response.data.loyalty_page.blocks
       ? response.data.loyalty_page.blocks.map((block: any) => {
           switch (block.__typename) {
@@ -190,7 +178,7 @@ export const loyaltyPageQueryRouter = router({
         })
       : null
 
-    const loyaltyPage: LoyaltyPage = {
+    const loyaltyPage = {
       heading: response.data.loyalty_page.heading,
       preamble: response.data.loyalty_page.preamble,
       heroImage: makeImageVaultImage(response.data.loyalty_page.hero_image),
@@ -199,6 +187,16 @@ export const loyaltyPageQueryRouter = router({
       sidebar,
     }
 
+    const validatedLoyaltyPage =
+      validateLoyaltyPageSchema.safeParse(loyaltyPage)
+    if (!validatedLoyaltyPage.success) {
+      console.error(
+        `Failed to validate Loyaltypage Data - (lang: ${lang}, uid: ${uid})`
+      )
+      console.error(validatedLoyaltyPage.error)
+      return null
+    }
+
     const loyaltyTrackingData: TrackingSDKPageData = {
       pageId: response.data.loyalty_page.system.uid,
       lang: response.data.loyalty_page.system.locale as Lang,