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

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

Approved-by: Anton Gunnarsson

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback.tsx

@@ -18,12 +18,12 @@ const validBookingStatuses = [
 ]
 
 interface HandleStatusPollingProps {
-  refId: string
+  confirmationNumber: string
   successRedirectUrl: string
 }
 
 export default function HandleSuccessCallback({
-  refId,
+  confirmationNumber,
   successRedirectUrl,
 }: HandleStatusPollingProps) {
   const router = useRouter()
@@ -33,7 +33,7 @@ export default function HandleSuccessCallback({
     error,
     isTimeout,
   } = useHandleBookingStatus({
-    refId,
+    confirmationNumber,
     expectedStatuses: validBookingStatuses,
     maxRetries: 10,
     retryInterval: 2000,
@@ -70,9 +70,9 @@ export default function HandleSuccessCallback({
         ? `&errorCode=${membershipFailedError.errorCode}`
         : ""
 
-      router.replace(`${successRedirectUrl}?RefId=${refId}${errorParam}`)
+      router.replace(`${successRedirectUrl}${errorParam}`)
     }
-  }, [bookingStatus, refId, router, successRedirectUrl])
+  }, [bookingStatus, successRedirectUrl, router])
 
   if (isTimeout || error) {
     return <TimeoutSpinner />

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx

@@ -2,7 +2,7 @@
 
 import { zodResolver } from "@hookform/resolvers/zod"
 import { usePathname, useRouter, useSearchParams } from "next/navigation"
-import { useCallback, useEffect, useRef, useState } from "react"
+import { useCallback, useEffect, useState } from "react"
 import { Label } from "react-aria-components"
 import { FormProvider, useForm } from "react-hook-form"
 import { useIntl } from "react-intl"
@@ -10,6 +10,7 @@ import { useIntl } from "react-intl"
 import { Typography } from "@scandic-hotels/design-system/Typography"
 
 import {
+  BOOKING_CONFIRMATION_NUMBER,
   BookingStatusEnum,
   PAYMENT_METHOD_TITLES,
   PaymentMethodEnum,
@@ -29,6 +30,7 @@ import Button from "@/components/TempDesignSystem/Button"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import { useAvailablePaymentOptions } from "@/hooks/booking/useAvailablePaymentOptions"
+import { useHandleBookingStatus } from "@/hooks/booking/useHandleBookingStatus"
 import useLang from "@/hooks/useLang"
 import useStickyPosition from "@/hooks/useStickyPosition"
 import { trackPaymentEvent } from "@/utils/tracking"
@@ -99,7 +101,7 @@ export default function PaymentClient({
     (state) => state.actions.setIsSubmittingDisabled
   )
 
-  const [refId, setRefId] = useState<string>("")
+  const [bookingNumber, setBookingNumber] = useState<string>("")
   const [isPollingForBookingStatus, setIsPollingForBookingStatus] =
     useState(false)
 
@@ -144,14 +146,13 @@ export default function PaymentClient({
           return
         }
 
-        const mainRoom = result.rooms[0]
         if (result.reservationStatus == BookingStatusEnum.BookingCompleted) {
-          const confirmationUrl = `${bookingConfirmation(lang)}?RefId=${mainRoom.refId}`
+          const confirmationUrl = `${bookingConfirmation(lang)}?${BOOKING_CONFIRMATION_NUMBER}=${result.id}`
           router.push(confirmationUrl)
           return
         }
 
-        setRefId(mainRoom.refId)
+        setBookingNumber(result.id)
 
         const hasPriceChange = result.rooms.some((r) => r.priceChangedMetadata)
         if (hasPriceChange) {
@@ -173,8 +174,8 @@ export default function PaymentClient({
   })
 
   const priceChange = trpc.booking.priceChange.useMutation({
-    onSuccess: (confirmationNumber) => {
-      if (confirmationNumber) {
+    onSuccess: (result) => {
+      if (result?.id) {
         setIsPollingForBookingStatus(true)
       } else {
         handlePaymentError("No confirmation number")
@@ -188,39 +189,13 @@ export default function PaymentClient({
     },
   })
 
-  // Replaced useHandleBookingStatus with logic specifically used here, since the hook would need
-  // to handle different parameters based on use case
-  const retries = useRef(0)
-
-  const bookingStatus = trpc.booking.confirmationCompleted.useQuery(
-    {
-      refId,
-      lang,
-    },
-    {
-      enabled: isPollingForBookingStatus,
-      refetchInterval: (query) => {
-        retries.current = query.state.dataUpdateCount
-
-        if (query.state.error || query.state.dataUpdateCount >= maxRetries) {
-          return false
-        }
-
-        if (
-          query.state.data?.reservationStatus ===
-          BookingStatusEnum.BookingCompleted
-        ) {
-          return false
-        }
-
-        return retryInterval
-      },
-      refetchIntervalInBackground: true,
-      refetchOnWindowFocus: false,
-      refetchOnMount: false,
-      retry: false,
-    }
-  )
+  const bookingStatus = useHandleBookingStatus({
+    confirmationNumber: bookingNumber,
+    expectedStatuses: [BookingStatusEnum.BookingCompleted],
+    maxRetries,
+    retryInterval,
+    enabled: isPollingForBookingStatus,
+  })
 
   const handlePaymentError = useCallback(
     (errorMessage: string) => {
@@ -270,12 +245,18 @@ export default function PaymentClient({
   )
 
   useEffect(() => {
-    if (bookingStatus?.data?.redirectUrl) {
-      router.push(bookingStatus.data.redirectUrl)
-    } else if (retries.current >= maxRetries) {
+    if (bookingStatus?.data?.paymentUrl) {
+      router.push(bookingStatus.data.paymentUrl)
+    } else if (
+      bookingStatus?.data?.reservationStatus ===
+      BookingStatusEnum.BookingCompleted
+    ) {
+      const confirmationUrl = `${bookingConfirmation(lang)}?${BOOKING_CONFIRMATION_NUMBER}=${bookingStatus?.data?.id}`
+      router.push(confirmationUrl)
+    } else if (bookingStatus.isTimeout) {
       handlePaymentError("Timeout")
     }
-  }, [bookingStatus, router, handlePaymentError])
+  }, [bookingStatus, router, intl, lang, handlePaymentError])
 
   useEffect(() => {
     setIsSubmittingDisabled(
@@ -477,7 +458,7 @@ export default function PaymentClient({
     initiateBooking.isPending ||
     (isPollingForBookingStatus &&
       !bookingStatus.data?.paymentUrl &&
-      retries.current < maxRetries)
+      !bookingStatus.isTimeout)
   ) {
     return <LoadingSpinner />
   }
@@ -639,7 +620,9 @@ export default function PaymentClient({
               : ""
             router.push(`${selectRate(lang)}${allSearchParams}`)
           }}
-          onAccept={() => priceChange.mutate({ refId })}
+          onAccept={() =>
+            priceChange.mutate({ confirmationNumber: bookingNumber })
+          }
         />
       ) : null}
     </section>