Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately

server/routers/hotels/output.ts

@@ -13,7 +13,6 @@ 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
   .object({
@@ -199,14 +198,12 @@ const rewardNightSchema = z.object({
   }),
 })
 
-const poiCategoryNames = z.nativeEnum(PointOfInterestCategoryNameEnum)
-
 export const pointOfInterestSchema = z
   .object({
     name: z.string(),
     distance: z.number(),
     category: z.object({
-      name: poiCategoryNames,
+      name: z.string(),
       group: z.string(),
     }),
     location: locationSchema,
@@ -515,7 +512,16 @@ export const productTypePriceSchema = z.object({
 
 const productSchema = z.object({
   productType: z.object({
-    public: productTypePriceSchema,
+    public: productTypePriceSchema.default({
+      rateCode: "",
+      rateType: "",
+      localPrice: {
+        currency: "SEK",
+        pricePerNight: 0,
+        pricePerStay: 0,
+      },
+      requestedPrice: undefined,
+    }),
     member: productTypePriceSchema.optional(),
   }),
 })

server/routers/hotels/query.ts

@@ -731,7 +731,7 @@ export const hotelQueryRouter = router({
 
         const rateTypes = selectedRoom.products.find(
           (rate) =>
-            rate.productType.public.rateCode === rateCode ||
+            rate.productType.public?.rateCode === rateCode ||
             rate.productType.member?.rateCode === rateCode
         )
 

server/routers/hotels/utils.ts

@@ -12,39 +12,34 @@ import {
   type Countries,
 } from "./output"
 
-import type { RequestOptionsWithOutBody } from "@/types/fetch"
-import {
-  PointOfInterestCategoryNameEnum,
-  PointOfInterestGroupEnum,
-} from "@/types/hotel"
-import { HotelLocation } from "@/types/trpc/routers/hotel/locations"
 import type { Lang } from "@/constants/languages"
 import type { Endpoint } from "@/lib/api/endpoints"
+import type { RequestOptionsWithOutBody } from "@/types/fetch"
+import { PointOfInterestGroupEnum } from "@/types/hotel"
+import { HotelLocation } from "@/types/trpc/routers/hotel/locations"
 
-export function getPoiGroupByCategoryName(
-  category: PointOfInterestCategoryNameEnum
-) {
+export function getPoiGroupByCategoryName(category: string) {
   switch (category) {
-    case PointOfInterestCategoryNameEnum.AIRPORT:
-    case PointOfInterestCategoryNameEnum.BUS_TERMINAL:
-    case PointOfInterestCategoryNameEnum.TRANSPORTATIONS:
+    case "Airport":
+    case "Bus terminal":
+    case "Transportations":
       return PointOfInterestGroupEnum.PUBLIC_TRANSPORT
-    case PointOfInterestCategoryNameEnum.AMUSEMENT_PARK:
-    case PointOfInterestCategoryNameEnum.MUSEUM:
-    case PointOfInterestCategoryNameEnum.SPORTS:
-    case PointOfInterestCategoryNameEnum.THEATRE:
-    case PointOfInterestCategoryNameEnum.TOURIST:
-    case PointOfInterestCategoryNameEnum.ZOO:
+    case "Amusement park":
+    case "Museum":
+    case "Sports":
+    case "Theatre":
+    case "Tourist":
+    case "Zoo":
       return PointOfInterestGroupEnum.ATTRACTIONS
-    case PointOfInterestCategoryNameEnum.NEARBY_COMPANIES:
-    case PointOfInterestCategoryNameEnum.FAIR:
+    case "Nearby companies":
+    case "Fair":
       return PointOfInterestGroupEnum.BUSINESS
-    case PointOfInterestCategoryNameEnum.PARKING_GARAGE:
+    case "Parking / Garage":
       return PointOfInterestGroupEnum.PARKING
-    case PointOfInterestCategoryNameEnum.SHOPPING:
-    case PointOfInterestCategoryNameEnum.RESTAURANT:
+    case "Shopping":
+    case "Restaurant":
       return PointOfInterestGroupEnum.SHOPPING_DINING
-    case PointOfInterestCategoryNameEnum.HOSPITAL:
+    case "Hospital":
     default:
       return PointOfInterestGroupEnum.LOCATION
   }

server/routers/user/input.ts

@@ -1,5 +1,9 @@
 import { z } from "zod"
 
+import { Lang } from "@/constants/languages"
+
+import { signUpSchema } from "@/components/Forms/Signup/schema"
+
 // Query
 export const staysInput = z
   .object({
@@ -35,3 +39,19 @@ export const saveCreditCardInput = z.object({
   transactionId: z.string(),
   merchantId: z.string().optional(),
 })
+
+export const signupInput = signUpSchema
+  .extend({
+    language: z.nativeEnum(Lang),
+  })
+  .omit({ termsAccepted: true })
+  .transform((data) => ({
+    ...data,
+    phoneNumber: data.phoneNumber.replace(/\s+/g, ""),
+    address: {
+      ...data.address,
+      city: "",
+      country: "",
+      streetAddress: "",
+    },
+  }))

server/routers/user/mutation.ts

@@ -1,17 +1,20 @@
 import { metrics } from "@opentelemetry/api"
 
+import { signupVerify } from "@/constants/routes/signup"
 import { env } from "@/env/server"
 import * as api from "@/lib/api"
+import { serverErrorByStatus } from "@/server/errors/trpc"
 import {
   initiateSaveCardSchema,
   subscriberIdSchema,
 } from "@/server/routers/user/output"
-import { protectedProcedure, router } from "@/server/trpc"
+import { protectedProcedure, router, serviceProcedure } from "@/server/trpc"
 
 import {
   addCreditCardInput,
   deleteCreditCardInput,
   saveCreditCardInput,
+  signupInput,
 } from "./input"
 
 const meter = metrics.getMeter("trpc.user")
@@ -24,6 +27,9 @@ const generatePreferencesLinkSuccessCounter = meter.createCounter(
 const generatePreferencesLinkFailCounter = meter.createCounter(
   "trpc.user.generatePreferencesLink-fail"
 )
+const signupCounter = meter.createCounter("trpc.user.signup")
+const signupSuccessCounter = meter.createCounter("trpc.user.signup-success")
+const signupFailCounter = meter.createCounter("trpc.user.signup-fail")
 
 export const userMutationRouter = router({
   creditCard: router({
@@ -208,4 +214,46 @@ export const userMutationRouter = router({
     generatePreferencesLinkSuccessCounter.add(1)
     return preferencesLink.toString()
   }),
+  signup: serviceProcedure.input(signupInput).mutation(async function ({
+    ctx,
+    input,
+  }) {
+    signupCounter.add(1)
+
+    const apiResponse = await api.post(api.endpoints.v1.Profile.profile, {
+      body: input,
+      headers: {
+        Authorization: `Bearer ${ctx.serviceToken}`,
+      },
+    })
+
+    if (!apiResponse.ok) {
+      const text = await apiResponse.text()
+      signupFailCounter.add(1, {
+        error_type: "http_error",
+        error: JSON.stringify({
+          status: apiResponse.status,
+          statusText: apiResponse.statusText,
+          error: text,
+        }),
+      })
+      console.error(
+        "api.user.signup api error",
+        JSON.stringify({
+          error: {
+            status: apiResponse.status,
+            statusText: apiResponse.statusText,
+            error: text,
+          },
+        })
+      )
+      throw serverErrorByStatus(apiResponse.status, text)
+    }
+    signupSuccessCounter.add(1)
+    console.info("api.user.signup success")
+    return {
+      success: true,
+      redirectUrl: signupVerify[input.language],
+    }
+  }),
 })

server/routers/user/output.ts

@@ -1,6 +1,8 @@
 import { z } from "zod"
 
 import { countriesMap } from "@/components/TempDesignSystem/Form/Country/countries"
+import { passwordValidator } from "@/utils/passwordValidator"
+import { phoneValidator } from "@/utils/phoneValidator"
 import { getMembership } from "@/utils/user"
 
 export const membershipSchema = z.object({

server/trpc.ts

@@ -121,7 +121,7 @@ export const safeProtectedProcedure = t.procedure.use(async function (opts) {
   })
 })
 
-export const serviceProcedure = t.procedure.use(async (opts) => {
+export const serviceProcedure = t.procedure.use(async function (opts) {
   const { access_token } = await getServiceToken()
   if (!access_token) {
     throw internalServerError(`[serviceProcedure] No service token`)