Merged in revert-pr-1925 (pull request #1927)

Revert "Feat/sw 2323 find booking (pull request #1925)"

Approved-by: Anton Gunnarsson
This commit is contained in:
Linus Flood
2025-05-02 13:05:42 +00:00
parent 87efb72ff2
commit 6979ac0c3b
69 changed files with 883 additions and 1508 deletions

View File

@@ -1,11 +1,8 @@
import * as api from "@/lib/api"
import { getMembershipNumber } from "@/server/routers/user/utils"
import { createCounter } from "@/server/telemetry"
import { getUserOrServiceToken } from "@/server/tokenManager"
import { router, safeProtectedServiceProcedure } from "@/server/trpc"
import { parseRefId } from "@/utils/refId"
import {
addPackageInput,
cancelBookingsInput,
@@ -15,7 +12,7 @@ import {
removePackageInput,
updateBookingInput,
} from "./input"
import { bookingSchema, createBookingSchema } from "./output"
import { bookingConfirmationSchema, createBookingSchema } from "./output"
import { cancelBooking } from "./utils"
export const bookingMutationRouter = router({
@@ -76,17 +73,8 @@ export const bookingMutationRouter = router({
}),
priceChange: safeProtectedServiceProcedure
.input(priceChangeInput)
.use(async ({ input, next }) => {
const { confirmationNumber } = parseRefId(input.refId)
return next({
ctx: {
confirmationNumber,
},
})
})
.mutation(async function ({ ctx, input }) {
const { confirmationNumber } = ctx
const { confirmationNumber } = input
const priceChangeCounter = createCounter("trpc.booking", "price-change")
const metricsPriceChange = priceChangeCounter.init({ confirmationNumber })
@@ -121,29 +109,17 @@ export const bookingMutationRouter = router({
metricsPriceChange.success()
return verifiedData.data.id
return verifiedData.data
}),
cancel: safeProtectedServiceProcedure
.input(cancelBookingsInput)
.use(async ({ input, next }) => {
const confirmationNumbers = input.refIds.map((refId) => {
const { confirmationNumber } = parseRefId(refId)
return confirmationNumber
})
return next({
ctx: {
confirmationNumbers,
},
})
})
.mutation(async function ({ ctx, input }) {
const { confirmationNumbers } = ctx
const { lang } = input
const token = ctx.session?.token.access_token ?? ctx.serviceToken
const { confirmationNumbers, language } = input
const responses = await Promise.allSettled(
confirmationNumbers.map((confirmationNumber) =>
cancelBooking(confirmationNumber, lang)
cancelBooking(confirmationNumber, language, token)
)
)
@@ -168,19 +144,10 @@ export const bookingMutationRouter = router({
}),
packages: safeProtectedServiceProcedure
.input(addPackageInput)
.use(async ({ input, next }) => {
const { confirmationNumber } = parseRefId(input.refId)
return next({
ctx: {
confirmationNumber,
},
})
})
.mutation(async function ({ ctx, input }) {
const accessToken = ctx.session?.token.access_token ?? ctx.serviceToken
const { refId, ...body } = input
const { confirmationNumber } = ctx
const { confirmationNumber, ...body } = input
const addPackageCounter = createCounter("trpc.booking", "package.add")
const metricsAddPackage = addPackageCounter.init({ confirmationNumber })
@@ -216,19 +183,10 @@ export const bookingMutationRouter = router({
}),
guarantee: safeProtectedServiceProcedure
.input(guaranteeBookingInput)
.use(async ({ input, next }) => {
const { confirmationNumber } = parseRefId(input.refId)
return next({
ctx: {
confirmationNumber,
},
})
})
.mutation(async function ({ ctx, input }) {
const accessToken = ctx.session?.token.access_token ?? ctx.serviceToken
const { refId, language, ...body } = input
const { confirmationNumber } = ctx
const { confirmationNumber, language, ...body } = input
const guaranteeBookingCounter = createCounter("trpc.booking", "guarantee")
const metricsGuaranteeBooking = guaranteeBookingCounter.init({
confirmationNumber,
@@ -267,16 +225,10 @@ export const bookingMutationRouter = router({
}),
update: safeProtectedServiceProcedure
.input(updateBookingInput)
.use(async ({ input, next }) => {
const { confirmationNumber } = parseRefId(input.refId)
return next({
ctx: {
confirmationNumber,
},
})
})
.mutation(async function ({ ctx, input }) {
const { confirmationNumber } = ctx
const accessToken = ctx.session?.token.access_token || ctx.serviceToken
const { confirmationNumber, ...body } = input
const updateBookingCounter = createCounter("trpc.booking", "update")
const metricsUpdateBooking = updateBookingCounter.init({
confirmationNumber,
@@ -284,17 +236,12 @@ export const bookingMutationRouter = router({
metricsUpdateBooking.start()
const token = getUserOrServiceToken()
const apiResponse = await api.put(
api.endpoints.v1.Booking.booking(confirmationNumber),
{
body: {
checkInDate: input.checkInDate,
checkOutDate: input.checkOutDate,
guest: input.guest,
},
body,
headers: {
Authorization: `Bearer ${token}`,
Authorization: `Bearer ${accessToken}`,
},
}
)
@@ -306,7 +253,7 @@ export const bookingMutationRouter = router({
const apiJson = await apiResponse.json()
const verifiedData = bookingSchema.safeParse(apiJson)
const verifiedData = bookingConfirmationSchema.safeParse(apiJson)
if (!verifiedData.success) {
metricsUpdateBooking.validationError(verifiedData.error)
return null
@@ -314,23 +261,14 @@ export const bookingMutationRouter = router({
metricsUpdateBooking.success()
return verifiedData.data.refId
return verifiedData.data
}),
removePackage: safeProtectedServiceProcedure
.input(removePackageInput)
.use(async ({ input, next }) => {
const { confirmationNumber } = parseRefId(input.refId)
return next({
ctx: {
confirmationNumber,
},
})
})
.mutation(async function ({ ctx, input }) {
const accessToken = ctx.session?.token.access_token ?? ctx.serviceToken
const { codes, language } = input
const { confirmationNumber } = ctx
const { confirmationNumber, codes, language } = input
const removePackageCounter = createCounter(
"trpc.booking",
"package.remove"