Merged in feat/3614-basicInfo (pull request #3427)

feat(SW-3614): use new loyalty prop in basicProfile

* feat(SW-3614): use new loyalty prop in basicProfile

* PR fixes


Approved-by: Matilda Landström

packages/trpc/lib/routers/user/query/userTrackingInfo.ts

@@ -3,6 +3,7 @@ import { createCounter } from "@scandic-hotels/common/telemetry"
 import { safeProtectedProcedure } from "../../../procedures"
 import { isValidSession } from "../../../utils/session"
 import { getEuroBonusProfileData } from "../../partners/sas/getEuroBonusProfile"
+import { scandicMembershipTypes } from "../helpers"
 import { getBasicUser } from "../utils/getBasicUser"
 
 import type { LoginType } from "@scandic-hotels/common/constants/loginType"
@@ -62,8 +63,10 @@ async function getScandicFriendsUserTrackingData(session: Session | null) {
       loginStatus: "logged in",
       loginType: session.token.loginType as LoginType,
       memberId: verifiedUserData.profileId,
-      membershipNumber: verifiedUserData.membershipNumber,
-      memberLevel: verifiedUserData?.tier,
+      membershipNumber: verifiedUserData.loyalty?.memberships?.find(
+        (m) => m.membershipType === scandicMembershipTypes.SCANDIC_NATIVE
+      )?.membershipNumber,
+      memberLevel: verifiedUserData.loyalty?.tier,
       loginAction: "login success",
       memberType,
     }
@@ -134,7 +137,9 @@ async function getScandicFriendsDataHelper(scandicUserToken: string | null) {
 
   return {
     memberId: verifiedUserData.profileId,
-    membershipNumber: verifiedUserData.membershipNumber,
-    memberLevel: verifiedUserData.tier,
+    membershipNumber: verifiedUserData.loyalty?.memberships?.find(
+      (m) => m.membershipType === scandicMembershipTypes.SCANDIC_NATIVE
+    )?.membershipNumber,
+    memberLevel: verifiedUserData.loyalty?.tier,
   }
 }