scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feat/SW-1457-city-dynamic-map (pull request #1320)

Browse Source 
feat(SW-1457): Added map and fetching hotels by cityIdentifier

* feat(SW-1457): Added map and fetching hotels by cityIdentifier


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
This commit is contained in:
Erik Tiekstra
2025-02-12 13:02:19 +00:00
parent 019a5db549
commit 1532898c23
10 changed files with 106 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/routers/hotels/utils.ts
View File

@@ -20,7 +20,7 @@ import { getHotel } from "./query"
import type { Country } from "@/types/enums/country"
import { PointOfInterestGroupEnum } from "@/types/enums/pointOfInterest"
import type { RequestOptionsWithOutBody } from "@/types/fetch"
import type { HotelData } from "@/types/hotel"
import type { HotelDataWithUrl } from "@/types/hotel"
import type {
CitiesGroupedByCountry,
CityLocation,
@@ -423,15 +423,15 @@ export async function getHotelIdsByCityIdentifier(
serviceToken: string
) {
const apiLang = toApiLang(Lang.en)
const cityId = await getCityIdByCityIdentifier(cityIdentifier, serviceToken)
const city = await getCityByCityIdentifier(cityIdentifier, serviceToken)
if (!cityId) {
if (!city) {
return []
}
const hotelIdsParams = new URLSearchParams({
language: apiLang,
city: cityId,
city: city.id,
})
const options: RequestOptionsWithOutBody = {
// needs to clear default option as only
@@ -444,11 +444,11 @@ export async function getHotelIdsByCityIdentifier(
revalidate: env.CACHE_TIME_HOTELS,
},
}
const hotelIds = await getHotelIdsByCityId(cityId, options, hotelIdsParams)
const hotelIds = await getHotelIdsByCityId(city.id, options, hotelIdsParams)
return hotelIds
}
export async function getCityIdByCityIdentifier(
export async function getCityByCityIdentifier(
cityIdentifier: string,
serviceToken: string
) {
@@ -473,23 +473,18 @@ export async function getCityIdByCityIdentifier(
return null
}
const cityId = locations
const city = locations
.filter((loc): loc is CityLocation => loc.type === "cities")
.find((loc) => loc.cityIdentifier === cityIdentifier)?.id
.find((loc) => loc.cityIdentifier === cityIdentifier)
return cityId ?? null
return city ?? null
}
export async function getHotelListData(
export async function getHotelsByHotelIds(
hotelIds: string[],
lang: Lang,
serviceToken: string,
cityIdentifier: string
serviceToken: string
) {
const hotelIds = await getHotelIdsByCityIdentifier(
cityIdentifier,
serviceToken
)
const hotels = await Promise.all(
hotelIds.map(async (hotelId) => {
const [hotelData, url] = await Promise.all([
@@ -504,7 +499,5 @@ export async function getHotelListData(
})
)
return hotels.filter(
(hotel): hotel is HotelData & { url: string | null } => !!hotel
)
return hotels.filter((hotel): hotel is HotelDataWithUrl => !!hotel)
}