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

@@ -51,10 +51,8 @@ export const destinationCountryPageQueryRouter = router({
       GetDestinationCountryPageRefs,
       { locale: lang, uid },
       {
-        cache: "force-cache",
-        next: {
-          tags: [generateTag(lang, uid)],
-        },
+        key: generateTag(lang, uid),
+        ttl: "max",
       }
     )
 
@@ -114,10 +112,8 @@ export const destinationCountryPageQueryRouter = router({
         uid,
       },
       {
-        cache: "force-cache",
-        next: {
-          tags,
-        },
+        key: tags,
+        ttl: "max",
       }
     )
     if (!response.data) {

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

@@ -1,8 +1,6 @@
-import { env } from "@/env/server"
 import { GetDestinationCityListData } from "@/lib/graphql/Query/DestinationCityPage/DestinationCityListData.graphql"
 import { GetCountryPageUrls } from "@/lib/graphql/Query/DestinationCountryPage/DestinationCountryPageUrl.graphql"
 import { request } from "@/lib/graphql/request"
-import { toApiLang } from "@/server/utils"
 
 import { generateTag, generateTagsFromSystem } from "@/utils/generateTag"
 
@@ -20,7 +18,6 @@ import {
 
 import { ApiCountry, type Country } from "@/types/enums/country"
 import { DestinationCountryPageEnum } from "@/types/enums/destinationCountryPage"
-import type { RequestOptionsWithOutBody } from "@/types/fetch"
 import type { System } from "@/types/requests/system"
 import type { GetDestinationCityListDataResponse } from "@/types/trpc/routers/contentstack/destinationCityPage"
 import type {
@@ -85,7 +82,7 @@ export async function getCityListDataByCityIdentifier(
     "contentstack.cityListData start",
     JSON.stringify({ query: { lang, cityIdentifier } })
   )
-  const tag = `${lang}:city_list_data:${cityIdentifier}`
+
   const response = await request<GetDestinationCityListDataResponse>(
     GetDestinationCityListData,
     {
@@ -93,10 +90,8 @@ export async function getCityListDataByCityIdentifier(
       cityIdentifier,
     },
     {
-      cache: "force-cache",
-      next: {
-        tags: [tag],
-      },
+      key: `${lang}:city_list_data:${cityIdentifier}`,
+      ttl: "max",
     }
   )
 
@@ -148,23 +143,12 @@ export async function getCityPages(
   serviceToken: string,
   country: Country
 ) {
-  const apiLang = toApiLang(lang)
-  const params = new URLSearchParams({
-    language: apiLang,
-  })
-  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 apiCountry = ApiCountry[lang][country]
-  const cities = await getCitiesByCountry([apiCountry], options, params, lang)
+  const cities = await getCitiesByCountry({
+    countries: [apiCountry],
+    lang,
+    serviceToken,
+  })
 
   const publishedCities = cities[apiCountry].filter((city) => city.isPublished)
 
@@ -201,10 +185,8 @@ export async function getCountryPageUrls(lang: Lang) {
       locale: lang,
     },
     {
-      cache: "force-cache",
-      next: {
-        tags: [tag],
-      },
+      key: tag,
+      ttl: "max",
     }
   )