From 352ca6b755f6170abfad9919dd61ea178b90151b Mon Sep 17 00:00:00 2001
From: Chuma McPhoy <chuma.mcphoy@scandichotels.com>
Date: Mon, 24 Jun 2024 16:53:25 +0200
Subject: [PATCH] fix: make zip code and phone nr optional

---
 server/routers/user/output.ts |  4 ++--
 server/routers/user/query.ts  | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/routers/user/output.ts b/server/routers/user/output.ts
index 8a7f3b06b..dd75d2be5 100644
--- a/server/routers/user/output.ts
+++ b/server/routers/user/output.ts
@@ -10,7 +10,7 @@ export const getUserSchema = z.object({
     country: z.string().optional(),
     countryCode: z.nativeEnum(countriesMap).optional(),
     streetAddress: z.string().optional(),
-    zipCode: z.string(),
+    zipCode: z.string().optional(),
   }),
   dateOfBirth: z.string().optional().default("N/A"),
   email: z.string().email(),
@@ -27,7 +27,7 @@ export const getUserSchema = z.object({
       membershipType: z.string(),
     })
   ),
-  phoneNumber: z.string(),
+  phoneNumber: z.string().optional(),
   profileId: z.string(),
 })
 
diff --git a/server/routers/user/query.ts b/server/routers/user/query.ts
index 0a989b56d..43dbe8da1 100644
--- a/server/routers/user/query.ts
+++ b/server/routers/user/query.ts
@@ -1,4 +1,4 @@
-import { parsePhoneNumber } from "libphonenumber-js"
+import { isValidPhoneNumber, parsePhoneNumber } from "libphonenumber-js"
 
 import * as api from "@/lib/api"
 import { protectedProcedure, router } from "@/server/trpc"
@@ -78,7 +78,6 @@ export const userQueryRouter = router({
       const country = countries.find(
         (c) => c.code === verifiedData.data.address.countryCode
       )
-      const phonenumber = parsePhoneNumber(verifiedData.data.phoneNumber)
 
       const user = {
         ...extendedUser,
@@ -96,7 +95,7 @@ export const userQueryRouter = router({
         lastName: verifiedData.data.lastName,
         memberships: verifiedData.data.memberships,
         name: `${verifiedData.data.firstName} ${verifiedData.data.lastName}`,
-        phoneNumber: phonenumber.formatInternational(),
+        phoneNumber: verifiedData.data.phoneNumber,
         profileId: verifiedData.data.profileId,
       }
 
@@ -110,10 +109,14 @@ export const userQueryRouter = router({
           )
         }
 
-        user.address.zipCode = maskValue.text(verifiedData.data.address.zipCode)
+        user.address.zipCode = verifiedData.data.address?.zipCode
+          ? maskValue.text(verifiedData.data.address.zipCode)
+          : undefined
         user.email = maskValue.email(user.email)
 
-        user.phoneNumber = `+${phonenumber.countryCallingCode} ${maskValue.phone(user.phoneNumber)}`
+        user.phoneNumber = user.phoneNumber
+          ? maskValue.phone(user.phoneNumber)
+          : undefined
       }
 
       return user