fix(SW-366): add nights to next level

2024-09-05 08:02:48 +02:00
parent 2c2390a5bf
commit df38a718b5
3 changed files with 17 additions and 3 deletions
--- a/components/MyPages/Blocks/Overview/Stats/Points/PointsColumn/index.tsx
+++ b/components/MyPages/Blocks/Overview/Stats/Points/PointsColumn/index.tsx
@@ -39,12 +39,13 @@ export const StayOnLevelColumn = ({ points, subtitleParam }: PointsColumn) =>
 export const NextLevelNightsColumn = ({
  nights,
  subtitleParam,
+  subtitle = "by",
 }: NightsColumn) =>
  PointsColumn({
    nights,
    title: "Nights needed to level up",
    subtitleParam,
-    subtitle: "by",
+    subtitle,
  })

 async function PointsColumn({
@@ -72,7 +73,7 @@ async function PointsColumn({
        {points ?? nights ?? "N/A"}
      </Title>
      <Body color="white" textAlign="center">
-        {formatMessage({ id: subtitle })} {subtitleParam}
+        {subtitle ? formatMessage({ id: subtitle }) : ""} {subtitleParam}
      </Body>
    </article>
  )
--- a/components/MyPages/Blocks/Overview/Stats/Points/index.tsx
+++ b/components/MyPages/Blocks/Overview/Stats/Points/index.tsx
@@ -5,7 +5,11 @@ import { getMembershipLevelObject } from "@/utils/membershipLevel"
 import { getMembership } from "@/utils/user"

 import PointsContainer from "./Container"
-import { NextLevelPointsColumn, YourPointsColumn } from "./PointsColumn"
+import {
+  NextLevelNightsColumn,
+  NextLevelPointsColumn,
+  YourPointsColumn,
+} from "./PointsColumn"

 import { UserProps } from "@/types/components/myPages/user"

@@ -25,6 +29,13 @@ export default async function Points({ user }: UserProps) {
          subtitleParam={nextLevel.name}
        />
      )}
+      {membership?.nightsToTopTier && (
+        <NextLevelNightsColumn
+          nights={membership.nightsToTopTier}
+          subtitleParam={membership.tierExpirationDate}
+          subtitle={membership.tierExpirationDate ? "by" : ""}
+        />
+      )}
    </PointsContainer>
  )
 }
--- a/server/routers/user/output.ts
+++ b/server/routers/user/output.ts
@@ -24,9 +24,11 @@ export const getUserSchema = z.object({
      memberSince: z.string(),
      membershipType: z.string(),
      nextLevel: z.string().optional(),
+      nightsToTopTier: z.number().optional(),
      pointsExpiryDate: z.string().optional(),
      pointsRequiredToNextlevel: z.number().optional(),
      pointsToExpire: z.number().optional(),
+      tierExpirationDate: z.string().optional(),
    })
  ),
  phoneNumber: z.string().optional(),