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/destinationOverviewPage/query.ts

@@ -1,4 +1,3 @@
-import { env } from "@/env/server"
 import {
   GetDestinationOverviewPage,
   GetDestinationOverviewPageRefs,
@@ -10,9 +9,9 @@ import {
   router,
   serviceProcedure,
 } from "@/server/trpc"
-import { toApiLang } from "@/server/utils"
 
 import { generateTag } from "@/utils/generateTag"
+import { safeTry } from "@/utils/safeTry"
 
 import {
   getCitiesByCountry,
@@ -42,7 +41,6 @@ import {
   TrackingChannelEnum,
   type TrackingSDKPageData,
 } from "@/types/components/tracking"
-import type { RequestOptionsWithOutBody } from "@/types/fetch"
 import type {
   GetDestinationOverviewPageData,
   GetDestinationOverviewPageRefsSchema,
@@ -66,10 +64,8 @@ export const destinationOverviewPageQueryRouter = router({
         uid,
       },
       {
-        cache: "force-cache",
-        next: {
-          tags: [generateTag(lang, uid)],
-        },
+        key: generateTag(lang, uid),
+        ttl: "max",
       }
     )
     if (!refsResponse.data) {
@@ -133,10 +129,8 @@ export const destinationOverviewPageQueryRouter = router({
         uid,
       },
       {
-        cache: "force-cache",
-        next: {
-          tags: [generateTag(lang, uid)],
-        },
+        key: generateTag(lang, uid),
+        ttl: "max",
       }
     )
     if (!response.data) {
@@ -207,23 +201,11 @@ export const destinationOverviewPageQueryRouter = router({
   }),
   destinations: router({
     get: serviceProcedure.query(async function ({ ctx }) {
-      const apiLang = toApiLang(ctx.lang)
-      const params = new URLSearchParams({
-        language: apiLang,
+      const countries = await getCountries({
+        lang: ctx.lang,
+        serviceToken: ctx.serviceToken,
       })
 
-      const options: RequestOptionsWithOutBody = {
-        // needs to clear default option as only
-        // cache or next.revalidate is permitted
-        cache: undefined,
-        headers: {
-          Authorization: `Bearer ${ctx.serviceToken}`,
-        },
-        next: {
-          revalidate: env.CACHE_TIME_HOTELS,
-        },
-      }
-      const countries = await getCountries(options, params, ctx.lang)
       const countryPages = await getCountryPageUrls(ctx.lang)
 
       if (!countries) {
@@ -232,13 +214,12 @@ export const destinationOverviewPageQueryRouter = router({
 
       const countryNames = countries.data.map((country) => country.name)
 
-      const citiesByCountry = await getCitiesByCountry(
-        countryNames,
-        options,
-        params,
-        ctx.lang,
-        true
-      )
+      const citiesByCountry = await getCitiesByCountry({
+        lang: ctx.lang,
+        countries: countryNames,
+        serviceToken: ctx.serviceToken,
+        onlyPublished: true,
+      })
 
       const cityPages = await getCityPageUrls(ctx.lang)
 
@@ -246,15 +227,11 @@ export const destinationOverviewPageQueryRouter = router({
         Object.entries(citiesByCountry).map(async ([country, cities]) => {
           const citiesWithHotelCount = await Promise.all(
             cities.map(async (city) => {
-              const hotelIdsParams = new URLSearchParams({
-                language: apiLang,
-                city: city.id,
-              })
-
-              const hotels = await getHotelIdsByCityId(
-                city.id,
-                options,
-                hotelIdsParams
+              const [hotels] = await safeTry(
+                getHotelIdsByCityId({
+                  cityId: city.id,
+                  serviceToken: ctx.serviceToken,
+                })
               )
 
               const cityPage = cityPages.find(
@@ -268,7 +245,7 @@ export const destinationOverviewPageQueryRouter = router({
               return {
                 id: city.id,
                 name: city.name,
-                hotelIds: hotels,
+                hotelIds: hotels || [],
                 hotelCount: hotels?.length ?? 0,
                 url: cityPage.url,
               }