Merge in feat/SW-415-select-room-card (pull request #663)

Feat/SW-415 select room card

server/routers/hotels/output.ts

@@ -425,26 +425,39 @@ const roomFacilitiesSchema = z.object({
   sortOrder: z.number(),
 })
 
-export const roomSchema = z.object({
-  attributes: z.object({
-    name: z.string(),
-    sortOrder: z.number(),
-    content: roomContentSchema,
-    roomTypes: z.array(roomTypesSchema),
-    roomFacilities: z.array(roomFacilitiesSchema),
-    occupancy: z.object({
-      total: z.number(),
-      adults: z.number(),
-      children: z.number(),
+export const roomSchema = z
+  .object({
+    attributes: z.object({
+      name: z.string(),
+      sortOrder: z.number(),
+      content: roomContentSchema,
+      roomTypes: z.array(roomTypesSchema),
+      roomFacilities: z.array(roomFacilitiesSchema),
+      occupancy: z.object({
+        total: z.number(),
+        adults: z.number(),
+        children: z.number(),
+      }),
+      roomSize: z.object({
+        min: z.number(),
+        max: z.number(),
+      }),
     }),
-    roomSize: z.object({
-      min: z.number(),
-      max: z.number(),
-    }),
-  }),
-  id: z.string(),
-  type: z.enum(["roomcategories"]),
-})
+    id: z.string(),
+    type: z.enum(["roomcategories"]),
+  })
+  .transform((data) => {
+    return {
+      descriptions: data.attributes.content.texts.descriptions,
+      id: data.id,
+      images: data.attributes.content.images,
+      name: data.attributes.name,
+      occupancy: data.attributes.occupancy,
+      roomSize: data.attributes.roomSize,
+      sortOrder: data.attributes.sortOrder,
+      type: data.type,
+    }
+  })
 
 const merchantInformationSchema = z.object({
   webMerchantId: z.string(),
@@ -572,40 +585,23 @@ export type HotelsAvailability = z.infer<typeof hotelsAvailabilitySchema>
 export type HotelsAvailabilityPrices =
   HotelsAvailability["data"][number]["attributes"]["bestPricePerNight"]
 
+const priceSchema = z.object({
+  pricePerNight: z.string(),
+  pricePerStay: z.string(),
+  currency: z.string(),
+})
+
+export const productTypePriceSchema = z.object({
+  rateCode: z.string(),
+  rateType: z.string().optional(),
+  localPrice: priceSchema,
+  requestedPrice: priceSchema.optional(),
+})
+
 const productSchema = z.object({
   productType: z.object({
-    public: z.object({
-      rateCode: z.string(),
-      rateType: z.string().optional(),
-      localPrice: z.object({
-        pricePerNight: z.string(),
-        pricePerStay: z.string(),
-        currency: z.string(),
-      }),
-      requestedPrice: z
-        .object({
-          pricePerNight: z.string(),
-          pricePerStay: z.string(),
-          currency: z.string(),
-        })
-        .optional(),
-    }),
-    member: z.object({
-      rateCode: z.string(),
-      rateType: z.string().optional(),
-      localPrice: z.object({
-        pricePerNight: z.string(),
-        pricePerStay: z.string(),
-        currency: z.string(),
-      }),
-      requestedPrice: z
-        .object({
-          pricePerNight: z.string(),
-          pricePerStay: z.string(),
-          currency: z.string(),
-        })
-        .optional(),
-    }),
+    public: productTypePriceSchema.optional(),
+    member: productTypePriceSchema.optional(),
   }),
 })
 

server/routers/hotels/query.ts

@@ -635,6 +635,7 @@ export const hotelQueryRouter = router({
             query: { hotelId, params: params },
           })
         )
+
         return validateHotelData.data
       }),
   }),