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

feat(SW-2116): RefId instead of confirmationNumber

Browse Source
This commit is contained in:
Arvid Norlin
2025-04-25 13:44:49 +02:00
committed by Michael Zetterberg
parent 7eeb0bbcac
commit 74d37dad93
61 changed files with 1032 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/gla-payment-callback/page.tsx
View File

@@ -6,10 +6,12 @@ import {
} from "@/constants/booking"
import { myStay } from "@/constants/routes/myStay"
import { serverClient } from "@/lib/trpc/server"
import { createCounter } from "@/server/telemetry"
import GuaranteeCallback from "@/components/HotelReservation/MyStay/Ancillaries/GuaranteeCallback"
import TrackGuarantee from "@/components/HotelReservation/MyStay/TrackGuarantee"
import LoadingSpinner from "@/components/LoadingSpinner"
import { setLang } from "@/i18n/serverContext"
import type { LangParams, PageArgs } from "@/types/params"
@@ -19,45 +21,56 @@ export default async function GuaranteePaymentCallbackPage({
}: PageArgs<
LangParams,
{
status: PaymentCallbackStatusEnum
RefId: string
status?: PaymentCallbackStatusEnum
RefId?: string
confirmationNumber?: string
ancillary?: string
}
>) {
console.log(`[gla-payment-callback] callback started`)
const lang = params.lang
const status = searchParams.status
const confirmationNumber = searchParams.confirmationNumber
const refId = searchParams.RefId
if (!refId) {
notFound()
}
const confirmationNumber = searchParams.confirmationNumber
const isAncillaryFlow = searchParams.ancillary
setLang(params.lang)
if (!status || !confirmationNumber || !refId) {
notFound()
}
const glaSuccessCounter = createCounter("gla", "success")
const metricsGlaSuccess = glaSuccessCounter.init({
confirmationNumber,
})
metricsGlaSuccess.start()
const myStayUrl = `${myStay[lang]}?RefId=${encodeURIComponent(refId)}`
const searchObject = new URLSearchParams()
if (status === PaymentCallbackStatusEnum.Success && confirmationNumber) {
if (isAncillaryFlow) {
return (
<GuaranteeCallback
returnUrl={myStayUrl}
refId={refId}
confirmationNumber={confirmationNumber}
lang={lang}
/>
)
}
console.log(`[gla-payment-callback] redirecting to: ${myStayUrl}`)
return <TrackGuarantee status={status} redirectUrl={myStayUrl} />
}
let errorMessage = undefined
if (confirmationNumber) {
const searchObject = new URLSearchParams()
try {
const bookingStatus = await serverClient().booking.status({
confirmationNumber,
refId,
})
const error = bookingStatus.errors.find((e) => e.errorCode)

93
apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/_page.tsx
View File

@@ -1,93 +0,0 @@
import {
BOOKING_CONFIRMATION_NUMBER,
BookingErrorCodeEnum,
PaymentCallbackStatusEnum,
} from "@/constants/booking"
import {
bookingConfirmation,
details,
} from "@/constants/routes/hotelReservation"
import { serverClient } from "@/lib/trpc/server"
import HandleErrorCallback from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleErrorCallback"
import HandleSuccessCallback from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback"
import type { LangParams, PageArgs } from "@/types/params"
export default async function PaymentCallbackPage({
params,
searchParams,
}: PageArgs<
LangParams,
{
status: PaymentCallbackStatusEnum
confirmationNumber?: string
hotel?: string
}
>) {
console.log(`[payment-callback] callback started`)
const lang = params.lang
const status = searchParams.status
const confirmationNumber = searchParams.confirmationNumber
if (status === PaymentCallbackStatusEnum.Success && confirmationNumber) {
const confirmationUrl = `${bookingConfirmation(lang)}?${BOOKING_CONFIRMATION_NUMBER}=${confirmationNumber}`
console.log(
`[payment-callback] rendering success callback with confirmation number: ${confirmationNumber}`
)
return (
<HandleSuccessCallback
confirmationNumber={confirmationNumber}
successRedirectUrl={confirmationUrl}
/>
)
}
const returnUrl = details(lang)
const searchObject = new URLSearchParams()
let errorMessage = undefined
if (confirmationNumber) {
try {
const bookingStatus = await serverClient().booking.status({
confirmationNumber,
})
// TODO: how to handle errors for multiple rooms?
const error = bookingStatus.errors.find((e) => e.errorCode)
errorMessage =
error?.description ??
`No error message found for booking ${confirmationNumber}, status: ${status}`
searchObject.set(
"errorCode",
error
? error.errorCode.toString()
: BookingErrorCodeEnum.TransactionFailed
)
} catch {
console.error(
`[payment-callback] failed to get booking status for ${confirmationNumber}, status: ${status}`
)
if (status === PaymentCallbackStatusEnum.Cancel) {
searchObject.set("errorCode", BookingErrorCodeEnum.TransactionCancelled)
}
if (status === PaymentCallbackStatusEnum.Error) {
searchObject.set("errorCode", BookingErrorCodeEnum.TransactionFailed)
errorMessage = `Failed to get booking status for ${confirmationNumber}, status: ${status}`
}
}
}
return (
<HandleErrorCallback
returnUrl={returnUrl.toString()}
searchObject={searchObject}
status={status}
errorMessage={errorMessage}
/>
)
}

2
apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/cancel/page.tsx
View File

@@ -8,7 +8,7 @@ import HandleErrorCallback from "@/components/HotelReservation/EnterDetails/Paym
import type { LangParams, PageArgs } from "@/types/params"
export default async function PaymentCallbackPage({
export default async function PaymentCallbackCancelPage({
params,
}: PageArgs<LangParams>) {
console.log(`[payment-callback] cancel callback started`)

10
apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/error/page.tsx
View File

@@ -6,10 +6,11 @@ import { details } from "@/constants/routes/hotelReservation"
import { serverClient } from "@/lib/trpc/server"
import HandleErrorCallback from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleErrorCallback"
import { calculateRefId } from "@/utils/refId"
import type { LangParams, PageArgs } from "@/types/params"
export default async function PaymentCallbackPage({
export default async function PaymentCallbackErrorPage({
params,
searchParams,
}: PageArgs<
@@ -19,6 +20,7 @@ export default async function PaymentCallbackPage({
}
>) {
console.log(`[payment-callback] error callback started`)
const lang = params.lang
const confirmationNumber = searchParams.confirmationNumber
@@ -28,9 +30,11 @@ export default async function PaymentCallbackPage({
let errorMessage = undefined
if (confirmationNumber) {
const refId = calculateRefId(confirmationNumber, "")
try {
const bookingStatus = await serverClient().booking.status({
confirmationNumber,
const bookingStatus = await serverClient().booking.confirmationError({
refId,
})
// TODO: how to handle errors for multiple rooms?

35
apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/success/page.tsx
View File

@@ -1,33 +1,44 @@
import { BOOKING_CONFIRMATION_NUMBER } from "@/constants/booking"
import { notFound } from "next/navigation"
import { bookingConfirmation } from "@/constants/routes/hotelReservation"
import { createCounter } from "@/server/telemetry"
import HandleSuccessCallback from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback"
import { setLang } from "@/i18n/serverContext"
import { calculateRefId } from "@/utils/refId"
import type { LangParams, PageArgs } from "@/types/params"
export default async function PaymentCallbackPage({
export default async function PaymentCallbackSuccessPage({
params,
searchParams,
}: PageArgs<
LangParams,
{
confirmationNumber: string
confirmationNumber?: string
}
>) {
console.log(`[payment-callback] success callback started`)
const lang = params.lang
const confirmationNumber = searchParams.confirmationNumber
const confirmationUrl = `${bookingConfirmation(lang)}?${BOOKING_CONFIRMATION_NUMBER}=${confirmationNumber}`
console.log(
`[payment-callback] rendering success callback with confirmation number: ${confirmationNumber}`
)
setLang(params.lang)
if (!confirmationNumber) {
notFound()
}
const paymentSuccessCounter = createCounter("payment", "success")
const metricsPaymentSuccess = paymentSuccessCounter.init({
confirmationNumber,
})
metricsPaymentSuccess.start()
const refId = calculateRefId(confirmationNumber, "")
return (
<HandleSuccessCallback
confirmationNumber={confirmationNumber}
successRedirectUrl={confirmationUrl}
refId={refId}
successRedirectUrl={bookingConfirmation(params.lang)}
/>
)
}