@bash-app/bash-common 30.56.0 → 30.58.0

package/src/utils/service/apiServiceBookingApiUtils.ts

@@ -1,9 +1,10 @@
+import { ServiceBookingStatus, ServiceBookingType } from "@prisma/client";
 import {
   ApiBookingParamsLuxon,
-  ApiServiceBookingParams,
-  ApiServiceBookedDayParamsLuxon,
   ApiServiceAddonParams,
   ApiServiceBookedDayParams,
+  ApiServiceBookedDayParamsLuxon,
+  ApiServiceBookingParams,
   ApiServicePriceToBookResult,
 } from "../../definitions";
 import {
@@ -17,12 +18,15 @@ import {
 } from "../../extendedSchemas";
 import { dateTimeFromString, dateTimeRangeFromDates } from "../luxonUtils";
 import { serviceAttendeeOptions } from "./attendeeOptionUtils";
-import { ServiceBookingPriceBreakdownBaseT } from "./serviceBookingTypes";
 import {
-  ServiceAddonInput,
-  FrontendServiceGetPriceToBookResult,
   FrontendServiceBookingDayInfo,
+  FrontendServiceGetPriceToBookResult,
+  ServiceAddonInput,
 } from "./frontendServiceBookingUtils";
+import {
+  ServiceBookingPriceBreakdownBaseT,
+  ServiceBookingRequiredData,
+} from "./serviceBookingTypes";
 
 export type ApiServiceCantBookReason = {
   type: string;
@@ -30,6 +34,9 @@ export type ApiServiceCantBookReason = {
 };
 
 export const ApiServiceCantBookReasons = {
+  notPublished: {
+    msg: "The requested service must be published..",
+  } as ApiServiceCantBookReason,
   notInBusinessHours: {
     msg: "Time not within normal Business Hours",
   } as ApiServiceCantBookReason,
@@ -104,6 +111,7 @@ export function apiTransformBookedDays(
       packages: [],
       fees: day.fees as ServiceBookingFeeExt[],
       priceBreakdown: priceBreakdown,
+      subtotalBeforeTaxesCents: day.subtotalBeforeTaxesCents,
       totalBeforeTaxesCents: day.totalBeforeTaxesCents,
     } as Partial<ServiceBookingDayExt>;
   });
@@ -137,6 +145,7 @@ export function serviceGetPriceToBookFromBooking(
         addOns: day.addOns,
         priceBreakdown: priceBreakdown,
         fees: day.fees,
+        subtotalBeforeTaxesCents: day.subtotalBeforeTaxesCents,
         totalBeforeTaxesCents: day.totalBeforeTaxesCents,
         timezone: booking.timezone,
       } as FrontendServiceBookingDayInfo;
@@ -148,11 +157,15 @@ export function serviceGetPriceToBookFromBooking(
 
   return {
     serviceId: service.id,
-    daysToBook: daysToBook,
+    timezone: booking.timezone,
     selectedAttendeeOption: serviceAttendeeOptions[0],
+    daysToBook: daysToBook,
+    rateOption: booking.rateOption,
+    flatRateCents: booking.flatRateCents,
     additionalFees: booking.additionalFees,
-    timezone: booking.timezone,
+    addOns: booking.addOns,
     daysTotalBeforeTaxesCents: booking.daysTotalATBCents,
+    subtotalBeforeTaxesCents: booking.subtotalATBCents,
     totalBeforeTaxesCents: booking.totalATBCents,
   } as FrontendServiceGetPriceToBookResult;
 }
@@ -220,3 +233,47 @@ export function servicePriceToBookToApiDays(
 
   return bookedDays;
 }
+export interface ServicePriceToBookToApiBookingBaseArgs {
+  bookingType: ServiceBookingType;
+  status: ServiceBookingStatus;
+  timezone: string;
+  priceToBook: FrontendServiceGetPriceToBookResult;
+  isFreeGuest?: boolean;
+  allowPromiseToPay?: boolean;
+}
+
+export function servicePriceToBookToApiBookingBase({
+  bookingType,
+  status,
+  timezone,
+  priceToBook,
+  allowPromiseToPay = false,
+  isFreeGuest = false,
+}: ServicePriceToBookToApiBookingBaseArgs): ServiceBookingRequiredData {
+  const bookedDays = apiTransformBookedDays(priceToBook);
+  const addOns = priceToBook.addOns.map(
+    (addOn): Partial<ServiceBookingAddOnExt> => ({
+      addOnId: addOn.addOnId,
+      addOn: addOn.addOn,
+      chosenQuantity: addOn.chosenQuantity,
+      costPQCents: addOn.costPQCents,
+    })
+  );
+
+  return {
+    bookingType: bookingType,
+    status: status,
+    timezone: timezone,
+    rateOption: priceToBook.rateOption,
+    flatRateCents: priceToBook.flatRateCents ?? null,
+    bookedDays: bookedDays as ServiceBookingDayExt[],
+    additionalFees: priceToBook.additionalFees as ServiceBookingFeeExt[],
+    daysTotalATBCents: priceToBook.daysTotalBeforeTaxesCents,
+    subtotalATBCents: priceToBook.subtotalBeforeTaxesCents,
+    totalATBCents: priceToBook.totalBeforeTaxesCents,
+    addOns: addOns as ServiceBookingAddOnExt[],
+    packages: [],
+    allowPromiseToPay: allowPromiseToPay,
+    isFreeGuest: isFreeGuest,
+  };
+}

package/src/utils/service/frontendServiceBookingUtils.ts

@@ -2,6 +2,7 @@ import {
   ServiceAddon,
   ServiceBookingFee,
   ServiceBookingFeeType,
+  ServiceBookingRateOption,
 } from "@prisma/client";
 import {
   ServiceBookingAddOnExt,
@@ -54,6 +55,7 @@ export interface FrontendServiceBookingDayInfo {
   dateTimeRange: LuxonDateRange;
   timezone: string;
 
+  subtotalBeforeTaxesCents: number; //sum of all daysTotalBeforeTaxesCents, plus addOns/packages
   totalBeforeTaxesCents: number;
 }
 
@@ -63,13 +65,20 @@ export interface FrontendServiceGetPriceToBookResult {
   daysToBook: FrontendServiceBookingDayInfo[];
   additionalFees: ServiceBookingFeeBase[];
 
+  rateOption: ServiceBookingRateOption;
+  flatRateCents?: number; //only valid on flatRate
+
+  addOns: ServiceBookingAddOnBase[]; //for bookings that do not bill by the time. e.g. flat rate bookings. For time based bookings, addOns are part of the day
+
   daysTotalBeforeTaxesCents: number;
+  subtotalBeforeTaxesCents: number; //sum of all daysTotalBeforeTaxesCents, plus addOns/packages
   totalBeforeTaxesCents: number;
 
   minimumTimeBlockHours?: number; //only valid on generalRate
 }
 
 export interface FrontendServiceGetBookingDayInfoFrontParams {
+  rateOption: ServiceBookingRateOption; //if true, then no special rates, daily rates, or general rates are used
   filteredRates: ServiceRatesLuxon;
   // overlappingBusinessHours: LuxonDateRange[] | null;
 
@@ -78,6 +87,7 @@ export interface FrontendServiceGetBookingDayInfoFrontParams {
 }
 
 export function frontendServiceGetBookingDayInfo({
+  rateOption,
   filteredRates,
   daysToBookParams,
   // overlappingBusinessHours,
@@ -99,49 +109,55 @@ export function frontendServiceGetBookingDayInfo({
       let currentRange = { ...day.dateTimeRange };
       let baseCostDiscountedCents = 0;
 
-      const rates = serviceRatesFilter(filteredRates, [day.dateTimeRange]);
-      const { generalRate, specialRates, dailyRates } = rates;
-      while (serviceRatesHasRates(rates) && hoursRemaining > 0) {
-        const pricingInfo = getServiceRatePricingInfo(
-          currentRange,
-          generalRate,
-          dailyRates,
-          specialRates,
-          // overlappingBusinessHours,
-          timezone,
-          hoursRemaining
-        );
-
-        if (pricingInfo.hours == 0 || pricingInfo.unitCount == 0) {
-          throw new Error(`Invalid pricingInfo`);
-        }
-
-        priceBreakdown.push(pricingInfo);
-
-        // currentRange.start = currentRange.start.plus({
-        //   hours: pricingInfo.hours,
-        // });
-        currentRange.start = pricingInfo.dateTimeRange.end;
-        hoursRemaining -= pricingInfo.hours;
-        baseCostDiscountedCents += pricingInfo.piTotalCents;
+      if (rateOption === ServiceBookingRateOption.FlatRate) {
+      } else if (rateOption === ServiceBookingRateOption.TimeBased) {
+        const rates = serviceRatesFilter(filteredRates, [day.dateTimeRange]);
+        const { generalRate, specialRates, dailyRates } = rates;
+        while (serviceRatesHasRates(rates) && hoursRemaining > 0) {
+          const pricingInfo = getServiceRatePricingInfo(
+            currentRange,
+            generalRate,
+            dailyRates,
+            specialRates,
+            // overlappingBusinessHours,
+            timezone,
+            hoursRemaining
+          );
+
+          if (pricingInfo.hours == 0 || pricingInfo.unitCount == 0) {
+            throw new Error(`Invalid pricingInfo`);
+          }
 
-        if (pricingInfo.hours < SERVICE_DAILY_RATE_HOURS_MIN) {
-          if (pricingInfo.rateType == "Special") {
-            specialRates.pop();
-          } else if (pricingInfo.rateType == "Weekday") {
-            dailyRates.pop();
+          priceBreakdown.push(pricingInfo);
+
+          // currentRange.start = currentRange.start.plus({
+          //   hours: pricingInfo.hours,
+          // });
+          currentRange.start = pricingInfo.dateTimeRange.end;
+          hoursRemaining -= pricingInfo.hours;
+          baseCostDiscountedCents += pricingInfo.piTotalCents;
+
+          if (pricingInfo.hours < SERVICE_DAILY_RATE_HOURS_MIN) {
+            if (pricingInfo.rateType == "Special") {
+              specialRates.pop();
+            } else if (pricingInfo.rateType == "Weekday") {
+              dailyRates.pop();
+            }
           }
         }
       }
 
-      const addOns = day.addOns.map((addOn): ServiceBookingAddOnBase => {
-        return {
-          addOn: addOn,
-          addOnId: addOn.id,
-          chosenQuantity: addOn.chosenQuantity ?? 0,
-          costPQCents: addOn.priceCents,
-        };
-      });
+      const addOns =
+        rateOption === "FlatRate"
+          ? []
+          : day.addOns.map((addOn): ServiceBookingAddOnBase => {
+              return {
+                addOn: addOn,
+                addOnId: addOn.id,
+                chosenQuantity: addOn.chosenQuantity ?? 0,
+                costPQCents: addOn.priceCents,
+              };
+            });
 
       const feesTotalCents = day.fees.reduce(
         (sofar, fee) => sofar + fee.costPQCents * fee.quantity,
@@ -153,15 +169,19 @@ export function frontendServiceGetBookingDayInfo({
         0
       );
 
-      const totalBeforeTaxesCents =
-        baseCostDiscountedCents + addOnsTotalCents + feesTotalCents;
+      const subtotalBeforeTaxesCents =
+        baseCostDiscountedCents + addOnsTotalCents;
+
+      const totalBeforeTaxesCents = subtotalBeforeTaxesCents + feesTotalCents;
 
       return {
         priceBreakdown: priceBreakdown,
         dateTimeRange: day.dateTimeRange,
+        rateOption: rateOption,
         timezone: day.dateTimeRange.start.zoneName,
         fees: day.fees,
         addOns: addOns,
+        subtotalBeforeTaxesCents: subtotalBeforeTaxesCents,
         totalBeforeTaxesCents: totalBeforeTaxesCents,
       } as FrontendServiceBookingDayInfo;
     });
@@ -174,6 +194,7 @@ export interface FrontendServiceGetPriceToBookFeesParams {
   selectedAttendeeOption: ServiceAttendeeOption;
 
   additionalFees: ServiceBookingFeeBase[];
+  addOns: ServiceAddonInput[]; //used for bookings that do not bill by the time. e.g. flat rate bookings
 
   // overlappingBusinessHours: LuxonDateRange[] | null;
   timezone: string | null | undefined;
@@ -184,6 +205,7 @@ export function frontendServiceGetPriceToBookFees(
   {
     daysToBookParams,
     selectedAttendeeOption,
+    addOns,
     additionalFees,
     // overlappingBusinessHours,
     timezone,
@@ -198,33 +220,76 @@ export function frontendServiceGetPriceToBookFees(
     timezone
   );
 
+  const isFlatRate = (filteredRates.generalRate?.flatRateCents ?? 0) > 0;
+  const rateOption = isFlatRate
+    ? ServiceBookingRateOption.FlatRate
+    : ServiceBookingRateOption.TimeBased;
+
+  //only add addOns if flat rate booking (addOns are part of the day for time based bookings)
+  const usedAddons =
+    rateOption === ServiceBookingRateOption.FlatRate
+      ? addOns.map((addOn): ServiceBookingAddOnBase => {
+          return {
+            addOn: addOn,
+            addOnId: addOn.id,
+            chosenQuantity: addOn.chosenQuantity ?? 0,
+            costPQCents: addOn.priceCents,
+          };
+        })
+      : [];
+
   const bookingDayResults: FrontendServiceBookingDayInfo[] =
     frontendServiceGetBookingDayInfo({
+      rateOption: rateOption,
       filteredRates: filteredRates,
       daysToBookParams: daysToBookParams,
       // overlappingBusinessHours: overlappingBusinessHours,
       timezone: timezone,
     });
 
-  const daysTotalBeforeTaxesCents = bookingDayResults.reduce((sofar, curr) => {
-    return sofar + curr.totalBeforeTaxesCents;
-  }, 0);
+  const flatRateCents = filteredRates.generalRate?.flatRateCents ?? 0;
+
+  const daysTotalBeforeTaxesCents =
+    rateOption === ServiceBookingRateOption.FlatRate
+      ? flatRateCents
+      : bookingDayResults.reduce((sofar, curr) => {
+          return sofar + curr.totalBeforeTaxesCents;
+        }, 0);
 
   const minimumTimeBlockHours =
     serviceRatesAssociation?.serviceGeneralRates?.minimumTimeBlockHours;
 
   // const attendeeRate = selectedAttendeeOption.rate * durationHours;
 
-  const processingFeeCents =
-    SERVICE_BOOKING_PROCESSING_FEE_PERCENT * daysTotalBeforeTaxesCents;
+  let allAdditionalFees = [...additionalFees];
+
+  // if (rateOption === ServiceBookingRateOption.FlatRate) {
+  //   allAdditionalFees.push({
+  //     feeType: ServiceBookingFeeType.FlatRate,
+  //     name: "Flat Rate",
+  //     description: "Flat Rate",
+  //     costPQCents: filteredRates.generalRate?.flatRateCents ?? 0,
+  //     quantity: 1,
+  //   });
+  // }
 
   const hasCustomProcessingFee = additionalFees.some(
     (fee) => fee.feeType == ServiceBookingFeeType.ProcessingFee
   );
 
-  let allAdditionalFees = [...additionalFees];
+  allAdditionalFees = allAdditionalFees.filter((fee) => fee.costPQCents > 0);
+
+  const addOnsTotalCents = usedAddons.reduce(
+    (sofar, addOn) => sofar + addOn.costPQCents * addOn.chosenQuantity,
+    0
+  );
+
+  const subtotalBeforeTaxesCents = daysTotalBeforeTaxesCents + addOnsTotalCents;
 
   if (!hasCustomProcessingFee) {
+    const processingFeeCents =
+      SERVICE_BOOKING_PROCESSING_FEE_PERCENT * subtotalBeforeTaxesCents;
+
     allAdditionalFees.push({
       feeType: ServiceBookingFeeType.ProcessingFee,
       name: "Processing Fee",
@@ -234,23 +299,28 @@ export function frontendServiceGetPriceToBookFees(
     });
   }
 
-  allAdditionalFees = allAdditionalFees.filter((fee) => fee.costPQCents > 0);
-
   const allAdditionalFeesCents = allAdditionalFees.reduce(
     (sofar, fee) => sofar + fee.costPQCents * fee.quantity,
     0
   );
 
   const totalBeforeTaxesCents =
-    daysTotalBeforeTaxesCents + allAdditionalFeesCents;
+    subtotalBeforeTaxesCents + allAdditionalFeesCents;
 
   return {
     serviceId: serviceRatesAssociation?.serviceId,
     daysToBook: bookingDayResults,
     daysTotalBeforeTaxesCents: daysTotalBeforeTaxesCents,
+    subtotalBeforeTaxesCents: subtotalBeforeTaxesCents,
     totalBeforeTaxesCents: totalBeforeTaxesCents,
     additionalFees: allAdditionalFees,
+    addOns: usedAddons,
     minimumTimeBlockHours: minimumTimeBlockHours,
+    rateOption: rateOption,
+    flatRateCents:
+      (filteredRates.generalRate?.flatRateCents ?? 0) > 0
+        ? filteredRates.generalRate?.flatRateCents
+        : undefined,
   } as FrontendServiceGetPriceToBookResult;
 }
 
@@ -305,6 +375,7 @@ export function frontendServiceGetPriceToBook(
     daysToBookParams: daysToBookParams,
     selectedAttendeeOption: selectedAttendeeOption,
     additionalFees: [],
+    addOns: addOns,
     timezone: timezone,
   });
 }

package/src/utils/service/serviceBookingTypes.ts

@@ -1,3 +1,4 @@
+import { ServiceBookingType, ServiceBookingStatus } from "@prisma/client";
 import {
   ServiceBookingAddOnExt,
   ServiceBookingFeeExt,
@@ -8,14 +9,24 @@ import {
   ServiceBookingExt,
 } from "../../extendedSchemas";
 import { LuxonDateRange } from "../luxonUtils";
+import { FrontendServiceGetPriceToBookResult } from "./frontendServiceBookingUtils";
+import { MakeNullablePropsOptional, MakeOptional } from "../typeUtils";
 
 export type ServiceBookingAddOnBase = Omit<
   ServiceBookingAddOnExt,
-  "id" | "serviceBookingDayId" | "serviceBookingDay"
+  | "id"
+  | "serviceBookingDayId"
+  | "serviceBookingDay"
+  | "serviceBookingId"
+  | "serviceBooking"
 >;
 export type ServiceBookingPackageBase = Omit<
   ServiceBookingAddOnExt,
-  "id" | "serviceBookingDayId" | "serviceBookingDay"
+  | "id"
+  | "serviceBookingDayId"
+  | "serviceBookingDay"
+  | "serviceBookingId"
+  | "serviceBooking"
 >;
 export type ServiceBookingFeeBase = Omit<
   ServiceBookingFeeExt,
@@ -38,6 +49,23 @@ export type ServiceBookingBase = Pick<
   "bookedDays" | "timezone" | "additionalFees"
 >;
 
+export type ServiceBookingRequiredData = MakeNullablePropsOptional<
+  MakeOptional<
+    ServiceBookingExt,
+    | "id"
+    | "isVendorBid"
+    | "bashEventId"
+    | "vendorEventDetails"
+    | "serviceId"
+    | "service"
+    | "forUserId"
+    | "forUser"
+    | "creatorId"
+    | "creator"
+    | "checkout"
+  >
+>;
+
 export type ServiceBookingAddonBaseT = ServiceBookingAddOnBase; //T for Transformed/Processed aka used for logic
 export type ServiceBookingPackageBaseT = ServiceBookingPackageBase;
 export type ServiceBookingFeeBaseT = ServiceBookingFeeBase;

package/src/utils/ticketListUtils.ts

@@ -4,51 +4,54 @@ import {
   URL_PARAMS_NUMBER_OF_TICKETS_TICKETS_DATE_DELIM,
   URL_PARAMS_TICKET_LIST_DELIM,
   URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM,
-  URL_PARAMS_TICKETS_DATE_DELIM
+  URL_PARAMS_TICKETS_DATE_DELIM,
 } from "../definitions";
-import { DATETIME_FORMAT_ISO_LIKE } from "./dateTimeUtils";
-
+import {
+  dateTimeFormat,
+  dateTimeFromDate,
+  dateTimeFromString,
+  LUXON_DATETIME_FORMAT_ISO_LIKE,
+} from "./luxonUtils";
 
 /**
  * Returns A string structured like: [ticketTierId]__[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~,...
  * @param ticketList A map where the key is the ticketTierId
  */
-export function ticketListToString(ticketList: Map<string, NumberOfTicketsForDate[]>): string {
+export function ticketListToString(
+  ticketList: Map<string, NumberOfTicketsForDate[]>
+): string {
   const ticketListArr: string[] = [];
 
   for (const [ticketTierId, ticketListArgs] of ticketList.entries()) {
     let ticketsExist = true;
-    const ticketArgs: string[] = [`${ticketTierId}${URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM}`];
+    const ticketArgs: string[] = [
+      `${ticketTierId}${URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM}`,
+    ];
     for (const ticketNumAndDates of ticketListArgs) {
       if (ticketNumAndDates.numberOfTickets > 0) {
         ticketsExist = true;
-        
+
         // Ensure ticketDateTime is in ISO format
         let dateTimeStr = ticketNumAndDates.ticketDateTime;
         if (dateTimeStr) {
           // If it's already a string, try to parse it as DateTime and convert to ISO
-          const dateTime = typeof dateTimeStr === 'string' 
-            ? DateTime.fromFormat(dateTimeStr, DATETIME_FORMAT_ISO_LIKE).isValid 
-              ? DateTime.fromFormat(dateTimeStr, DATETIME_FORMAT_ISO_LIKE)
-              : DateTime.fromISO(dateTimeStr).isValid
-                ? DateTime.fromISO(dateTimeStr)
-                : DateTime.fromJSDate(new Date(dateTimeStr))
-            : DateTime.fromJSDate(dateTimeStr as any);
-          
+          const dateTime = dateTimeFromDate(dateTimeStr);
           if (dateTime.isValid) {
-            dateTimeStr = dateTime.toISO() || dateTimeStr;
+            dateTimeStr = dateTimeFormat(dateTime) || dateTimeStr;
           }
         }
-        
+
         ticketArgs.push(
-          `${ticketNumAndDates.numberOfTickets}${URL_PARAMS_TICKETS_DATE_DELIM}${dateTimeStr}`);
-      }
-      else {
+          `${ticketNumAndDates.numberOfTickets}${URL_PARAMS_TICKETS_DATE_DELIM}${dateTimeStr}`
+        );
+      } else {
         ticketsExist = false;
       }
     }
     if (ticketsExist) {
-      ticketListArr.push(ticketArgs.join(URL_PARAMS_NUMBER_OF_TICKETS_TICKETS_DATE_DELIM));
+      ticketListArr.push(
+        ticketArgs.join(URL_PARAMS_NUMBER_OF_TICKETS_TICKETS_DATE_DELIM)
+      );
     }
   }
   return ticketListArr.join(URL_PARAMS_TICKET_LIST_DELIM);
@@ -58,7 +61,9 @@ export function ticketListToString(ticketList: Map<string, NumberOfTicketsForDat
  * Returns map where the key is the ticketTierId
  * @param ticketListStr A string structured like: [ticketTierId]__[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...,...
  */
-export function ticketListStrToTicketList(ticketListStr: string): Map<string, NumberOfTicketsForDate[]> {
+export function ticketListStrToTicketList(
+  ticketListStr: string
+): Map<string, NumberOfTicketsForDate[]> {
   const ticketList: Map<string, NumberOfTicketsForDate[]> = new Map();
 
   // [ticketTierId]__~~[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...,...
@@ -67,22 +72,30 @@ export function ticketListStrToTicketList(ticketListStr: string): Map<string, Nu
   ticketListArgs.forEach((tierIdAndTicketNumbersAndDates: string): void => {
     const ticketNumAndDatesArr: NumberOfTicketsForDate[] = [];
     // [ticketTierId]__~~[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...
-    const [ticketTierId, ticketNumAndDatesStr] = tierIdAndTicketNumbersAndDates.split(URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM);
+    const [ticketTierId, ticketNumAndDatesStr] =
+      tierIdAndTicketNumbersAndDates.split(
+        URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM
+      );
     if (!ticketNumAndDatesArr) {
-      throw new Error(`Could not parse ticketListStr. Maybe it is just an amount?`);
+      throw new Error(
+        `Could not parse ticketListStr. Maybe it is just an amount?`
+      );
     }
     // ~~[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...
-    const ticketNumAndDates = ticketNumAndDatesStr.split(URL_PARAMS_NUMBER_OF_TICKETS_TICKETS_DATE_DELIM)
-                                                  .filter((ticketNumAndDateStr): boolean => !!ticketNumAndDateStr);
+    const ticketNumAndDates = ticketNumAndDatesStr
+      .split(URL_PARAMS_NUMBER_OF_TICKETS_TICKETS_DATE_DELIM)
+      .filter((ticketNumAndDateStr): boolean => !!ticketNumAndDateStr);
 
     for (const ticketNumAndDateStr of ticketNumAndDates) {
       // [numberOfTickets];;[date]
-      const [numberOfTickets, ticketDateTimeStr] = ticketNumAndDateStr.split(URL_PARAMS_TICKETS_DATE_DELIM);
+      const [numberOfTickets, ticketDateTimeStr] = ticketNumAndDateStr.split(
+        URL_PARAMS_TICKETS_DATE_DELIM
+      );
       const ticketDateTime = DateTime.fromISO(ticketDateTimeStr);
       let ticketDateTimeFormattedStr: string | undefined = undefined;
 
       if (ticketDateTime.isValid) {
-        ticketDateTimeFormattedStr = ticketDateTime.toFormat(DATETIME_FORMAT_ISO_LIKE);
+        ticketDateTimeFormattedStr = dateTimeFormat(ticketDateTime);
       }
 
       ticketNumAndDatesArr.push({

package/src/utils/typeUtils.ts

@@ -6,17 +6,24 @@ export type RemoveCommonProperties<T, U> = keyof (Omit<T, keyof U> &
 export type MakeOptional<T, K extends keyof T> = Omit<T, K> &
   Partial<Pick<T, K>>;
 
+export type MakeNullablePropsOptional<T> = {
+  [K in keyof T as null extends T[K] ? K : never]?:
+    | Exclude<T[K], undefined>
+    | undefined;
+} & {
+  [K in keyof T as null extends T[K] ? never : K]: T[K];
+};
+
 export type MakeRequired<T, K extends keyof T> = Omit<T, K> &
   Required<Pick<T, K>>;
 
-export type DeepPartial<T> =
-  | T extends Function
-      ? T
-      : T extends Array<infer U>
-      ? Array<DeepPartial<U>>
-      : T extends object
-      ? { [P in keyof T]?: DeepPartial<T[P]> }
-      : T;
+export type DeepPartial<T> = T extends Function
+  ? T
+  : T extends Array<infer U>
+  ? Array<DeepPartial<U>>
+  : T extends object
+  ? { [P in keyof T]?: DeepPartial<T[P]> }
+  : T;
 
 export type Override<T, U> = Omit<T, keyof U> & U;