Merged in fix/warmup-autocomplete-data-2 (pull request #2218)

fix: chunked data overwrote it self

* fix: chunked data overwrote it self


Approved-by: Linus Flood

apps/scandic-web/server/routers/autocomplete/destinations.ts

@@ -41,7 +41,6 @@ export const getDestinationsAutoCompleteRoute = safeProtectedServiceProcedure
   .input(destinationsAutoCompleteInputSchema)
   .query(async ({ ctx, input }): Promise<DestinationsAutoCompleteOutput> => {
     const lang = input.lang || ctx.lang
-
     const locations: AutoCompleteLocation[] =
       await getAutoCompleteDestinationsData({
         lang,
@@ -107,6 +106,7 @@ export async function getAutoCompleteDestinationsData({
       })
 
       if (!countries) {
+        console.error("Unable to fetch countries")
         throw new Error("Unable to fetch countries")
       }
 
@@ -142,6 +142,7 @@ export async function getAutoCompleteDestinationsData({
         !cityUrls ||
         !countryUrls
       ) {
+        console.error("Unable to fetch location URLs")
         throw new Error("Unable to fetch location URLs")
       }
 

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

@@ -253,7 +253,6 @@ export async function getLocations({
   serviceToken: string
 }) {
   const cacheClient = await getCacheClient()
-
   return await cacheClient.cacheOrGet(
     `${lang}:locations`.toLowerCase(),
     async () => {
@@ -286,13 +285,12 @@ export async function getLocations({
         console.error(verifiedLocations.error)
         throw new Error("Unable to parse locations")
       }
-
       const chunkedLocations = chunk(verifiedLocations.data.data, 10)
+
       let locations: z.infer<typeof locationsSchema>["data"] = []
 
       for (const chunk of chunkedLocations) {
-        locations = [
+        const chunkLocations = await Promise.all(
-          ...(await Promise.all(
           chunk.map(async (location) => {
             if (location.type === "cities") {
               if (citiesByCountry) {
@@ -331,8 +329,9 @@ export async function getLocations({
 
             return location
           })
-          )),
+        )
-        ]
+
+        locations.push(...chunkLocations)
       }
 
       return locations
@@ -523,8 +522,7 @@ export async function getHotelsByHotelIds({
 
       const hotels: DestinationPagesHotelData[] = []
       for (const hotelIdChunk of chunkedHotelIds) {
-        hotels.push(
+        const chunkedHotels = await Promise.all(
-          ...(await Promise.all(
           hotelIdChunk.map(async (hotelId) => {
             const hotelResponse = await getHotel(
               { hotelId, language: lang, isCardOnlyPayment: false },
@@ -551,16 +549,16 @@ export async function getHotelsByHotelIds({
                 type: hotel.type,
                 address: hotel.address,
                 cityIdentifier: cities?.[0]?.cityIdentifier,
-                  hotelDescription:
+                hotelDescription: hotel.hotelContent?.texts.descriptions?.short,
-                    hotel.hotelContent?.texts.descriptions?.short,
               },
               url: hotelPage?.url ?? "",
             }
 
             return data
           })
-          ))
         )
+
+        hotels.push(...chunkedHotels)
       }
       return hotels.filter(
         (hotel): hotel is DestinationPagesHotelData => !!hotel

apps/scandic-web/utils/chunk.test.ts

@@ -0,0 +1,25 @@
+import { describe, expect } from "@jest/globals"
+
+import { chunk } from "./chunk"
+
+describe("chunk", () => {
+  it("should split an array into equally sized chunks of specified size", () => {
+    const array = [1, 2, 3, 4, 5, 6, 7, 8, 9]
+    const size = 3
+    const expected = [
+      [1, 2, 3],
+      [4, 5, 6],
+      [7, 8, 9],
+    ]
+
+    expect(chunk(array, size)).toEqual(expected)
+  })
+
+  it("should split an array into equally sized chunks of specified size", () => {
+    const array = [1, 2, 3, 4, 5, 6, 7, 8, 9]
+    const size = 4
+    const expected = [[1, 2, 3, 4], [5, 6, 7, 8], [9]]
+
+    expect(chunk(array, size)).toEqual(expected)
+  })
+})