Merged in feat/rework-contentstack (pull request #3493)

Feat(SW-3708): refactor contentstack fetching (removing all refs) and cache invalidation

* Remove all REFS

* Revalidate correct language

* PR fixes

* PR fixes

* Throw when errors from contentstack api


Approved-by: Joakim Jäderberg

packages/trpc/lib/routers/contentstack/destinationCityPage/utils.ts

@@ -3,72 +3,14 @@ import { createCounter } from "@scandic-hotels/common/telemetry"
 import { GetCityPageCount } from "../../../graphql/Query/DestinationCityPage/DestinationCityPageCount.graphql"
 import { GetCityPageUrls } from "../../../graphql/Query/DestinationCityPage/DestinationCityPageUrl.graphql"
 import { request } from "../../../graphql/request"
-import { DestinationCityPageEnum } from "../../../types/destinationCityPage"
-import { generateTag, generateTagsFromSystem } from "../../../utils/generateTag"
 import { batchedCityPageUrlsSchema, cityPageCountSchema } from "./output"
 
 import type { Lang } from "@scandic-hotels/common/constants/language"
 
 import type {
-  DestinationCityPageRefs,
   GetCityPageCountData,
   GetCityPageUrlsData,
 } from "../../../types/destinationCityPage"
-import type { System } from "../schemas/system"
-
-export function generatePageTags(
-  validatedData: DestinationCityPageRefs,
-  lang: Lang
-): string[] {
-  const connections = getConnections(validatedData)
-  return [
-    // This tag is added for the city list data on country pages to invalidate the list when city page changes.
-    generateTag(
-      lang,
-      `city_list_data:${validatedData.destination_city_page.destination_settings.city}`
-    ),
-    generateTagsFromSystem(lang, connections),
-    generateTag(lang, validatedData.destination_city_page.system.uid),
-  ].flat()
-}
-
-export function getConnections({
-  destination_city_page,
-}: DestinationCityPageRefs) {
-  const connections: System["system"][] = [destination_city_page.system]
-  if (destination_city_page.blocks) {
-    destination_city_page.blocks.forEach((block) => {
-      switch (block.__typename) {
-        case DestinationCityPageEnum.ContentStack.blocks.Accordion: {
-          if (block.accordion.length) {
-            connections.push(...block.accordion.filter((c) => !!c))
-          }
-          break
-        }
-        case DestinationCityPageEnum.ContentStack.blocks.Content:
-          {
-            if (block?.content?.length) {
-              // TS has trouble infering the filtered types
-              // @ts-ignore
-              connections.push(...block.content)
-            }
-          }
-          break
-      }
-    })
-  }
-  if (destination_city_page.sidepeek_content) {
-    destination_city_page.sidepeek_content?.content?.embedded_itemsConnection.edges.forEach(
-      ({ node }) => {
-        if (node.system) {
-          connections.push(node.system)
-        }
-      }
-    )
-  }
-
-  return connections
-}
 
 export async function getCityPageCount(lang: Lang) {
   const getCityPageCountCounter = createCounter(