@bash-app/bash-common 29.68.0 → 29.69.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.68.0",
+  "version": "29.69.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/prisma/schema.prisma

@@ -140,25 +140,30 @@ model BashEventPromoCode {
 }
 
 model BashNotification {
-  id              String      @id @default(cuid())
-  creatorId       String
-  creator         User        @relation("NotificationsCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
-  email           String
-  createdDateTime DateTime    @default(now())
-  message         String
-  image           String?
-  readDateTime    DateTime?
-  taskId          String?
-  eventTask       EventTask?  @relation(fields: [taskId], references: [id], onDelete: Cascade)
-  invitationId    String?
-  invitation      Invitation? @relation(fields: [invitationId], references: [id], onDelete: Cascade)
-  bashEventId     String?
-  bashEvent       BashEvent?  @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  reminders       Reminder[]
-  redirectUrl     String?
+  id               String          @id @default(cuid())
+  creatorId        String
+  creator          User            @relation("NotificationsCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
+  email            String
+  createdDateTime  DateTime        @default(now())
+  message          String
+  image            String?
+  readDateTime     DateTime?
+  taskId           String?
+  eventTask        EventTask?      @relation(fields: [taskId], references: [id], onDelete: Cascade)
+  invitationId     String?
+  invitation       Invitation?     @relation(fields: [invitationId], references: [id], onDelete: Cascade)
+  bashEventId      String?
+  bashEvent        BashEvent?      @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  serviceId        String?
+  service          Service?        @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  serviceBookingId String?
+  serviceBooking   ServiceBooking? @relation(fields: [serviceBookingId], references: [id], onDelete: Cascade)
+  reminders        Reminder[]
+  redirectUrl      String?
 
   @@unique([creatorId, email, bashEventId])
   @@unique([creatorId, email, invitationId])
+  @@unique([creatorId, email, serviceBookingId])
   @@index([creatorId])
 }
 
@@ -628,6 +633,7 @@ enum BashStatus {
   PreSale
   Published
   Finished
+  // should we add Approved, Rejected, Confirmed, and Canceled like services has?
 }
 
 enum ServiceStatus {
@@ -1158,6 +1164,7 @@ model Service {
   bashEvent               BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
   userPromoCodeRedemption UserPromoCodeRedemption[]
   bookings                ServiceBooking[]
+  bashNotification        BashNotification[]
 }
 
 model StripeAccount {
@@ -1632,6 +1639,8 @@ model ServiceBookingAddOn {
   addOnId        String
   addOn          ServiceAddon @relation(fields: [addOnId], references: [id])
   chosenQuantity Int
+
+  // costATBCents Int
 }
 
 model ServiceBookingPackage {
@@ -1643,6 +1652,8 @@ model ServiceBookingPackage {
   packageId      String
   package        ServicePackage @relation(fields: [packageId], references: [id])
   chosenQuantity Int
+
+  // costATBCents Int
 }
 
 model ServiceBookingDay {
@@ -1656,6 +1667,8 @@ model ServiceBookingDay {
 
   addOns   ServiceBookingAddOn[]
   packages ServiceBookingPackage[]
+
+  // costATBCents Int
 }
 
 model ServiceBooking {
@@ -1675,17 +1688,20 @@ model ServiceBooking {
   status      ServiceBookingStatus @default(Pending)
   bookingType ServiceBookingType   @default(Request)
 
-  requestedOn DateTime?
-  confirmedOn DateTime?
-  paidOn      DateTime?
-  refundedOn  DateTime?
+  timezone String //stored here instead of service incase different service types operate in multiple timezones (requesters timezone would matter)
+
+  requestedOn       DateTime?
+  requestDecisionOn DateTime?
+  bookedOn          DateTime?
+  canceledOn        DateTime?
 
   isFreeGuest       Boolean @default(false)
   allowPromiseToPay Boolean @default(false)
 
-  totalAmount   Int //stored in cents
-  depositAmount Int
-  checkout      ServiceBookingCheckout?
+  checkout         ServiceBookingCheckout?
+  bashNotification BashNotification[]
+
+  // costATBCents Int
 
   @@index([status])
   @@index([creatorId])
@@ -1703,9 +1719,13 @@ model ServiceBookingCheckout {
 
   checkoutDateTime        DateTime? @default(now())
   stripeCheckoutSessionId String?   @unique
+  stripePaymentIntentId   String?   @unique
+
+  paidOn     DateTime?
+  refundedOn DateTime?
 
-  totalAmount   Int //stored in cents
-  depositAmount Int
+  totalAmount   Int? //stored in cents
+  depositAmount Int?
 
   @@index(creatorId)
 }

package/src/definitions.ts

@@ -21,6 +21,7 @@ import {
   PublicUser,
   VolunteerServiceExt,
   BashEventExt,
+  ServiceBookingExt,
 } from "./extendedSchemas";
 import { ServiceSubscriptionTier } from "./utils/userSubscriptionUtils";
 import {
@@ -29,59 +30,13 @@ import {
 } from "./utils/service/serviceBookingUtils";
 import { LuxonDateRange } from "./utils/luxonUtils";
 import { ServiceCantBookReason } from "./utils/service/serviceBookingApiUtils";
+import { urlAppendQueryParam } from "./utils/urlUtils";
+import { ServiceAttendeeOption } from "./utils/service/attendeeOptionUtils";
 
 export const PASSWORD_MIN_LENGTH = 8 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(
   String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&^#])[A-Za-z\d@$!%*?&^#]{${PASSWORD_MIN_LENGTH},}$`
 );
-export const BASH_FEE_PERCENTAGE = 0.1;
-export const GOOGLE_CALLBACK_URL = "/auth/google/callback" as const;
-export const CHECKOUT_RETURN_SUCCESS_URL =
-  `/checkout-return/success/{CHECKOUT_SESSION_ID}` as const;
-export const CHECKOUT_RETURN_CANCEL_URL =
-  `/checkout-return/cancel/{CHECKOUT_SESSION_ID}` as const;
-export const CHECKOUT_RETURN_SUCCESS_URL_PAGE =
-  "/checkout-return/success/$checkoutSessionId" as const;
-export const CHECKOUT_RETURN_CANCEL_URL_PAGE =
-  "/checkout-return/cancel/$checkoutSessionId" as const;
-export const DONATION_CHECKOUT_RETURN_SUCCESS_URL =
-  `/donation-checkout-return/success/{CHECKOUT_SESSION_ID}` as const;
-export const DONATION_CHECKOUT_RETURN_CANCEL_URL =
-  `/donation-checkout-return/cancel/{CHECKOUT_SESSION_ID}` as const;
-export const DONATION_CHECKOUT_RETURN_SUCCESS_URL_PAGE =
-  "/donation-checkout-return/success/$checkoutSessionId" as const;
-export const DONATION_CHECKOUT_RETURN_CANCEL_URL_PAGE =
-  "/donation-checkout-return/cancel/$checkoutSessionId" as const;
-export const VERIFICATION_RETURN_URL = `/sign-up` as const;
-export const MY_SERVICES_URL = "/my-services" as const;
-export const BASH_DETAIL_URL = `/bash-detail` as const;
-export const SERVICE_PAGE_URL = `/service-page` as const;
-export const LOGIN_URL = `/login` as const;
-export const TICKET_DETAILS = `/ticket-details` as const;
-
-export const SWR_KEY_AUTH_TOKEN = "auth-token" as const;
-
-export const PRICE_DOLLARS_AND_CENTS_RATIO = 100 as const;
-
-export const MIN_AMOUNT_OF_TICKETS_FOR_PUBLIC_EVENT_TO_SHOW = 0 as const;
-export const DEFAULT_MAX_NUMBER_OF_TICKETS = 35 as const;
-export const MIN_NUMBER_OF_TICKETS = 0 as const;
-
-export const MAX_NUMBER_OF_FREE_TICKETS_PER_USER_FOR_A_BASH_EVENT =
-  100 as const;
-export const MAX_NUMBER_OF_TICKETS_PER_REQUEST_FOR_A_BASH_EVENT = 50 as const;
-
-export const MONTHS_PREVIOUS_THAT_STRIPE_ACCOUNTS_WILL_BE_SEARCHED_BY_EMAIL =
-  1 as const;
-
-export const HTTP_CODE_OK = 200 as const;
-export const HTTP_CODE_TEMPORARY_REDIRECT = 307 as const;
-export const HTTP_CODE_INTERNAL_SERVER_ERR = 500 as const;
-export const HTTP_CODE_BAD_REQUEST = 400 as const;
-export const HTTP_CODE_UNAUTHORIZED = 401 as const;
-export const HTTP_CODE_NOT_FOUND = 404 as const;
-export const ERR_UNAUTHORIZED_REQUEST =
-  "Unauthorized to perform requested action. Have you logged in?" as const;
 
 export const URL_PARAMS_BASH_EVENT_ID = "bashEventId" as const;
 export const URL_PARAMS_BASH_EVENT_TITLE = "bashEventTitle" as const;
@@ -138,6 +93,85 @@ export const URL_PARAMS_TICKETS_DATE_DELIM = ";;" as const;
 export const URL_INCLUDE_QUERY_PARAM_DELIM = "," as const;
 export const URL_INCLUDE_PRISMA_DATA_KEYS_DELIM = "." as const;
 
+export const BASH_FEE_PERCENTAGE = 0.1;
+export const GOOGLE_CALLBACK_URL = "/auth/google/callback" as const;
+export const CHECKOUT_RETURN_SUCCESS_URL =
+  `/checkout-return/success/{CHECKOUT_SESSION_ID}` as const;
+export const CHECKOUT_RETURN_CANCEL_URL =
+  `/checkout-return/cancel/{CHECKOUT_SESSION_ID}` as const;
+export const CHECKOUT_RETURN_SUCCESS_URL_PAGE =
+  "/checkout-return/success/$checkoutSessionId" as const;
+export const CHECKOUT_RETURN_CANCEL_URL_PAGE =
+  "/checkout-return/cancel/$checkoutSessionId" as const;
+export const DONATION_CHECKOUT_RETURN_SUCCESS_URL =
+  `/donation-checkout-return/success/{CHECKOUT_SESSION_ID}` as const;
+export const DONATION_CHECKOUT_RETURN_CANCEL_URL =
+  `/donation-checkout-return/cancel/{CHECKOUT_SESSION_ID}` as const;
+export const DONATION_CHECKOUT_RETURN_SUCCESS_URL_PAGE =
+  "/donation-checkout-return/success/$checkoutSessionId" as const;
+export const DONATION_CHECKOUT_RETURN_CANCEL_URL_PAGE =
+  "/donation-checkout-return/cancel/$checkoutSessionId" as const;
+
+// export const SERVICE_BOOKING_CHECKOUT_RETURN_SUCCESS_URL = urlAppendQueryParam(
+//   `/service/{SERVICE_ID}/booking/{BOOKING_ID}/checkout-return/{CHECKOUT_SESSION_ID}`,
+//   [
+//     {
+//       key: URL_PARAMS_STRIPE_CHECKOUT,
+//       value: URL_PARAMS_STRIPE_CHECKOUT_OPTIONS.complete,
+//     },
+//   ]
+// );
+// export const SERVICE_BOOKING_CHECKOUT_RETURN_CANCEL_URL = urlAppendQueryParam(
+//   `/service/{SERVICE_ID}/booking/{BOOKING_ID}/checkout-return/{CHECKOUT_SESSION_ID}`,
+//   [
+//     {
+//       key: URL_PARAMS_STRIPE_CHECKOUT,
+//       value: URL_PARAMS_STRIPE_CHECKOUT_OPTIONS.incomplete,
+//     },
+//   ]
+// );
+
+export const SERVICE_BOOKING_CHECKOUT_RETURN_SUCCESS_URL =
+  "/service/${SERVICE_ID}/booking/${BOOKING_ID}/checkout-return/success/{CHECKOUT_SESSION_ID}" as const; //CHECKOUT_SESSION_ID filled by stripe
+export const SERVICE_BOOKING_CHECKOUT_RETURN_CANCEL_URL =
+  "/service/${SERVICE_ID}/booking/${BOOKING_ID}/checkout-return/cancel/{CHECKOUT_SESSION_ID}" as const;
+
+export const SERVICE_BOOKING_CHECKOUT_RETURN_SUCCESS_URL_PAGE =
+  "/service/:serviceId/booking/:bookingId/checkout-return/success/:checkoutSessionId" as const;
+export const SERVICE_BOOKING_CHECKOUT_RETURN_CANCEL_URL_PAGE =
+  "/service/:serviceId/booking/:bookingId/checkout-return/cancel/:checkoutSessionId" as const;
+
+export const VERIFICATION_RETURN_URL = `/sign-up` as const;
+export const MY_SERVICES_URL = "/my-services" as const;
+export const BASH_DETAIL_URL = `/bash-detail` as const;
+export const SERVICE_PAGE_URL = `/service-page` as const;
+export const LOGIN_URL = `/login` as const;
+export const TICKET_DETAILS = `/ticket-details` as const;
+
+export const SWR_KEY_AUTH_TOKEN = "auth-token" as const;
+
+export const PRICE_DOLLARS_AND_CENTS_RATIO = 100 as const;
+
+export const MIN_AMOUNT_OF_TICKETS_FOR_PUBLIC_EVENT_TO_SHOW = 0 as const;
+export const DEFAULT_MAX_NUMBER_OF_TICKETS = 35 as const;
+export const MIN_NUMBER_OF_TICKETS = 0 as const;
+
+export const MAX_NUMBER_OF_FREE_TICKETS_PER_USER_FOR_A_BASH_EVENT =
+  100 as const;
+export const MAX_NUMBER_OF_TICKETS_PER_REQUEST_FOR_A_BASH_EVENT = 50 as const;
+
+export const MONTHS_PREVIOUS_THAT_STRIPE_ACCOUNTS_WILL_BE_SEARCHED_BY_EMAIL =
+  1 as const;
+
+export const HTTP_CODE_OK = 200 as const;
+export const HTTP_CODE_TEMPORARY_REDIRECT = 307 as const;
+export const HTTP_CODE_INTERNAL_SERVER_ERR = 500 as const;
+export const HTTP_CODE_BAD_REQUEST = 400 as const;
+export const HTTP_CODE_UNAUTHORIZED = 401 as const;
+export const HTTP_CODE_NOT_FOUND = 404 as const;
+export const ERR_UNAUTHORIZED_REQUEST =
+  "Unauthorized to perform requested action. Have you logged in?" as const;
+
 export const DEFAULT_PRISMA_TTL_SECONDS = 60 as const;
 export const PRISMA_MEDIA_TTL_SECONDS = 60 * 5; // 5 hours
 export const PRISMA_USER_TTL_SECONDS = 60 * 7; // 7 hours
@@ -215,7 +249,7 @@ export type ServiceAddonApiParams = {
 
 export type ServiceBookedDayApiParams = {
   serviceId: string;
-  forUserId: number;
+  forUserId: string;
 
   startDate: string;
   endDate: string;
@@ -243,6 +277,7 @@ export type ServiceBookingApiParams = {
   serviceId: string;
   bookedDays: ServiceBookedDayApiParams[];
   timezone: string;
+  attendeeOption: ServiceAttendeeOption;
 };
 
 export type ServiceCanBookApiParams = {} & ServiceBookingApiParams;
@@ -267,6 +302,12 @@ export type ServiceCanBookApiResult = {
   reason?: ServiceCantBookReason;
 };
 
+export type ServiceBookingApiResult = {
+  canBook: ServiceCanBookApiResult;
+  priceToBook: ServiceGetPriceToBookResult;
+  booking?: ServiceBookingExt;
+};
+
 export interface DeletedAndHiddenTiers {
   deletedTiers: TicketTier[];
   hiddenTiers: TicketTier[];
@@ -379,6 +420,7 @@ export enum ApiErrorType {
   UserExceededMaxTicketNumberForOneRequest,
   UserDoesNotExist,
   StripeCreateCheckoutSessionFailed,
+  StripeCreateRefundFailed,
   StripeUserInfoIncomplete,
   TicketsAlreadyPurchasedUsingThisCheckoutSession,
   StripeAccountHasNotSetupTaxData,
@@ -443,9 +485,15 @@ export interface StripeCreateBashEventDonationCheckoutSessionArgs {
 }
 
 export interface StripeCreateSetupPaymentMethodSessionArgs {
-  currency: string;
-  successUrl: string;
-  cancelUrl: string;
+  // currency: string;
+  // successUrl: string;
+  // cancelUrl: string;
+}
+
+export interface StripeCreatePayForBookingSessionArgs {
+  // currency: string;
+  // successUrl: string;
+  // cancelUrl: string;
 }
 
 export interface StripeSetDefaultPaymentMethodArgs {

package/src/extendedSchemas.ts

@@ -274,6 +274,8 @@ export interface ServiceBookingExt extends ServiceBooking {
   forUser: PublicUser;
 }
 
+export type ServiceBookingPublicExt = Omit<ServiceBookingExt, "checkout">;
+
 export interface ServiceBookingCheckoutExt extends ServiceBookingCheckout {
   // service: ServiceExt; //we don't need service here
   creator: PublicUser;
@@ -315,6 +317,8 @@ export const FRONT_END_SERVICE_BOOKING_CHECKOUT_DATA_SELECT = {
   checkoutDateTime: true,
   totalAmount: true,
   depositAmount: true,
+  paidOn: true,
+  refundedOn: true,
 } satisfies Prisma.ServiceBookingCheckoutSelect;
 
 export const SERVICE_BOOKING_PUBLIC_DATA_TO_INCLUDE = {
@@ -326,7 +330,8 @@ export const SERVICE_BOOKING_PUBLIC_DATA_TO_INCLUDE = {
 export const SERVICE_BOOKING_PRIVATE_DATA_TO_INCLUDE = {
   ...SERVICE_BOOKING_PUBLIC_DATA_TO_INCLUDE,
   checkout: {
-    select: FRONT_END_SERVICE_BOOKING_CHECKOUT_DATA_SELECT,
+    // select: FRONT_END_SERVICE_BOOKING_CHECKOUT_DATA_SELECT,
+    include: SERVICE_BOOKING_CHECKOUT_DATA_TO_INCLUDE,
   },
   creator: {
     select: FRONT_END_USER_DATA_TO_SELECT,
@@ -341,6 +346,9 @@ export interface ServiceExt extends Service {
 
   stripeAccount?: PublicStripeAccount | null;
 
+  latitude?: number;
+  longitude?: number;
+
   // availableDateTimes?: Availability[];
 
   // rates?: Rate[];
@@ -510,6 +518,8 @@ export const VENUE_DATA_TO_REMOVE: RemoveCommonProperties<
 export interface BashNotificationExt extends BashNotification {
   creator?: PublicUser;
   bashEvent?: BashEvent;
+  service?: ServiceExt;
+  serviceBooking?: ServiceBookingExt;
   eventTask?: EventTask;
   invitation?: Invitation;
   reminders?: Reminder[];
@@ -544,6 +554,12 @@ export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
       image: true,
     },
   },
+  service: {
+    include: { ...SERVICE_DATA_TO_INCLUDE, bashEvent: undefined },
+  },
+  serviceBooking: {
+    include: SERVICE_BOOKING_PUBLIC_DATA_TO_INCLUDE,
+  },
 } satisfies Prisma.BashNotificationInclude;
 
 export interface EventTaskExt extends EventTask {

package/src/index.ts

@@ -10,6 +10,7 @@ export * from "./utils/qrCodeUtils";
 export * from "./utils/sortUtils";
 export * from "./utils/apiUtils";
 export * from "./utils/urlUtils";
+export * from "./utils/stringUtils";
 export * from "./utils/promoCodesUtils";
 export * from "./utils/userPromoCodeUtils";
 export * from "./utils/userSubscriptionUtils";
@@ -21,6 +22,7 @@ export * from "./utils/service/serviceDBUtils";
 export * from "./utils/service/serviceRateUtils";
 export * from "./utils/service/serviceBookingUtils";
 export * from "./utils/service/serviceBookingApiUtils";
+export * from "./utils/service/serviceBookingStatusUtils";
 export * from "./utils/stripeAccountUtils";
 export * from "./utils/entityUtils";
 export * from "./utils/generalDateTimeUtils";

package/src/utils/luxonUtils.ts

@@ -876,6 +876,22 @@ export function splitRangeByInputTimes(
   return segments;
 }
 
+export function dateTimeRangeFromDates(
+  startDate: Date | string,
+  endDate: Date | string,
+  interpretAsTimezone?: string,
+  timezoneToConvertTo?: string
+): LuxonDateRange {
+  return {
+    start: dateTimeFromDate(
+      startDate,
+      interpretAsTimezone,
+      timezoneToConvertTo
+    ),
+    end: dateTimeFromDate(endDate, interpretAsTimezone, timezoneToConvertTo),
+  } as LuxonDateRange;
+}
+
 export function dateTimeFromString(str: string) {
   return DateTime.fromISO(str);
 }
@@ -883,3 +899,8 @@ export function dateTimeFromString(str: string) {
 export function dateTimeToString(dateTime: DateTime): string | null {
   return dateTime.toISO();
 }
+
+export function dateRangesFormat(dateTimes: LuxonDateRange[]): string {
+  const result = dateTimes.join(", ");
+  return result;
+}

package/src/utils/paymentUtils.ts

@@ -1,33 +1,44 @@
-import {BashEventPromoCode, TicketTier} from "@prisma/client";
-import {BASH_FEE_PERCENTAGE, NumberOfTicketsForDate, PRICE_DOLLARS_AND_CENTS_RATIO} from "../definitions";
-
+import { BashEventPromoCode, TicketTier } from "@prisma/client";
+import {
+  BASH_FEE_PERCENTAGE,
+  NumberOfTicketsForDate,
+  PRICE_DOLLARS_AND_CENTS_RATIO,
+} from "../definitions";
 
 /**
  * Returns the amount of discount in dollars
  * @param totalInDollars
  * @param promoCode
  */
-export function calculateDiscountFromPromoCode(totalInDollars: number, promoCode: BashEventPromoCode | undefined): number {
+export function calculateDiscountFromPromoCode(
+  totalInDollars: number,
+  promoCode: BashEventPromoCode | undefined
+): number {
   if (promoCode) {
     if (promoCode.discountAmountInCents) {
-      const discountInDollars = convertCentsToDollars(promoCode.discountAmountInCents);
+      const discountInDollars = convertCentsToDollars(
+        promoCode.discountAmountInCents
+      );
       return Math.max(0, discountInDollars); // Ensure we don't discount more than 100%
     }
     if (promoCode.discountAmountPercentage) {
-      const discountInDollars = totalInDollars * (promoCode.discountAmountPercentage / 100);
+      const discountInDollars =
+        totalInDollars * (promoCode.discountAmountPercentage / 100);
       return Math.min(totalInDollars, discountInDollars); // Ensure we don't discount more than 100%
     }
   }
   return 0;
 }
 
-
 /**
  * Returns the total price based on a map where the keys are the ticketTierIds
  * @param ticketTiers
  * @param ticketList
  */
-export function calculateTotalPriceWithoutTax(ticketTiers: TicketTier[], ticketList: Map<string, NumberOfTicketsForDate[]>): number {
+export function calculateTotalPriceWithoutTax(
+  ticketTiers: TicketTier[],
+  ticketList: Map<string, NumberOfTicketsForDate[]>
+): number {
   let total = 0;
   ticketTiers.forEach((tier: TicketTier) => {
     const ticketListNumAndDate = ticketList.get(tier.id);
@@ -38,13 +49,17 @@ export function calculateTotalPriceWithoutTax(ticketTiers: TicketTier[], ticketL
   return total;
 }
 
-export function convertCentsToDollars(price: number | undefined | null): number {
+export function convertCentsToDollars(
+  price: number | undefined | null
+): number {
   if (!price) {
     return 0;
   }
   return price / PRICE_DOLLARS_AND_CENTS_RATIO;
 }
-export function convertDollarsToCents(price: number | undefined | null): number {
+export function convertDollarsToCents(
+  price: number | undefined | null
+): number {
   if (!price) {
     return 0;
   }

package/src/utils/service/serviceBookingApiUtils.ts

@@ -2,14 +2,36 @@ import {
   ServiceBookingApiParamsLuxon,
   ServiceBookingApiParams,
   ServiceBookedDayApiParamsLuxon,
+  ServiceAddonApiParams,
+  ServiceBookedDayApiParams,
+  ServicePriceToBookApiResult,
 } from "../../definitions";
-import { ServiceAddonExt } from "../../extendedSchemas";
-import { dateTimeFromString } from "../luxonUtils";
-import { ServiceAttendeeOption } from "./attendeeOptionUtils";
+import {
+  ServiceAddonExt,
+  ServiceBookingAddOnExt,
+  ServiceBookingDayExt,
+  ServiceBookingExt,
+  ServiceExt,
+} from "../../extendedSchemas";
+import {
+  dateTimeFromDate,
+  dateTimeFromString,
+  dateTimeRangeFromDates,
+} from "../luxonUtils";
+import { convertDollarsToCents } from "../paymentUtils";
+import {
+  ServiceAttendeeOption,
+  serviceAttendeeOptions,
+} from "./attendeeOptionUtils";
 import {
   ServiceGetPriceToBookFeesParams,
   ServiceBookingDayInfoParams,
   ServiceBookingFee,
+  ServiceAddonInput,
+  ServiceGetPriceToBookResult,
+  serviceGetPriceToBookFees,
+  serviceGetPriceToBookExt,
+  ServiceGetPriceToBookExtDay,
 } from "./serviceBookingUtils";
 
 export type ServiceCantBookReason = {
@@ -42,34 +64,155 @@ export const ServiceCantBookReasons = {
 
 export type ServiceCantBookReasons = keyof typeof ServiceCantBookReasons;
 
-export function serviceBookingParamsToPriceToBookParams(
-  params: ServiceBookingApiParamsLuxon,
+export function apiTransformAddOnsToAddonInputs<
+  AddonParams_t extends ServiceAddonApiParams
+>(
+  addOnsApi: AddonParams_t[],
   serviceAddons: ServiceAddonExt[]
-): ServiceGetPriceToBookFeesParams {
-  // Create a HashMap (Map) for faster lookup by addonId
+): ServiceAddonInput[] {
+  // Create a Map for faster lookup by addonId
   const addonMap = new Map<string, ServiceAddonExt>(
     serviceAddons.map((addon) => [addon.id, addon])
   );
 
-  // Map the addOns from the params to the format expected by ServiceGetPriceToBookFeesParams
+  return addOnsApi.map((addOnApi) => {
+    const matchedAddon = addonMap.get(addOnApi.addonId);
+    if (!matchedAddon) {
+      throw new Error(`Failed to match addon with id: ${addOnApi.addonId}`);
+    }
+    return {
+      ...matchedAddon,
+      ...addOnApi,
+    } as ServiceAddonInput;
+  });
+}
+
+// export function serviceAddonInputAddOnsToAddonInputs<
+//   AddonParams_t extends ServiceAddonInput
+// >(
+//   addOnsApi: AddonParams_t[],
+//   serviceAddons: ServiceAddonExt[]
+// ): ServiceAddonInput[] {
+//   // Create a Map for faster lookup by addonId
+//   const addonMap = new Map<string, ServiceAddonExt>(
+//     serviceAddons.map((addon) => [addon.id, addon])
+//   );
+
+//   return addOnsApi.map((addOnApi) => {
+//     const matchedAddon = addonMap.get(addOnApi.id);
+//     if (!matchedAddon) {
+//       throw new Error(`Failed to match addon with id: ${addOnApi.id}`);
+//     }
+//     return {
+//       ...matchedAddon,
+//       ...addOnApi,
+//     } as ServiceAddonInput;
+//   });
+// }
+
+// export function apiTransformBookedDays(
+//   bookedDays: ServiceBookedDayApiParams[],
+//   bookingId: string,
+//   serviceAddons: ServiceAddonExt[]
+// ): ServiceBookingDayExt[] {
+//   return bookedDays.map((day) => {
+//     // Transform the addOns using the helper function and then map to the expected output
+//     const addOns = apiTransformAddOnsToAddonInputs(
+//       day.addOns,
+//       serviceAddons
+//     ).map(
+//       (addOn) =>
+//         ({
+//           addOnId: addOn.id,
+//           chosenQuantity: addOn.chosenQuantity,
+//           serviceBookingDayId: bookingId,
+//           costATBCents: convertDollarsToCents(addOn.price),
+//         } as ServiceBookingAddOnExt)
+//     );
+
+//     return {
+//       id: "",
+//       startDate: dateTimeFromString(day.startDate).toJSDate(),
+//       endDate: dateTimeFromString(day.endDate).toJSDate(),
+//       serviceBookingRequestId: bookingId,
+//       addOns: addOns,
+//       packages: [],
+//     } as ServiceBookingDayExt;
+//   });
+// }
+
+export function apiTransformBookedDays(
+  priceToBook: ServicePriceToBookApiResult
+): Partial<ServiceBookingDayExt>[] {
+  return priceToBook.daysToBook.map((day): Partial<ServiceBookingDayExt> => {
+    // Transform addOns using the helper function, then map to the expected output.
+    const addOns = day.addOns.map(
+      (addOn): Partial<ServiceBookingAddOnExt> => ({
+        addOnId: addOn.id,
+        chosenQuantity: addOn.chosenQuantity ?? 0,
+        addOn: addOn,
+        // costATBCents: convertDollarsToCents(addOn.price),
+      })
+    );
+
+    return {
+      startDate: day.dateTimeRange.start.toJSDate(),
+      endDate: day.dateTimeRange.end.toJSDate(),
+      addOns: addOns,
+      packages: [],
+      // costATBCents: convertDollarsToCents(day.totalBeforeTaxes),
+    } as Partial<ServiceBookingDayExt>;
+  });
+}
+
+export function serviceGetPriceToBookFromBooking(
+  service: ServiceExt,
+  booking: ServiceBookingExt
+): ServiceGetPriceToBookResult {
+  const daysToBook = booking.bookedDays.map((day) => {
+    // Transform addOns back to the original format
+    const addOns =
+      day.addOns?.map(
+        (addOn): ServiceAddonInput => ({
+          ...addOn.addOn,
+          id: addOn.addOnId!,
+          chosenQuantity: addOn.chosenQuantity,
+          // Reconstruct other addOn properties from the stored addOn object
+        })
+      ) ?? [];
+
+    return {
+      dateRange: dateTimeRangeFromDates(
+        day.startDate,
+        day.endDate,
+        "UTC",
+        booking.timezone
+      ),
+      addOns: addOns,
+      // totalBeforeTaxes: day.costATBCents ? convertCentsToDollars(day.costATBCents) : 0,
+    } as ServiceGetPriceToBookExtDay;
+  });
+
+  return serviceGetPriceToBookExt(service.serviceRatesAssociation, {
+    bookedDays: daysToBook,
+    selectedAttendeeOption: serviceAttendeeOptions[0],
+    timezone: booking.timezone,
+  });
+}
+
+// Main function that transforms service booking parameters to price-to-book parameters
+export function serviceBookingParamsToPriceToBookParams(
+  params: ServiceBookingApiParamsLuxon,
+  serviceAddons: ServiceAddonExt[]
+): ServiceGetPriceToBookFeesParams {
+  // Map each booked day to the required parameters
   const daysToBookParams: ServiceBookingDayInfoParams[] = params.bookedDays.map(
     (day) => {
-      // Map over each day's addOns and match with the addonMap to get additional data
-      const addOnsWithDetails = day.addOns.map((addonInput) => {
-        const matchedAddon = addonMap.get(addonInput.addonId);
-
-        if (!matchedAddon) {
-          throw new Error(
-            `Failed to match addon with id: ${addonInput.addonId}`
-          );
-        }
-
-        return {
-          ...matchedAddon,
-          addonId: addonInput.addonId,
-          chosenQuantity: addonInput.chosenQuantity,
-        };
-      });
+      // Use the helper function to transform the day's addOns
+      const addOnsWithDetails = apiTransformAddOnsToAddonInputs(
+        day.addOns,
+        serviceAddons
+      );
 
       return {
         dateTimeRange: day.dateTimeRange,
@@ -86,7 +229,7 @@ export function serviceBookingParamsToPriceToBookParams(
 
   return {
     daysToBookParams: daysToBookParams,
-    selectedAttendeeOption: {} as ServiceAttendeeOption, // Placeholder, should be determined based on business logic
+    selectedAttendeeOption: {} as ServiceAttendeeOption, // Placeholder: update with actual business logic
     timezone: params.timezone,
   };
 }

package/src/utils/service/serviceBookingStatusUtils.ts

@@ -0,0 +1,106 @@
+import { ServiceBookingExt, ServiceExt } from "../../extendedSchemas";
+
+export interface ValidationResult {
+  valid: boolean;
+  errorMessage?: string;
+}
+
+export function serviceBookingIsValid(
+  service: ServiceExt,
+  booking: ServiceBookingExt | null | undefined
+) {
+  if (booking == null) {
+    return {
+      valid: false,
+      errorMessage: "This booking has already been canceled.",
+    };
+  }
+}
+
+export function serviceBookingCanBePaid(
+  service: ServiceExt,
+  booking: ServiceBookingExt
+): ValidationResult {
+  if (booking.status === "Canceled") {
+    return {
+      valid: false,
+      errorMessage: "This booking has already been canceled.",
+    };
+  }
+  if (booking.status === "Rejected") {
+    return {
+      valid: false,
+      errorMessage: "You cannot pay for a rejected booking request.",
+    };
+  }
+  if (booking.status === "Pending" && booking.bookingType === "Request") {
+    return {
+      valid: false,
+      errorMessage: "You cannot pay for a pending booking request.",
+    };
+  }
+  return { valid: true };
+}
+
+export function serviceBookingCanHaveApprovalDecision(
+  service: ServiceExt,
+  booking: ServiceBookingExt
+): ValidationResult {
+  if (booking.bookingType !== "Request") {
+    return {
+      valid: false,
+      errorMessage: "Approval decisions can only be made on booking requests.",
+    };
+  }
+  if (booking.status !== "Pending") {
+    return {
+      valid: false,
+      errorMessage:
+        "Approval decisions can only be made for pending booking requests.",
+    };
+  }
+
+  return { valid: true };
+}
+
+export function serviceBookingHasDecision(
+  service: ServiceExt,
+  booking: ServiceBookingExt
+): ValidationResult {
+  if (booking.bookingType !== "Request") {
+    return {
+      valid: false,
+      errorMessage: "Only booking requests can have a decision.",
+    };
+  }
+  if (booking.status !== "Approved" && booking.status !== "Rejected") {
+    return {
+      valid: false,
+      errorMessage: "The booking request does not have a decision yet.",
+    };
+  }
+  return { valid: true };
+}
+
+export function serviceBookingCanBeCanceled(
+  service: ServiceExt,
+  booking: ServiceBookingExt
+): ValidationResult {
+  if (booking.status !== "Confirmed") {
+    return {
+      valid: false,
+      errorMessage: "Only confirmed bookings can be canceled.",
+    };
+  }
+  return { valid: true };
+}
+
+export function serviceBookingCanBeConfirmed(
+  service: ServiceExt,
+  booking: ServiceBookingExt
+): ValidationResult {
+  if (booking.status !== "Canceled") {
+    return { valid: false, errorMessage: "The booking is not canceled." };
+  }
+  return { valid: true };
+}

package/src/utils/service/serviceBookingUtils.ts

@@ -15,6 +15,8 @@ import {
   LuxonDateRange,
 } from "../luxonUtils";
 
+export const SERVICE_BOOKING_PROCESSING_FEE_PERCENT = 0.15;
+
 export interface ServiceAddonInput extends ServiceAddon {
   chosenQuantity?: number;
 }
@@ -39,6 +41,7 @@ export interface ServiceBookingFee {
 export interface ServiceBookingDayInfoParams {
   dateTimeRange: LuxonDateRange;
   fees: ServiceBookingFee[];
+  addOns: ServiceAddonInput[];
 }
 
 export interface ServiceBookingDayInfo {
@@ -53,6 +56,8 @@ export interface ServiceBookingDayInfo {
 
   fees: ServiceBookingFee[];
   totalBeforeTaxes: number;
+
+  addOns: ServiceAddonInput[];
 }
 
 export interface ServiceGetPriceToBookResult {
@@ -169,6 +174,7 @@ export function serviceGetBookingDayInfo({
         priceBreakdown: priceBreakdown,
         dateTimeRange: day.dateTimeRange,
         fees: day.fees,
+        addOns: day.addOns,
         totalBeforeTaxes: totalBeforeTaxes,
       } as ServiceBookingDayInfo;
     }
@@ -204,17 +210,6 @@ export function serviceGetPriceToBookFees(
     timezone
   );
 
-  const processingFee = 53.08;
-  const additionalFees = (
-    [
-      {
-        name: "Processing Fee",
-        type: "processingFee",
-        fee: processingFee,
-      },
-    ] as ServiceBookingFee[]
-  ).filter((fee) => fee.fee > 0);
-
   const bookingDayResults: ServiceBookingDayInfo[] = serviceGetBookingDayInfo({
     filteredRates: filteredRates,
     daysToBookParams: daysToBookParams,
@@ -225,8 +220,8 @@ export function serviceGetPriceToBookFees(
   const durationHours = bookingDateTimeRanges.reduce((sofar, curr) => {
     return sofar + dateTimeRangeHours(curr);
   }, 0);
-  const baseCostDiscounted = bookingDayResults.reduce((sofar, curr) => {
-    return sofar + curr.baseCostDiscounted;
+  const bookingsTotalBeforeTaxes = bookingDayResults.reduce((sofar, curr) => {
+    return sofar + curr.totalBeforeTaxes;
   }, 0);
   const baseHourlyRate =
     serviceRatesAssociation?.serviceGeneralRates?.hourlyRate ?? 0;
@@ -235,22 +230,34 @@ export function serviceGetPriceToBookFees(
   const baseCostDiscount =
     baseCostUndiscounted == 0
       ? 0
-      : 1 - baseCostDiscounted / baseCostUndiscounted;
+      : 1 - bookingsTotalBeforeTaxes / baseCostUndiscounted;
 
   const minimumTimeBlockHours =
     serviceRatesAssociation?.serviceGeneralRates?.minimumTimeBlockHours;
 
   const attendeeRate = selectedAttendeeOption.rate * durationHours;
 
+  const processingFee =
+    SERVICE_BOOKING_PROCESSING_FEE_PERCENT * bookingsTotalBeforeTaxes;
+  const additionalFees = (
+    [
+      {
+        name: "Processing Fee",
+        type: "processingFee",
+        fee: processingFee,
+      },
+    ] as ServiceBookingFee[]
+  ).filter((fee) => fee.fee > 0);
+
   const totalBeforeTaxes =
-    baseCostDiscounted +
+    bookingsTotalBeforeTaxes +
     additionalFees.reduce((sofar, fee) => sofar + fee.fee, 0);
 
   return {
     serviceId: serviceRatesAssociation?.serviceId,
     daysToBook: bookingDayResults,
     baseCostUndiscounted: baseCostUndiscounted,
-    baseCostDiscounted: baseCostDiscounted,
+    baseCostDiscounted: bookingsTotalBeforeTaxes,
     baseCostDiscount: baseCostDiscount,
     totalBeforeTaxes: totalBeforeTaxes,
     additionalFees: additionalFees,
@@ -309,6 +316,69 @@ export function serviceGetPriceToBook(
       return {
         dateTimeRange: dtRange,
         fees: feesPerBooking,
+        addOns: addOns,
+      };
+    }
+  );
+
+  return serviceGetPriceToBookFees(serviceRatesAssociation, {
+    daysToBookParams: daysToBookParams,
+    selectedAttendeeOption: selectedAttendeeOption,
+    timezone: timezone,
+  });
+}
+
+export interface ServiceGetPriceToBookExtDay {
+  dateRange: LuxonDateRange;
+  addOns: ServiceAddonInput[];
+}
+
+export interface ServiceGetPriceToBookExtParams {
+  selectedAttendeeOption: ServiceAttendeeOption;
+
+  bookedDays: ServiceGetPriceToBookExtDay[];
+
+  // overlappingBusinessHours: LuxonDateRange[] | null;
+  timezone: string | null | undefined;
+}
+
+export function serviceGetPriceToBookExt(
+  serviceRatesAssociation: ServiceRatesAssociationExt | null | undefined,
+  {
+    selectedAttendeeOption,
+    bookedDays, //list of dateTime ranges to book
+    // overlappingBusinessHours,
+    timezone,
+  }: ServiceGetPriceToBookExtParams
+): ServiceGetPriceToBookResult {
+  const cleaningFee =
+    serviceRatesAssociation?.serviceGeneralRates?.cleaningFeePerBooking ?? 0;
+
+  const daysToBookParams = bookedDays.map(
+    (day): ServiceBookingDayInfoParams => {
+      const addOnTotal = day.addOns.reduce((sum, addOn) => {
+        return sum + (addOn.chosenQuantity || 0) * addOn.price;
+      }, 0);
+
+      const feesPerBooking = (
+        [
+          {
+            name: "AddOn Total",
+            type: "addOnFees",
+            fee: addOnTotal,
+          },
+          {
+            name: "Cleaning Fee",
+            type: "cleaningFee",
+            fee: cleaningFee,
+          },
+        ] as ServiceBookingFee[]
+      ).filter((fee) => fee.fee > 0);
+
+      return {
+        dateTimeRange: day.dateRange,
+        fees: feesPerBooking,
+        addOns: day.addOns,
       };
     }
   );

package/src/utils/stringUtils.ts

@@ -0,0 +1,8 @@
+export function formatString<T extends Record<string, string | number>>(
+  template: string,
+  data: T
+): string {
+  return template.replace(/\$?{(\w+)}/g, (_, key) => {
+    return data[key] !== undefined ? data[key].toString() : "";
+  });
+}

package/src/utils/urlUtils.ts

@@ -1,10 +1,8 @@
-import {isProduction} from "./apiUtils";
-import {BASH_DETAIL_URL} from "../definitions";
-
+import { isProduction } from "./apiUtils";
+import { BASH_DETAIL_URL } from "../definitions";
 
 const API_HOST = process.env.REACT_APP_API ?? "http://localhost:3500";
 
-
 export function getFrontendHost(): string {
   const host = isProduction()
     ? `${window.location.protocol}//${window.location.host}`
@@ -25,5 +23,66 @@ export function getSsrBashDetailUrl(bashEventId: string | undefined): string {
     return url;
   }
   console.error(`BashEventId was not specified for the ssr bash detail url`);
-  return '';
+  return "";
+}
+
+export interface QueryParam {
+  key: string;
+  value: string;
+}
+
+export function urlAppendQueryParam(url: string, params: QueryParam[]): string {
+  // Split the URL into base and hash
+  const [base, hash = ""] = url.split("#");
+
+  // Split the base into path and query
+  const [path, query = ""] = base.split("?");
+
+  // Initialize URLSearchParams with existing query
+  const searchParams = new URLSearchParams(query);
+
+  // Append each new query parameter
+  params.forEach(({ key, value }) => searchParams.append(key, value));
+
+  // Convert searchParams back to string
+  const newQuery = searchParams.toString();
+
+  // Reconstruct the URL
+  let newUrl = path;
+  if (newQuery) {
+    newUrl += `?${newQuery}`;
+  }
+  if (hash) {
+    newUrl += `#${hash}`;
+  }
+
+  return newUrl;
+}
+
+export function urlRemoveQueryParam(url: string, keys: string[]): string {
+  // Split the URL into base and hash
+  const [base, hash = ""] = url.split("#");
+
+  // Split the base into path and query
+  const [path, query = ""] = base.split("?");
+
+  // Initialize URLSearchParams with existing query
+  const searchParams = new URLSearchParams(query);
+
+  // Remove each specified query parameter
+  keys.forEach((key) => searchParams.delete(key));
+
+  // Convert searchParams back to string
+  const newQuery = searchParams.toString();
+
+  // Reconstruct the URL
+  let newUrl = path;
+  if (newQuery) {
+    newUrl += `?${newQuery}`;
+  }
+  if (hash) {
+    newUrl += `#${hash}`;
+  }
+
+  return newUrl;
 }