Merged in monorepo-step-1 (pull request #1080)

Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood

apps/scandic-web/server/routers/hotels/schemas/roomAvailability/configuration.ts

@@ -0,0 +1,83 @@
+import deepmerge from "deepmerge"
+import { z } from "zod"
+
+import { productSchema } from "./product"
+
+import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel"
+import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
+
+export const roomConfigurationSchema = z
+  .object({
+    breakfastIncludedInAllRatesMember: z.boolean().default(false),
+    breakfastIncludedInAllRatesPublic: z.boolean().default(false),
+    features: z
+      .array(
+        z.object({
+          inventory: z.number(),
+          code: z.enum([
+            RoomPackageCodeEnum.PET_ROOM,
+            RoomPackageCodeEnum.ALLERGY_ROOM,
+            RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
+          ]),
+        })
+      )
+      .default([]),
+    products: z.array(productSchema).default([]),
+    roomsLeft: z.number(),
+    roomType: z.string(),
+    roomTypeCode: z.string(),
+    status: z.string(),
+  })
+  .transform((data) => {
+    if (data.products.length) {
+      const someProductsMissAtLeastOneRateCode = data.products.some(
+        ({ productType }) =>
+          !productType.public.rateCode || !productType.member?.rateCode
+      )
+      if (someProductsMissAtLeastOneRateCode) {
+        data.products = data.products.map((product) => {
+          if (
+            product.productType.public.rateCode &&
+            product.productType.member?.rateCode
+          ) {
+            return product
+          }
+
+          /**
+           * Reset both rateCodes if one is missing to show `No prices available` for the same reason as
+           * mentioned above.
+           *
+           * TODO: (Maybe) notify somewhere that this happened
+           */
+          return deepmerge(product, {
+            productType: {
+              member: {
+                rateCode: "",
+                oldRateCode: product.productType.member?.rateCode,
+              },
+              public: {
+                rateCode: "",
+                oldRateCode: product.productType.public.rateCode,
+              },
+            },
+          })
+        })
+      }
+
+      /**
+       * When all products miss at least one rateCode (member or public), we change the status to NotAvailable
+       * since we cannot as of now (31 january) guarantee the flow with missing rateCodes.
+       *
+       * TODO: (Maybe) notify somewhere that this happened
+       */
+      const allProductsMissAtLeastOneRateCode = data.products.every(
+        ({ productType }) =>
+          !productType.public.rateCode || !productType.member?.rateCode
+      )
+      if (allProductsMissAtLeastOneRateCode) {
+        data.status = AvailabilityEnum.NotAvailable
+      }
+    }
+
+    return data
+  })

apps/scandic-web/server/routers/hotels/schemas/roomAvailability/product.ts

@@ -0,0 +1,21 @@
+import { z } from "zod"
+
+import { productTypePriceSchema } from "../productTypePrice"
+
+import { CurrencyEnum } from "@/types/enums/currency"
+
+export const productSchema = z.object({
+  productType: z.object({
+    member: productTypePriceSchema.optional(),
+    public: productTypePriceSchema.default({
+      localPrice: {
+        currency: CurrencyEnum.SEK,
+        pricePerNight: 0,
+        pricePerStay: 0,
+      },
+      rateCode: "",
+      rateType: "",
+      requestedPrice: undefined,
+    }),
+  }),
+})

apps/scandic-web/server/routers/hotels/schemas/roomAvailability/rateDefinition.ts

@@ -0,0 +1,12 @@
+import { z } from "zod"
+
+export const rateDefinitionSchema = z.object({
+  breakfastIncluded: z.boolean(),
+  cancellationRule: z.string(),
+  cancellationText: z.string(),
+  generalTerms: z.array(z.string()),
+  mustBeGuaranteed: z.boolean(),
+  rateCode: z.string(),
+  rateType: z.string().optional(),
+  title: z.string(),
+})