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

feat: get breakfast package from API

Browse Source
This commit is contained in:
Simon Emanuelsson
2024-10-28 10:12:03 +01:00
parent fc8844eb96
commit 62f549e85d
47 changed files with 718 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/context.ts
View File

@@ -1,5 +1,6 @@
import { cookies, headers } from "next/headers"
import { type Session } from "next-auth"
import { cache } from "react"
import { Lang } from "@/constants/languages"
@@ -37,7 +38,7 @@ export function createContextInner(opts: CreateContextOptions) {
* This is the actual context you'll use in your router
* @link https://trpc.io/docs/context
**/
export function createContext() {
export const createContext = cache(function () {
const h = headers()
const cookie = cookies()
@@ -66,6 +67,6 @@ export function createContext() {
webToken: webviewTokenCookie?.value,
contentType: h.get("x-contenttype")!,
})
}
})
export type Context = ReturnType<typeof createContext>

2
server/routers/booking/mutation.ts
View File

@@ -62,7 +62,7 @@ export const bookingMutationRouter = router({
Authorization: `Bearer ${ctx.serviceToken}`,
}
const apiResponse = await api.post(api.endpoints.v1.booking, {
const apiResponse = await api.post(api.endpoints.v1.Booking.bookings, {
headers,
body: input,
})

4
server/routers/booking/query.ts
View File

@@ -33,7 +33,7 @@ export const bookingQueryRouter = router({
getBookingConfirmationCounter.add(1, { confirmationNumber })
const apiResponse = await api.get(
`${api.endpoints.v1.booking}/${confirmationNumber}`,
api.endpoints.v1.Booking.booking(confirmationNumber),
{
headers: {
Authorization: `Bearer ${ctx.serviceToken}`,
@@ -142,7 +142,7 @@ export const bookingQueryRouter = router({
getBookingStatusCounter.add(1, { confirmationNumber })
const apiResponse = await api.get(
`${api.endpoints.v1.booking}/${confirmationNumber}/status`,
api.endpoints.v1.Booking.status(confirmationNumber),
{
headers: {
Authorization: `Bearer ${ctx.serviceToken}`,

6
server/routers/contentstack/reward/query.ts
View File

@@ -75,7 +75,7 @@ function getUniqueRewardIds(rewardIds: string[]) {
const getAllCachedApiRewards = unstable_cache(
async function (token) {
const apiResponse = await api.get(api.endpoints.v1.tierRewards, {
const apiResponse = await api.get(api.endpoints.v1.Profile.tierRewards, {
headers: {
Authorization: `Bearer ${token}`,
},
@@ -194,7 +194,7 @@ export const rewardQueryRouter = router({
const { limit, cursor } = input
const apiResponse = await api.get(api.endpoints.v1.rewards, {
const apiResponse = await api.get(api.endpoints.v1.Profile.reward, {
cache: undefined, // override defaultOptions
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -393,7 +393,7 @@ export const rewardQueryRouter = router({
surprises: contentStackBaseWithProtectedProcedure.query(async ({ ctx }) => {
getCurrentRewardCounter.add(1)
const apiResponse = await api.get(api.endpoints.v1.rewards, {
const apiResponse = await api.get(api.endpoints.v1.Profile.reward, {
cache: undefined, // override defaultOptions
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,

4
server/routers/hotels/input.ts
View File

@@ -39,3 +39,7 @@ export const getlHotelDataInputSchema = z.object({
.array(z.enum(["RoomCategories", "NearbyHotels", "Restaurants", "City"]))
.optional(),
})
export const getBreakfastPackageInput = z.object({
hotelId: z.string().min(1, { message: "hotelId is required" }),
})

31
server/routers/hotels/output.ts
View File

@@ -9,7 +9,9 @@ import { getPoiGroupByCategoryName } from "./utils"
import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
import { AlertTypeEnum } from "@/types/enums/alert"
import { CurrencyEnum } from "@/types/enums/currency"
import { FacilityEnum } from "@/types/enums/facilities"
import { PackageTypeEnum } from "@/types/enums/packages"
import { PointOfInterestCategoryNameEnum } from "@/types/hotel"
const ratingsSchema = z
@@ -653,7 +655,7 @@ export const apiCountriesSchema = z.object({
name: z.string(),
}),
hotelInformationSystemId: z.number().optional(),
id: z.string().optional(),
id: z.string().optional().default(""),
language: z.string().optional(),
type: z.literal("countries"),
})
@@ -794,3 +796,30 @@ export const apiLocationsSchema = z.object({
})
),
})
export const breakfastPackageSchema = z.object({
code: z.string(),
currency: z.nativeEnum(CurrencyEnum),
description: z.string(),
originalPrice: z.number().default(0),
packagePrice: z.number(),
packageType: z.enum([
PackageTypeEnum.BreakfastAdult,
PackageTypeEnum.BreakfastChildren,
]),
totalPrice: z.number(),
})
export const breakfastPackagesSchema = z
.object({
data: z.object({
attributes: z.object({
hotelId: z.number(),
packages: z.array(breakfastPackageSchema),
}),
type: z.literal("breakfastpackage"),
}),
})
.transform(({ data }) =>
data.attributes.packages.filter((pkg) => pkg.code.match(/^(BRF\d+)$/gm))
)

132
server/routers/hotels/query.ts
View File

@@ -13,6 +13,7 @@ import {
contentStackUidWithServiceProcedure,
publicProcedure,
router,
safeProtectedServiceProcedure,
serviceProcedure,
} from "@/server/trpc"
import { toApiLang } from "@/server/utils"
@@ -24,11 +25,13 @@ import {
getHotelPageCounter,
validateHotelPageRefs,
} from "../contentstack/hotelPage/utils"
import { getVerifiedUser, parsedUser } from "../user/query"
import {
getRoomPackagesInputSchema,
getRoomPackagesSchema,
} from "./schemas/packages"
import {
getBreakfastPackageInput,
getHotelInputSchema,
getHotelsAvailabilityInputSchema,
getlHotelDataInputSchema,
@@ -36,6 +39,7 @@ import {
getRoomsAvailabilityInputSchema,
} from "./input"
import {
breakfastPackagesSchema,
getHotelDataSchema,
getHotelsAvailabilitySchema,
getRatesSchema,
@@ -51,6 +55,7 @@ import {
import { FacilityCardTypeEnum } from "@/types/components/hotelPage/facilities"
import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel"
import { BreakfastPackageEnum } from "@/types/enums/breakfast"
import type { RequestOptionsWithOutBody } from "@/types/fetch"
import type { Facility } from "@/types/hotel"
import type { GetHotelPageData } from "@/types/trpc/routers/contentstack/hotelPage"
@@ -88,6 +93,14 @@ const roomsAvailabilityFailCounter = meter.createCounter(
"trpc.hotel.availability.rooms-fail"
)
const breakfastPackagesCounter = meter.createCounter("trpc.package.breakfast")
const breakfastPackagesSuccessCounter = meter.createCounter(
"trpc.package.breakfast-success"
)
const breakfastPackagesFailCounter = meter.createCounter(
"trpc.package.breakfast-fail"
)
async function getContentstackData(lang: Lang, uid?: string | null) {
if (!uid) {
return null
@@ -169,7 +182,7 @@ export const hotelQueryRouter = router({
})
)
const apiResponse = await api.get(
`${api.endpoints.v1.hotels}/${hotelId}`,
api.endpoints.v1.Hotel.Hotels.hotel(hotelId),
{
headers: {
Authorization: `Bearer ${ctx.serviceToken}`,
@@ -320,7 +333,7 @@ export const hotelQueryRouter = router({
JSON.stringify({ query: { cityId, params } })
)
const apiResponse = await api.get(
`${api.endpoints.v1.hotelsAvailability}/${cityId}`,
api.endpoints.v1.Availability.city(cityId),
{
headers: {
Authorization: `Bearer ${ctx.serviceToken}`,
@@ -444,7 +457,7 @@ export const hotelQueryRouter = router({
JSON.stringify({ query: { hotelId, params } })
)
const apiResponse = await api.get(
`${api.endpoints.v1.roomsAvailability}/${hotelId}`,
api.endpoints.v1.Availability.hotel(hotelId.toString()),
{
headers: {
Authorization: `Bearer ${ctx.serviceToken}`,
@@ -587,7 +600,7 @@ export const hotelQueryRouter = router({
)
const apiResponse = await api.get(
`${api.endpoints.v1.hotels}/${hotelId}`,
api.endpoints.v1.Hotel.Hotels.hotel(hotelId),
{
headers: {
Authorization: `Bearer ${ctx.serviceToken}`,
@@ -734,7 +747,7 @@ export const hotelQueryRouter = router({
)
const apiResponse = await api.get(
`${api.endpoints.v1.packages}/${hotelId}`,
api.endpoints.v1.Package.Packages.hotel(hotelId),
{
headers: {
Authorization: `Bearer ${ctx.serviceToken}`,
@@ -789,5 +802,114 @@ export const hotelQueryRouter = router({
return validatedPackagesData.data
}),
breakfast: safeProtectedServiceProcedure
.input(getBreakfastPackageInput)
.query(async function ({ ctx, input }) {
const params = {
Adults: 2,
EndDate: "2024-10-28",
StartDate: "2024-10-25",
}
const metricsData = { ...input, ...params }
breakfastPackagesCounter.add(1, metricsData)
console.info(
"api.package.breakfast start",
JSON.stringify({ query: metricsData })
)
const apiResponse = await api.get(
api.endpoints.v1.Package.Breakfast.hotel(input.hotelId),
{
cache: undefined,
headers: {
Authorization: `Bearer ${ctx.serviceToken}`,
},
next: {
revalidate: 60,
},
},
params
)
if (!apiResponse.ok) {
const text = await apiResponse.text()
breakfastPackagesFailCounter.add(1, {
...metricsData,
error_type: "http_error",
error: JSON.stringify({
status: apiResponse.status,
statusText: apiResponse.statusText,
text,
}),
})
console.error(
"api.hotels.hotelsAvailability error",
JSON.stringify({
query: metricsData,
error: {
status: apiResponse.status,
statusText: apiResponse.statusText,
text,
},
})
)
return null
}
const apiJson = await apiResponse.json()
const breakfastPackages = breakfastPackagesSchema.safeParse(apiJson)
if (!breakfastPackages.success) {
hotelsAvailabilityFailCounter.add(1, {
...metricsData,
error_type: "validation_error",
error: JSON.stringify(breakfastPackages.error),
})
console.error(
"api.package.breakfast validation error",
JSON.stringify({
query: metricsData,
error: breakfastPackages.error,
})
)
return null
}
breakfastPackagesSuccessCounter.add(1, metricsData)
console.info(
"api.package.breakfast success",
JSON.stringify({
query: metricsData,
})
)
if (ctx.session?.token) {
const apiUser = await getVerifiedUser({ session: ctx.session })
if (apiUser && !("error" in apiUser)) {
const user = parsedUser(apiUser.data, false)
if (
user.membership &&
["L6", "L7"].includes(user.membership.membershipLevel)
) {
const originalBreakfastPackage = breakfastPackages.data.find(
(pkg) => pkg.code === BreakfastPackageEnum.REGULAR_BREAKFAST
)
const freeBreakfastPackage = breakfastPackages.data.find(
(pkg) => pkg.code === BreakfastPackageEnum.FREE_MEMBER_BREAKFAST
)
if (freeBreakfastPackage) {
if (originalBreakfastPackage) {
freeBreakfastPackage.originalPrice =
originalBreakfastPackage.packagePrice
}
return [freeBreakfastPackage]
}
}
}
}
return breakfastPackages.data.filter(
(pkg) => pkg.code !== BreakfastPackageEnum.FREE_MEMBER_BREAKFAST
)
}),
}),
})

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

@@ -96,7 +96,7 @@ export async function getCountries(
return unstable_cache(
async function (searchParams) {
const countryResponse = await api.get(
api.endpoints.v1.countries,
api.endpoints.v1.Hotel.countries,
options,
searchParams
)
@@ -136,7 +136,7 @@ export async function getCitiesByCountry(
await Promise.all(
searchedCountries.data.map(async (country) => {
const countryResponse = await api.get(
`${api.endpoints.v1.citiesCountry}/${country.name}`,
api.endpoints.v1.Hotel.Cities.country(country.name),
options,
searchParams
)
@@ -182,7 +182,7 @@ export async function getLocations(
groupedCitiesByCountry: CitiesGroupedByCountry | null
) {
const apiResponse = await api.get(
api.endpoints.v1.locations,
api.endpoints.v1.Hotel.locations,
options,
searchParams
)

31
server/routers/user/mutation.ts
View File

@@ -35,16 +35,19 @@ export const userMutationRouter = router({
"api.user.creditCard.add start",
JSON.stringify({ query: { language: input.language } })
)
const apiResponse = await api.post(api.endpoints.v1.initiateSaveCard, {
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
},
body: {
language: input.language,
mobileToken: false,
redirectUrl: `api/web/add-card-callback/${input.language}`,
},
})
const apiResponse = await api.post(
api.endpoints.v1.Profile.CreditCards.initiateSaveCard,
{
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
},
body: {
language: input.language,
mobileToken: false,
redirectUrl: `api/web/add-card-callback/${input.language}`,
},
}
)
if (!apiResponse.ok) {
const text = await apiResponse.text()
@@ -85,7 +88,7 @@ export const userMutationRouter = router({
.mutation(async function ({ ctx, input }) {
console.info("api.user.creditCard.save start", JSON.stringify({}))
const apiResponse = await api.post(
`${api.endpoints.v1.creditCards}/${input.transactionId}`,
api.endpoints.v1.Profile.CreditCards.transaction(input.transactionId),
{
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -118,7 +121,9 @@ export const userMutationRouter = router({
JSON.stringify({ query: {} })
)
const apiResponse = await api.remove(
`${api.endpoints.v1.creditCards}/${input.creditCardId}`,
api.endpoints.v1.Profile.CreditCards.deleteCreditCard(
input.creditCardId
),
{
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -149,7 +154,7 @@ export const userMutationRouter = router({
ctx,
}) {
generatePreferencesLinkCounter.add(1)
const apiResponse = await api.get(api.endpoints.v1.subscriberId, {
const apiResponse = await api.get(api.endpoints.v1.Profile.subscriberId, {
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
},

35
server/routers/user/query.ts
View File

@@ -89,7 +89,7 @@ export const getVerifiedUser = cache(
}
getVerifiedUserCounter.add(1)
console.info("api.user.profile getVerifiedUser start", JSON.stringify({}))
const apiResponse = await api.get(api.endpoints.v1.profile, {
const apiResponse = await api.get(api.endpoints.v1.Profile.profile, {
headers: {
Authorization: `Bearer ${session.token.access_token}`,
},
@@ -163,7 +163,7 @@ export const getVerifiedUser = cache(
}
)
function parsedUser(data: User, isMFA: boolean) {
export function parsedUser(data: User, isMFA: boolean) {
const country = countries.find((c) => c.code === data.address.countryCode)
const user = {
@@ -211,7 +211,7 @@ function parsedUser(data: User, isMFA: boolean) {
async function getCreditCards(session: Session) {
getCreditCardsCounter.add(1)
console.info("api.profile.creditCards start", JSON.stringify({}))
const apiResponse = await api.get(api.endpoints.v1.creditCards, {
const apiResponse = await api.get(api.endpoints.v1.Profile.creditCards, {
headers: {
Authorization: `Bearer ${session.token.access_token}`,
},
@@ -354,7 +354,7 @@ export const userQueryRouter = router({
JSON.stringify({ query: { params } })
)
const previousStaysResponse = await api.get(
api.endpoints.v1.previousStays,
api.endpoints.v1.Booking.Stays.past,
{
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -430,7 +430,7 @@ export const userQueryRouter = router({
)
const apiResponse = await api.get(
api.endpoints.v1.previousStays,
api.endpoints.v1.Booking.Stays.past,
{
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -492,7 +492,7 @@ export const userQueryRouter = router({
)
const nextCursor =
verifiedData.data.links &&
verifiedData.data.links.offset < verifiedData.data.links.totalCount
verifiedData.data.links.offset < verifiedData.data.links.totalCount
? verifiedData.data.links.offset
: undefined
@@ -525,7 +525,7 @@ export const userQueryRouter = router({
JSON.stringify({ query: { params } })
)
const apiResponse = await api.get(
api.endpoints.v1.upcomingStays,
api.endpoints.v1.Booking.Stays.future,
{
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
@@ -585,7 +585,7 @@ export const userQueryRouter = router({
})
const nextCursor =
verifiedData.data.links &&
verifiedData.data.links.offset < verifiedData.data.links.totalCount
verifiedData.data.links.offset < verifiedData.data.links.totalCount
? verifiedData.data.links.offset
: undefined
@@ -611,13 +611,16 @@ export const userQueryRouter = router({
"api.transaction.friendTransactions start",
JSON.stringify({})
)
const apiResponse = await api.get(api.endpoints.v1.friendTransactions, {
cache: undefined, // override defaultOptions
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
},
next: { revalidate: 30 * 60 * 1000 },
})
const apiResponse = await api.get(
api.endpoints.v1.Profile.Transaction.friendTransactions,
{
cache: undefined, // override defaultOptions
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,
},
next: { revalidate: 30 * 60 * 1000 },
}
)
if (!apiResponse.ok) {
// switch (apiResponse.status) {
@@ -740,7 +743,7 @@ export const userQueryRouter = router({
membershipCards: protectedProcedure.query(async function ({ ctx }) {
getProfileCounter.add(1)
console.info("api.profile start", JSON.stringify({}))
const apiResponse = await api.get(api.endpoints.v1.profile, {
const apiResponse = await api.get(api.endpoints.v1.Profile.profile, {
cache: "no-store",
headers: {
Authorization: `Bearer ${ctx.session.token.access_token}`,

2
server/routers/user/utils.ts
View File

@@ -35,7 +35,7 @@ async function updateStaysBookingUrl(
// Temporary API call needed till we have user name in ctx session data
getProfileCounter.add(1)
console.info("api.user.profile updatebookingurl start", JSON.stringify({}))
const apiResponse = await api.get(api.endpoints.v1.profile, {
const apiResponse = await api.get(api.endpoints.v1.Profile.profile, {
cache: "no-store",
headers: {
Authorization: `Bearer ${token}`,

5
server/trpc.ts
View File

@@ -176,7 +176,7 @@ export const protectedServerActionProcedure = serverActionProcedure.use(
}
)
// NOTE: This is actually save to use, just the implementation could change
// NOTE: This is actually safe to use, just the implementation could change
// in minor version bumps. Please read: https://trpc.io/docs/faq#unstable
export const contentStackUidWithServiceProcedure =
contentstackExtendedProcedureUID.unstable_concat(serviceProcedure)
@@ -186,3 +186,6 @@ export const contentStackBaseWithServiceProcedure =
export const contentStackBaseWithProtectedProcedure =
contentstackBaseProcedure.unstable_concat(protectedProcedure)
export const safeProtectedServiceProcedure =
safeProtectedProcedure.unstable_concat(serviceProcedure)