Merge remote-tracking branch 'origin' into feature/tracking

server/routers/hotels/output.ts

@@ -1,6 +1,6 @@
 import { z } from "zod"
 
-import { ChildBedTypeEnum, PaymentMethodEnum } from "@/constants/booking"
+import { ChildBedTypeEnum ,type  PaymentMethodEnum } from "@/constants/booking"
 import { dt } from "@/lib/dt"
 import { toLang } from "@/server/utils"
 
@@ -514,7 +514,7 @@ const linksSchema = z.object({
 export const priceSchema = z.object({
   pricePerNight: z.coerce.number(),
   pricePerStay: z.coerce.number(),
-  currency: z.string(),
+  currency: z.nativeEnum(CurrencyEnum),
 })
 
 export const productTypePriceSchema = z.object({
@@ -530,7 +530,7 @@ const productSchema = z.object({
       rateCode: "",
       rateType: "",
       localPrice: {
-        currency: "SEK",
+        currency: CurrencyEnum.SEK,
         pricePerNight: 0,
         pricePerStay: 0,
       },

server/routers/hotels/query.ts

@@ -547,7 +547,7 @@ export const hotelQueryRouter = router({
         const hotelData = await getHotelData(
           {
             hotelId,
-            language: ctx.lang,
+            language: toApiLang(ctx.lang),
           },
           ctx.serviceToken
         )
@@ -607,14 +607,18 @@ export const hotelQueryRouter = router({
         const bedTypes = availableRoomsInCategory
           .map((availRoom) => {
             const matchingRoom = hotelData?.included
-              ?.find((room) => room.name === availRoom.roomType)
+              ?.find((room) =>
+                room.roomTypes
+                  .map((roomType) => roomType.code)
+                  .includes(availRoom.roomTypeCode)
+              )
               ?.roomTypes.find(
                 (roomType) => roomType.code === availRoom.roomTypeCode
               )
 
             if (matchingRoom) {
               return {
-                description: matchingRoom.mainBed.description,
+                description: matchingRoom.description,
                 size: matchingRoom.mainBed.widthRange,
                 value: matchingRoom.code,
               }