fix: add bookingCode to product

apps/scandic-web/server/routers/hotels/output.ts

@@ -267,6 +267,11 @@ export const roomsAvailabilitySchema = z
         return null
       }
 
+      if (attributes.bookingCode) {
+        product.bookingCode = attributes.bookingCode
+      } else {
+        product.bookingCode = undefined
+      }
       product.breakfastIncluded = rateDefinition.breakfastIncluded
       product.rate = rate
       product.rateDefinition = rateDefinition

apps/scandic-web/server/routers/hotels/schemas/roomAvailability/configuration.ts

@@ -8,63 +8,51 @@ import {
   voucherProduct,
 } from "./product"
 
-import {
-  AvailabilityEnum,
-} from "@/types/components/hotelReservation/selectHotel/selectHotel"
-import {
-  RoomPackageCodeEnum,
-} from "@/types/components/hotelReservation/selectRate/roomFilter"
+import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel"
+import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
 
-export const roomConfigurationSchema = z
-  .object({
-    breakfastIncludedInAllRatesMember: z.boolean().default(false),
-    breakfastIncludedInAllRates: z.boolean().default(false),
-    features: z
-      .array(
-        z.object({
-          inventory: z.number(),
-          code: z.enum([
-            RoomPackageCodeEnum.PET_ROOM,
-            RoomPackageCodeEnum.ALLERGY_ROOM,
-            RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
-          ]),
-        })
-      )
-      .default([]),
-    products: z.array(productSchema).default([]),
-    roomsLeft: z.number(),
-    roomType: z.string(),
-    roomTypeCode: z.string(),
-    status: z
-      .nativeEnum(AvailabilityEnum)
-      .nullish()
-      .default(AvailabilityEnum.NotAvailable),
+export const roomConfigurationSchema = z.object({
+  breakfastIncludedInAllRatesMember: z.boolean().default(false),
+  breakfastIncludedInAllRates: z.boolean().default(false),
+  features: z
+    .array(
+      z.object({
+        inventory: z.number(),
+        code: z.enum([
+          RoomPackageCodeEnum.PET_ROOM,
+          RoomPackageCodeEnum.ALLERGY_ROOM,
+          RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
+        ]),
+      })
+    )
+    .default([]),
+  products: z.array(productSchema).default([]),
+  roomsLeft: z.number(),
+  roomType: z.string(),
+  roomTypeCode: z.string(),
+  status: z
+    .nativeEnum(AvailabilityEnum)
+    .nullish()
+    .default(AvailabilityEnum.NotAvailable),
 
-    // Red
-    campaign: z
-      .array(priceProduct)
-      .nullish()
-      .transform(val => val ? val.filter(Boolean) : []),
-    // Blue
-    code: z
-      .array(
-        z
-          .union([
-            corporateChequeProduct,
-            priceProduct,
-            voucherProduct,
-          ])
-      )
-      .nullish()
-      .transform(val => val ? val.filter(Boolean) : []),
-    // Beige
-    regular: z
-      .array(priceProduct)
-      .nullish()
-      .transform(val => val ? val.filter(Boolean) : []),
-    // Burgundy
-    redemptions: z
-      .array(redemptionProduct)
-      .nullish()
-      .transform(val => val ? val.filter(Boolean) : []),
-  })
+  // Red
+  campaign: z
+    .array(priceProduct)
+    .optional()
+    .transform((val) => (val ? val.filter(Boolean) : [])),
+  // Blue
+  code: z
+    .array(z.union([corporateChequeProduct, priceProduct, voucherProduct]))
+    .optional()
+    .transform((val) => (val ? val.filter(Boolean) : [])),
+  // Beige
+  regular: z
+    .array(priceProduct)
+    .optional()
+    .transform((val) => (val ? val.filter(Boolean) : [])),
+  // Burgundy
+  redemptions: z
+    .array(redemptionProduct)
+    .optional()
+    .transform((val) => (val ? val.filter(Boolean) : [])),
+})

apps/scandic-web/server/routers/hotels/schemas/roomAvailability/product.ts

@@ -9,6 +9,11 @@ import {
 import { rateDefinitionSchema } from "./rateDefinition"
 
 const baseProductSchema = z.object({
+  // transform empty string to undefined
+  bookingCode: z
+    .string()
+    .optional()
+    .transform((val) => val),
   // Is breakfast included on product
   breakfastIncluded: z.boolean().default(false),
   // Used to set the rate that we use to chose titles etc.
@@ -35,13 +40,14 @@ const baseProductSchema = z.object({
 
 function mapBaseProduct(baseProduct: typeof baseProductSchema._type) {
   return {
+    bookingCode: baseProduct.bookingCode,
     breakfastIncluded: baseProduct.breakfastIncluded,
     rate: baseProduct.rate,
     rateDefinition: baseProduct.rateDefinition,
   }
 }
 
-const rawCorporateChequeProduct = z
+export const corporateChequeProduct = z
   .object({
     productType: z
       .object({
@@ -52,21 +58,12 @@ const rawCorporateChequeProduct = z
       })),
   })
   .merge(baseProductSchema)
-
-function transformCorporateCheque(
-  data: z.output<typeof rawCorporateChequeProduct>
-) {
-  return {
+  .transform((data) => ({
     ...data.productType,
     ...mapBaseProduct(data),
-  }
-}
+  }))
 
-export const corporateChequeProduct = rawCorporateChequeProduct.transform(
-  transformCorporateCheque
-)
-
-const rawPriceProduct = z
+export const priceProduct = z
   .object({
     productType: z.object({
       member: productTypePriceSchema.nullish().default(null),
@@ -74,63 +71,58 @@ const rawPriceProduct = z
     }),
   })
   .merge(baseProductSchema)
-
-function transformPriceProduct(data: z.output<typeof rawPriceProduct>) {
-  return {
+  .transform((data) => ({
     ...data.productType,
     ...mapBaseProduct(data),
-  }
-}
-
-export const priceProduct = rawPriceProduct.transform(transformPriceProduct)
+  }))
 
 export const redemptionProduct = z
   .object({
     redemption: productTypePointsSchema,
   })
   .merge(baseProductSchema)
+  .transform((data) => ({
+    redemption: data.redemption,
+    ...mapBaseProduct(data),
+  }))
 
-const rawRedemptionsProduct = z.object({
-  type: z.literal("REDEMPTION").optional().default("REDEMPTION"),
-  productType: z.object({
-    redemptions: z
-      .array(productTypePointsSchema.merge(baseProductSchema))
-      .transform((data) =>
-        data.map(
-          ({ breakfastIncluded, rate, rateDefinition, ...redemption }) => ({
-            breakfastIncluded,
-            rate,
-            rateDefinition,
-            redemption,
-          })
-        )
-      ),
-  }),
-})
-
-export const redemptionsProduct = rawRedemptionsProduct.transform(
-  (data) => data.productType.redemptions
-)
-
-const rawVoucherProduct = z
+export const redemptionsProduct = z
+  .object({
+    productType: z.object({
+      redemptions: z
+        .array(productTypePointsSchema.merge(baseProductSchema))
+        .transform((data) =>
+          data.map(
+            ({
+              bookingCode,
+              breakfastIncluded,
+              rate,
+              rateDefinition,
+              ...redemption
+            }) => ({
+              bookingCode,
+              breakfastIncluded,
+              rate,
+              rateDefinition,
+              redemption,
+            })
+          )
+        ),
+    }),
+  })
+  .transform((data) => data.productType.redemptions)
+
+export const voucherProduct = z
   .object({
-    type: z.literal("VOUCHER").optional().default("VOUCHER"),
     productType: z.object({
       voucher: productTypeVoucherSchema,
     }),
   })
   .merge(baseProductSchema)
-
-function transformVoucherProduct(data: z.output<typeof rawVoucherProduct>) {
-  return {
+  .transform((data) => ({
     ...data.productType,
     ...mapBaseProduct(data),
-  }
-}
-
-export const voucherProduct = rawVoucherProduct.transform(
-  transformVoucherProduct
-)
+  }))
 
 export const productSchema = z.union([
   corporateChequeProduct,
@@ -138,24 +130,3 @@ export const productSchema = z.union([
   voucherProduct,
   priceProduct,
 ])
-// export const productSchema = z.discriminatedUnion(
-//   "type",
-//   [
-//     rawCorporateChequeProduct,
-//     rawPriceProduct,
-//     rawRedemptionsProduct,
-//     rawVoucherProduct,
-//   ]
-// )
-//   .transform(data => {
-//     switch (data.type) {
-//       case "CORPORATECHEQUE":
-//         return transformCorporateCheque(data)
-//       case "PRICEPRODUCT":
-//         return transformPriceProduct(data)
-//       case "REDEMPTION":
-//         return data.productType.redemptions
-//       case "VOUCHER":
-//         return transformVoucherProduct(data)
-//     }
-//   })