Merged in feature/redis (pull request #1478)

Distributed cache

* cache deleteKey now uses an options object instead of a lonely argument variable fuzzy

* merge

* remove debug logs and cleanup

* cleanup

* add fault handling

* add fault handling

* add pid when logging redis client creation

* add identifier when logging redis client creation

* cleanup

* feat: add redis-api as it's own app

* feature: use http wrapper for redis

* feat: add the possibility to fallback to unstable_cache

* Add error handling if redis cache is unresponsive

* add logging for unstable_cache

* merge

* don't cache errors

* fix: metadatabase on branchdeploys

* Handle when /en/destinations throws
add ErrorBoundary

* Add sentry-logging when ErrorBoundary catches exception

* Fix error handling for distributed cache

* cleanup code

* Added Application Insights back

* Update generateApiKeys script and remove duplicate

* Merge branch 'feature/redis' of bitbucket.org:scandic-swap/web into feature/redis

* merge


Approved-by: Linus Flood

apps/scandic-web/server/routers/contentstack/metadata/query.ts

@@ -64,10 +64,8 @@ const fetchMetadata = cache(async function fetchMemoizedMetadata<T>(
     query,
     { locale: lang, uid },
     {
-      cache: "force-cache",
-      next: {
-        tags: [generateTag(lang, uid, affix)],
-      },
+      key: generateTag(lang, uid, affix),
+      ttl: "max",
     }
   )
   if (!response.data) {

apps/scandic-web/server/routers/contentstack/metadata/utils.ts

@@ -1,5 +1,4 @@
-import { ApiLang, type Lang } from "@/constants/languages"
-import { env } from "@/env/server"
+import { type Lang } from "@/constants/languages"
 import { getFiltersFromHotels } from "@/stores/destination-data/helper"
 
 import { getIntl } from "@/i18n"
@@ -12,7 +11,6 @@ import {
 } from "../../hotels/utils"
 
 import { ApiCountry } from "@/types/enums/country"
-import type { RequestOptionsWithOutBody } from "@/types/fetch"
 import { RTETypeEnum } from "@/types/rte/enums"
 import type {
   MetadataInputSchema,
@@ -218,17 +216,19 @@ export async function getCityData(
     const cityIdentifier = cities[0]
 
     if (cityIdentifier) {
-      const cityData = await getCityByCityIdentifier(
+      const cityData = await getCityByCityIdentifier({
         cityIdentifier,
-        serviceToken
-      )
+        serviceToken,
+        lang,
+      })
       const hotelIds = await getHotelIdsByCityIdentifier(
         cityIdentifier,
         serviceToken
       )
-      const hotels = await getHotelsByHotelIds(hotelIds, lang, serviceToken)
-      let filterType
 
+      const hotels = await getHotelsByHotelIds({ hotelIds, lang, serviceToken })
+
+      let filterType
       if (filter) {
         const allFilters = getFiltersFromHotels(hotels)
         const facilityFilter = allFilters.facilityFilters.find(
@@ -264,28 +264,12 @@ export async function getCountryData(
     const translatedCountry = ApiCountry[lang][country]
     let filterType
 
-    const options: RequestOptionsWithOutBody = {
-      // needs to clear default option as only
-      // cache or next.revalidate is permitted
-      cache: undefined,
-      headers: {
-        Authorization: `Bearer ${serviceToken}`,
-      },
-      next: {
-        revalidate: env.CACHE_TIME_HOTELS,
-      },
-    }
-    const hotelIdsParams = new URLSearchParams({
-      language: ApiLang.En,
+    const hotelIds = await getHotelIdsByCountry({
       country,
+      serviceToken,
     })
-    const hotelIds = await getHotelIdsByCountry(
-      country,
-      options,
-      hotelIdsParams
-    )
 
-    const hotels = await getHotelsByHotelIds(hotelIds, lang, serviceToken)
+    const hotels = await getHotelsByHotelIds({ hotelIds, lang, serviceToken })
 
     if (filter) {
       const allFilters = getFiltersFromHotels(hotels)