fix: make zip code and phone nr optional

This commit is contained in:
Chuma McPhoy
2024-06-24 16:53:25 +02:00
parent bc30e632ea
commit 352ca6b755
2 changed files with 10 additions and 7 deletions

View File

@@ -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(),
})

View File

@@ -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