Merged in chore/cleanup-after-trpc-migration (pull request #2457)

Chore/cleanup after trpc migration

* Clean up TODOs

* Rename REDEMPTION constant to SEARCH_TYPE_REDEMPTION

* Update dependencies

Remove unused deps from scandic-web
Add missing deps to trpc package

* Update self-referencing imports

* Remove unused variables from scandic-web env

* Fix missing graphql-tag package

* Actually fix

* Remove unused env var


Approved-by: Christian Andolf
Approved-by: Linus Flood
This commit is contained in:
Anton Gunnarsson
2025-06-30 12:08:19 +00:00
parent 8127cfc73b
commit 4e1cb01b84
53 changed files with 131 additions and 233 deletions

View File

@@ -6,25 +6,25 @@ import { selectRate } from "@scandic-hotels/common/constants/routes/hotelReserva
import { getCacheClient } from "@scandic-hotels/common/dataCache"
import { createCounter } from "@scandic-hotels/common/telemetry"
import { chunk } from "@scandic-hotels/common/utils/chunk"
import { RoomPackageCodeEnum } from "@scandic-hotels/trpc/enums/roomFilter"
import { AvailabilityEnum } from "@scandic-hotels/trpc/enums/selectHotel"
import { type RoomFeaturesInput } from "@scandic-hotels/trpc/routers/hotels/input"
import { env } from "../../../env/server"
import * as api from "../../api"
import { SEARCH_TYPE_REDEMPTION } from "../../constants/booking"
import { cache } from "../../DUPLICATED/cache"
import { BookingErrorCodeEnum } from "../../enums/bookingErrorCode"
import { HotelTypeEnum } from "../../enums/hotelType"
import { RoomPackageCodeEnum } from "../../enums/roomFilter"
import { AvailabilityEnum } from "../../enums/selectHotel"
import { badRequestError } from "../../errors"
import { type RoomFeaturesInput } from "../../routers/hotels/input"
import {
hotelsAvailabilitySchema,
packagesSchema,
roomFeaturesSchema,
roomsAvailabilitySchema,
} from "@scandic-hotels/trpc/routers/hotels/output"
import { sortRoomConfigs } from "@scandic-hotels/trpc/utils/sortRoomConfigs"
import { env } from "../../../env/server"
import * as api from "../../api"
import { REDEMPTION } from "../../constants/booking"
import { cache } from "../../DUPLICATED/cache"
import { BookingErrorCodeEnum } from "../../enums/bookingErrorCode"
import { HotelTypeEnum } from "../../enums/hotelType"
import { badRequestError } from "../../errors"
} from "../../routers/hotels/output"
import { toApiLang } from "../../utils"
import { sortRoomConfigs } from "../../utils/sortRoomConfigs"
import { getHotelPageUrls } from "../contentstack/hotelPage/utils"
import { generateChildrenString } from "./helpers"
import {
@@ -36,14 +36,6 @@ import {
locationsSchema,
} from "./output"
import type { Room as RoomCategory } from "@scandic-hotels/trpc/types/hotel"
import type {
Product,
Products,
RateDefinition,
RedemptionsProduct,
RoomConfiguration,
} from "@scandic-hotels/trpc/types/roomAvailability"
import type { z } from "zod"
import type { Endpoint } from "../../api/endpoints"
@@ -55,12 +47,20 @@ import type {
RoomsAvailabilityOutputSchema,
} from "../../types/availability"
import type { BedTypeSelection } from "../../types/bedTypeSelection"
import type { Room as RoomCategory } from "../../types/hotel"
import type { DestinationPagesHotelData, HotelInput } from "../../types/hotel"
import type {
CitiesGroupedByCountry,
CityLocation,
} from "../../types/locations"
import type { PackagesOutput } from "../../types/packages"
import type {
Product,
Products,
RateDefinition,
RedemptionsProduct,
RoomConfiguration,
} from "../../types/roomAvailability"
import type { Cities } from "./output"
export const locationsAffix = "locations"
@@ -981,7 +981,7 @@ export async function getRoomsAvailability(
lang,
} = input
const redemption = searchType === REDEMPTION
const redemption = searchType === SEARCH_TYPE_REDEMPTION
const getRoomsAvailabilityCounter = createCounter(
"hotel",