Merged in chore/add-error-details-for-sentry (pull request #3378)

Include more details when throwing errors for debugging in Sentry

* WIP throw errors with more details for debugging in Sentry

* Fix throwing response-data

* Clearer message when a response fails

* Add message to errors

* better typings

* .

* Try to send profileID and membershipNumber to Sentry when we fail to parse the apiResponse

* rename notFound -> notFoundError

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/add-error-details-for-sentry


Approved-by: Linus Flood

packages/trpc/lib/routers/booking/mutation/validatePartnerPayment.ts

@@ -5,7 +5,7 @@ import z from "zod"
 import { createCounter } from "@scandic-hotels/common/telemetry"
 
 import * as api from "../../../api"
-import { serverErrorByStatus } from "../../../errors"
+import { extractResponseDetails, serverErrorByStatus } from "../../../errors"
 import { safeProtectedServiceProcedure } from "../../../procedures"
 import { toApiLang } from "../../../utils"
 
@@ -51,7 +51,11 @@ export const validatePartnerPayment = safeProtectedServiceProcedure
         return null
       }
 
-      throw serverErrorByStatus(apiResponse.status, apiResponse)
+      throw serverErrorByStatus(
+        apiResponse.status,
+        await extractResponseDetails(apiResponse),
+        "validatePartnerPayment failed"
+      )
     }
 
     metricsValidateBooking.success()

packages/trpc/lib/routers/booking/query.ts

@@ -2,7 +2,12 @@ import { createCounter } from "@scandic-hotels/common/telemetry"
 
 import { router } from "../.."
 import * as api from "../../api"
-import { badRequestError, serverErrorByStatus } from "../../errors"
+import {
+  badRequestError,
+  extractResponseDetails,
+  notFoundError,
+  serverErrorByStatus,
+} from "../../errors"
 import { createRefIdPlugin } from "../../plugins/refIdToConfirmationNumber"
 import {
   safeProtectedServiceProcedure,
@@ -85,8 +90,10 @@ export const bookingQueryRouter = router({
             hotelId: booking.hotelId,
           }
         )
-
-        throw serverErrorByStatus(404)
+        throw notFoundError({
+          message: "Hotel data not found",
+          errorDetails: { hotelId: booking.hotelId },
+        })
       }
 
       metricsGetBooking.success()
@@ -163,7 +170,10 @@ export const bookingQueryRouter = router({
           }
         )
 
-        throw serverErrorByStatus(404)
+        throw notFoundError({
+          message: "Hotel data not found",
+          errorDetails: { hotelId: booking.hotelId },
+        })
       }
 
       metricsFindBooking.success()
@@ -265,14 +275,22 @@ export const bookingQueryRouter = router({
 
       if (!apiResponse.ok) {
         await metricsGetBookingStatus.httpError(apiResponse)
-        throw serverErrorByStatus(apiResponse.status, apiResponse)
+        throw serverErrorByStatus(
+          apiResponse.status,
+          await extractResponseDetails(apiResponse),
+          "getBookingStatus failed"
+        )
       }
 
       const apiJson = await apiResponse.json()
       const verifiedData = createBookingSchema.safeParse(apiJson)
       if (!verifiedData.success) {
         metricsGetBookingStatus.validationError(verifiedData.error)
-        throw badRequestError()
+
+        throw badRequestError({
+          message: "Invalid booking data",
+          errorDetails: verifiedData.error.formErrors,
+        })
       }
 
       metricsGetBookingStatus.success()

packages/trpc/lib/routers/booking/utils.ts

@@ -1,7 +1,11 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
 
 import * as api from "../../api"
-import { badRequestError, serverErrorByStatus } from "../../errors"
+import {
+  badRequestError,
+  extractResponseDetails,
+  serverErrorByStatus,
+} from "../../errors"
 import { toApiLang } from "../../utils"
 import { createBookingSchema } from "./mutation/create/schema"
 import { bookingConfirmationSchema } from "./output"
@@ -37,7 +41,11 @@ export async function getBooking(
       return null
     }
 
-    throw serverErrorByStatus(apiResponse.status, apiResponse)
+    throw serverErrorByStatus(
+      apiResponse.status,
+      await extractResponseDetails(apiResponse),
+      "getBooking failed"
+    )
   }
 
   const apiJson = await apiResponse.json()
@@ -94,7 +102,11 @@ export async function findBooking(
       return null
     }
 
-    throw serverErrorByStatus(apiResponse.status, apiResponse)
+    throw serverErrorByStatus(
+      apiResponse.status,
+      await extractResponseDetails(apiResponse),
+      "findBooking failed"
+    )
   }
 
   const apiJson = await apiResponse.json()