From 593cb04a5a2e32e49b98fa3d0b6db4d577c8a59f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20J=C3=A4derberg?=
 <joakim.jaderberg@scandichotels.com>
Date: Wed, 12 Nov 2025 12:20:47 +0000
Subject: [PATCH] Merged in fix/SW-3608-make-user-properties-optional (pull
 request #3133)

fix(SW-3608): make user properties, that are based on audience, optional

* fix(SW-3608): make user properties, that are based on audience, optional

* fix(SW-3608): make user properties, that are based on audience, optional

* .


Approved-by: Anton Gunnarsson
---
 packages/trpc/lib/routers/user/helpers.ts | 2 +-
 packages/trpc/lib/routers/user/output.ts  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/trpc/lib/routers/user/helpers.ts b/packages/trpc/lib/routers/user/helpers.ts
index e8d458141..1f2ead6ca 100644
--- a/packages/trpc/lib/routers/user/helpers.ts
+++ b/packages/trpc/lib/routers/user/helpers.ts
@@ -23,7 +23,7 @@ export function getFriendsMembership(userLoyalty: UserLoyalty) {
 
   if (!friendsMembership) return null
 
-  const pointExpiration = loyalty.pointExpirations
+  const pointExpiration = (loyalty.pointExpirations ?? [])
     .sort(
       (a, b) => new Date(a.expires).getTime() - new Date(b.expires).getTime()
     )
diff --git a/packages/trpc/lib/routers/user/output.ts b/packages/trpc/lib/routers/user/output.ts
index 34a7d754b..a4db4021d 100644
--- a/packages/trpc/lib/routers/user/output.ts
+++ b/packages/trpc/lib/routers/user/output.ts
@@ -76,13 +76,13 @@ export const userLoyaltySchema = z.object({
   memberships: z.array(membershipSchema),
   points: z.object({
     spendable: z.number().int(),
-    earned: z.number().int(),
-    spent: z.number().int(),
+    earned: z.number().int().optional(),
+    spent: z.number().int().optional(),
   }),
   tier: scandicFriendsTier,
   tierExpires: z.string(),
   tierBoostedBy: z.string().nullish(),
-  pointExpirations: z.array(pointExpirationSchema),
+  pointExpirations: z.array(pointExpirationSchema).optional(),
 })
 
 export const getUserSchema = z
@@ -99,7 +99,7 @@ export const getUserSchema = z
           .optional(),
         lastName: z.string(),
         phoneNumber: z.string().optional(),
-        profileId: z.string(),
+        profileId: z.string().optional(),
         membershipNumber: z.string(),
         address: z
           .object({