@bash-app/bash-common 30.3.0 → 30.4.0

package/package.json

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

package/prisma/schema.prisma

@@ -1150,15 +1150,22 @@ model Service {
   media                 Media[]
   serviceLinks          ServiceLink[]
 
-  volunteerServiceId   String?
-  volunteerService     VolunteerService?     @relation(fields: [volunteerServiceId], references: [id])
-  eventService         EventService?
-  entertainmentService EntertainmentService?
-  vendor               Vendor?
-  exhibitor            Exhibitor?
-  sponsor              Sponsor?
-  venue                Venue?
-  organization         Organization?
+  volunteerServiceId     String?               @unique
+  volunteerService       VolunteerService?     @relation(fields: [volunteerServiceId], references: [id], onDelete: Cascade)
+  eventServiceId         String?               @unique
+  eventService           EventService?         @relation(fields: [eventServiceId], references: [id], onDelete: Cascade)
+  entertainmentServiceId String?               @unique
+  entertainmentService   EntertainmentService? @relation(fields: [entertainmentServiceId], references: [id], onDelete: Cascade)
+  vendorId               String?               @unique
+  vendor                 Vendor?               @relation(fields: [vendorId], references: [id], onDelete: Cascade)
+  exhibitorId            String?               @unique
+  exhibitor              Exhibitor?            @relation(fields: [exhibitorId], references: [id], onDelete: Cascade)
+  sponsorId              String?               @unique
+  sponsor                Sponsor?              @relation(fields: [sponsorId], references: [id], onDelete: Cascade)
+  venueId                String?               @unique
+  venue                  Venue?                @relation(fields: [venueId], references: [id], onDelete: Cascade)
+  organizationId         String?               @unique
+  organization           Organization?         @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 
   serviceRatesAssociation ServiceRatesAssociation?
 
@@ -1211,13 +1218,11 @@ model VolunteerService {
 
   serviceRatesAssociation ServiceRatesAssociation?
 
-  service Service[]
+  service Service?
 }
 
 model EventService {
   id                  String             @id @default(cuid())
-  serviceId           String             @unique
-  service             Service            @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   serviceRangeId      String?
   serviceRange        ServiceRange?      @relation(fields: [serviceRangeId], references: [id])
   eventServiceTypes   EventServiceType[]
@@ -1229,12 +1234,11 @@ model EventService {
   menuItems           String?
   venueTypes          String[]
   secondaryVenueTypes String[]           @default([])
+  service             Service?
 }
 
 model EntertainmentService {
   id                          String                     @id @default(cuid())
-  serviceId                   String                     @unique
-  service                     Service                    @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   serviceRangeId              String?
   serviceRange                ServiceRange?              @relation(fields: [serviceRangeId], references: [id])
   entertainmentServiceTypes   EntertainmentServiceType[]
@@ -1246,12 +1250,11 @@ model EntertainmentService {
   goodsOrServices             String[]
   venueTypes                  String[]
   secondaryVenueTypes         String[]                   @default([])
+  service                     Service?
 }
 
 model Vendor {
   id                  String            @id @default(cuid())
-  serviceId           String            @unique
-  service             Service           @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   serviceRangeId      String?
   serviceRange        ServiceRange?     @relation(fields: [serviceRangeId], references: [id])
   yearsOfExperience   YearsOfExperience
@@ -1261,12 +1264,11 @@ model Vendor {
   menuItems           String?
   venueTypes          String[]
   secondaryVenueTypes String[]          @default([])
+  service             Service?
 }
 
 model Exhibitor {
   id                  String            @id @default(cuid())
-  serviceId           String            @unique
-  service             Service           @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   serviceRangeId      String?
   serviceRange        ServiceRange?     @relation(fields: [serviceRangeId], references: [id])
   yearsOfExperience   YearsOfExperience
@@ -1275,12 +1277,11 @@ model Exhibitor {
   goodsOrServices     String[]
   venueTypes          String[]
   secondaryVenueTypes String[]          @default([])
+  service             Service?
 }
 
 model Sponsor {
   id                String            @id @default(cuid())
-  serviceId         String            @unique
-  service           Service           @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   serviceRangeId    String?
   serviceRange      ServiceRange?     @relation(fields: [serviceRangeId], references: [id])
   yearsOfExperience YearsOfExperience
@@ -1288,12 +1289,11 @@ model Sponsor {
   crowdSize         AmountOfGuests?   @relation(fields: [crowdSizeId], references: [id])
   goodsOrServices   String[]
   menuItems         String?
+  service           Service?
 }
 
 model Venue {
   id                   String            @id @default(cuid())
-  serviceId            String            @unique
-  service              Service           @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   // serviceConnectionId  String? //Check: ?
   // serviceConnection    String?
   yearsInBusiness      YearsOfExperience @default(LessThanOneYear)
@@ -1317,13 +1317,12 @@ model Venue {
   // subscriptionStartDate DateTime?
 
   bashEvents BashEvent[]
+  service    Service?
 }
 
 //currently used for 1 free service listing per user
 model UserPromoCodeRedemption {
-  id        String   @id @default(cuid())
-  serviceId String?
-  service   Service? @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  id String @id @default(cuid())
 
   bashEventId String?
   bashEvent   BashEvent? @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
@@ -1336,6 +1335,8 @@ model UserPromoCodeRedemption {
   redemptionCount Int
 
   lastRedeemedOn DateTime
+  service        Service? @relation(fields: [serviceId], references: [id])
+  serviceId      String?
 }
 
 // model VenuePricing {
@@ -1351,12 +1352,11 @@ enum VenuePricingPlan {
 
 model Organization {
   id                  String             @id @default(cuid())
-  serviceId           String             @unique
-  service             Service            @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   organizationType    OrganizationType[]
   goodsOrServices     String[]
   venueTypes          String[]
   secondaryVenueTypes String[]           @default([])
+  service             Service?
 }
 
 enum EventServiceType {
@@ -1433,10 +1433,10 @@ model ServiceRange {
   max                   Int                    @default(50)
   volunteerServices     VolunteerService[]
   entertainmentServices EntertainmentService[]
-  EventService          EventService[]
-  Vendor                Vendor[]
-  Exhibitor             Exhibitor[]
-  Sponsor               Sponsor[]
+  eventService          EventService[]
+  vendor                Vendor[]
+  exhibitor             Exhibitor[]
+  sponsor               Sponsor[]
 }
 
 // model Availability {
@@ -1503,7 +1503,7 @@ model ServiceAddon {
   id          String @id @default(cuid())
   name        String
   description String
-  price       Int
+  priceCents  Int
   quantity    Int
 
   servicePackage   ServicePackage? @relation(fields: [servicePackageId], references: [id], onDelete: Cascade)
@@ -1518,7 +1518,7 @@ model ServicePackage {
   id          String @id @default(cuid())
   name        String
   description String
-  price       Int
+  priceCents  Int
 
   serviceAddons ServiceAddon[]
 
@@ -1528,15 +1528,15 @@ model ServicePackage {
 }
 
 model ServiceRate {
-  id                      String                   @id @default(cuid())
-  rateType                ServiceRateType
-  hourlyRate              Int?
-  dailyRate               Int?
-  cleaningFeePerBooking   Int?
-  minimumTimeBlockHours   Int?
-  serviceSpecialRates     ServiceSpecialRates?
-  serviceDailyRates       ServiceDailyRates?
-  serviceRatesAssociation ServiceRatesAssociation?
+  id                         String                   @id @default(cuid())
+  rateType                   ServiceRateType
+  hourlyRateCents            Int?
+  dailyRateCents             Int?
+  cleaningFeePerBookingCents Int?
+  minimumTimeBlockHours      Int?
+  serviceSpecialRates        ServiceSpecialRates?
+  serviceDailyRates          ServiceDailyRates?
+  serviceRatesAssociation    ServiceRatesAssociation?
 
   @@index([rateType])
 }
@@ -1633,36 +1633,96 @@ model ServiceRatesAssociation {
 //   Missed
 // }
 
+enum ServiceBookingFeeType {
+  // AddOn
+  // Package
+  CleaningFee
+  ProcessingFee
+}
+
+enum ServiceRatePricingType {
+  Hourly
+  Daily
+}
+
+enum ServiceBookingStatus {
+  Pending //pending request
+  Approved //approved request
+  Rejected //rejected request
+  Confirmed //when payment is complete
+  Canceled //canceled request or booking
+}
+
+enum ServiceBookingType {
+  Request
+  Instant
+}
+
 model ServiceBookingAddOn {
   id String @id @default(cuid())
 
-  serviceBookingDay   ServiceBookingDay @relation(fields: [serviceBookingDayId], references: [id])
+  serviceBookingDay   ServiceBookingDay @relation(fields: [serviceBookingDayId], references: [id], onDelete: Cascade)
   serviceBookingDayId String
 
   addOnId        String
   addOn          ServiceAddon @relation(fields: [addOnId], references: [id])
   chosenQuantity Int
 
-  // costATBCents Int
+  costPQCents Int
 }
 
 model ServiceBookingPackage {
   id String @id @default(cuid())
 
-  serviceBookingDay   ServiceBookingDay @relation(fields: [serviceBookingDayId], references: [id])
+  serviceBookingDay   ServiceBookingDay @relation(fields: [serviceBookingDayId], references: [id], onDelete: Cascade)
   serviceBookingDayId String
 
   packageId      String
   package        ServicePackage @relation(fields: [packageId], references: [id])
   chosenQuantity Int
 
-  // costATBCents Int
+  costPQCents Int
+}
+
+model ServiceBookingPriceBreakdown {
+  id String @id @default(cuid())
+
+  serviceBookingDayId String
+  serviceBookingDay   ServiceBookingDay @relation(fields: [serviceBookingDayId], references: [id], onDelete: Cascade)
+
+  rateType    ServiceRateType
+  pricingType ServiceRatePricingType
+
+  startDate DateTime //start of period applicable
+  endDate   DateTime //end of period applicable
+
+  hours        Float //number of hours removed from total
+  unitCount    Float // number of days (8 hour blocks)/hours used unitCount * rate = piTotal
+  rateCents    Int
+  piTotalCents Int
+}
+
+model ServiceBookingFee {
+  id String @id @default(cuid())
+
+  serviceBookingDayId String?
+  serviceBookingDay   ServiceBookingDay? @relation(fields: [serviceBookingDayId], references: [id], onDelete: Cascade)
+
+  serviceBooking   ServiceBooking? @relation(fields: [serviceBookingId], references: [id], onDelete: Cascade)
+  serviceBookingId String?
+
+  feeType     ServiceBookingFeeType
+  name        String
+  description String?
+  quantity    Int
+
+  costPQCents Int
 }
 
 model ServiceBookingDay {
   id String @id @default(cuid())
 
-  serviceBookingRequest   ServiceBooking? @relation(fields: [serviceBookingRequestId], references: [id])
+  serviceBookingRequest   ServiceBooking? @relation(fields: [serviceBookingRequestId], references: [id], onDelete: Cascade)
   serviceBookingRequestId String?
 
   startDate DateTime
@@ -1671,22 +1731,47 @@ model ServiceBookingDay {
   addOns   ServiceBookingAddOn[]
   packages ServiceBookingPackage[]
 
-  // costATBCents Int
+  priceBreakdown ServiceBookingPriceBreakdown[]
+  fees           ServiceBookingFee[]
+
+  totalBeforeTaxesCents Int
+}
+
+model ServiceBookingCheckout {
+  id String @id @default(cuid())
+
+  bookingDataId String         @unique
+  bookingData   ServiceBooking @relation(fields: [bookingDataId], references: [id], onDelete: Cascade)
+
+  creatorId String
+  creator   User   @relation(fields: [creatorId], references: [id], onDelete: Cascade)
+
+  checkoutDateTime        DateTime? @default(now())
+  stripeCheckoutSessionId String?   @unique
+  stripePaymentIntentId   String?   @unique
+
+  paidOn     DateTime?
+  refundedOn DateTime?
+
+  totalAmountCents   Int? //stored in cents
+  depositAmountCents Int?
+
+  @@index(creatorId)
 }
 
 model ServiceBooking {
   id String @id @default(cuid())
 
   creatorId String
-  creator   User   @relation("BookingCreator", fields: [creatorId], references: [id], onDelete: Cascade)
+  creator   User   @relation("BookingCreator", fields: [creatorId], references: [id], onDelete: Restrict)
 
   forUserId String
-  forUser   User   @relation("BookingForUser", fields: [forUserId], references: [id], onDelete: Cascade)
+  forUser   User   @relation("BookingForUser", fields: [forUserId], references: [id], onDelete: Restrict)
 
   bookedDays ServiceBookingDay[]
 
   serviceId String
-  service   Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  service   Service @relation(fields: [serviceId], references: [id], onDelete: Restrict)
 
   status      ServiceBookingStatus @default(Pending)
   bookingType ServiceBookingType   @default(Request)
@@ -1704,48 +1789,16 @@ model ServiceBooking {
   checkout         ServiceBookingCheckout?
   bashNotification BashNotification[]
 
-  // costATBCents Int
+  additionalFees ServiceBookingFee[]
+
+  daysTotalATBCents Int //ATB=At Time of Booking
+  totalATBCents     Int
 
   @@index([status])
   @@index([creatorId])
   @@index([forUserId])
 }
 
-model ServiceBookingCheckout {
-  id String @id @default(cuid())
-
-  bookingDataId String         @unique
-  bookingData   ServiceBooking @relation(fields: [bookingDataId], references: [id], onDelete: Cascade)
-
-  creatorId String
-  creator   User   @relation(fields: [creatorId], references: [id], onDelete: Cascade)
-
-  checkoutDateTime        DateTime? @default(now())
-  stripeCheckoutSessionId String?   @unique
-  stripePaymentIntentId   String?   @unique
-
-  paidOn     DateTime?
-  refundedOn DateTime?
-
-  totalAmount   Int? //stored in cents
-  depositAmount Int?
-
-  @@index(creatorId)
-}
-
-enum ServiceBookingStatus {
-  Pending //pending request
-  Approved //approved request
-  Rejected //rejected request
-  Confirmed //when payment is complete
-  Canceled //canceled request or booking
-}
-
-enum ServiceBookingType {
-  Request
-  Instant
-}
-
 enum VisibilityPreference {
   Public
   Private

package/scripts/symlinks.sh

@@ -1,3 +1,5 @@
+#! /bin/bash
+
 # run this script after any schema change to make sure the typescript defintions are updated or
 #... or if npm i is run on any of the repos, as it may overwrite the symlink
 

package/src/definitions.ts

@@ -3,34 +3,18 @@ import {
   BashEventType,
   BashEventVibeTags,
   Contact,
-  DayOfWeek,
   Prisma,
-  ServiceBookingAddOn,
-  ServiceBookingDay,
-  // Rate,
-  ServiceTypes,
   Ticket,
   TicketTier,
   User,
   UserSubscriptionType,
   YearsOfExperience,
 } from "@prisma/client";
-import {
-  ServiceExt,
-  CheckoutExt,
-  PublicUser,
-  VolunteerServiceExt,
-  BashEventExt,
-  ServiceBookingExt,
-} from "./extendedSchemas";
+import { CheckoutExt, PublicUser, ServiceBookingExt } from "./extendedSchemas";
 import { ServiceSubscriptionTier } from "./utils/userSubscriptionUtils";
-import {
-  ServiceAddonInput,
-  ServiceGetPriceToBookResult,
-} from "./utils/service/serviceBookingUtils";
+import { FrontendServiceGetPriceToBookResult } from "./utils/service/frontendServiceBookingUtils";
 import { LuxonDateRange } from "./utils/luxonUtils";
-import { ServiceCantBookReason } from "./utils/service/serviceBookingApiUtils";
-import { urlAppendQueryParam } from "./utils/urlUtils";
+import { ApiServiceCantBookReason } from "./utils/service/apiServiceBookingApiUtils";
 import { ServiceAttendeeOption } from "./utils/service/attendeeOptionUtils";
 
 export const PASSWORD_MIN_LENGTH = 8 as const;
@@ -132,14 +116,24 @@ export const DONATION_CHECKOUT_RETURN_CANCEL_URL_PAGE =
 // );
 
 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
+  "/service/${SERVICE_ID}/${SERVICE_TYPE}/${SPECIFIC_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;
+  "/service/${SERVICE_ID}/${SERVICE_TYPE}/${SPECIFIC_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;
+  "/service/$serviceId/$serviceType/$specificId/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;
+  "/service/$serviceId/$serviceType/$specificId/booking/$bookingId/checkout-return/cancel/$checkoutSessionId" as const;
+
+export const SERVICE_BOOKING_DETAILS_MY_VIEW_URL =
+  "/service/${SERVICE_ID}/${SERVICE_TYPE}/${SPECIFIC_ID}/booking/${BOOKING_ID}/myView" as const;
+export const SERVICE_BOOKING_DETAILS_SERVICE_VIEW_URL =
+  "/service/${SERVICE_ID}/${SERVICE_TYPE}/${SPECIFIC_ID}/booking/${BOOKING_ID}/serviceView" as const;
+
+export const SERVICE_BOOKING_DETAILS_MY_VIEW_URL_PAGE =
+  "/service/$serviceId/$serviceType/$specificId/booking/$bookingId/myView" as const;
+export const SERVICE_BOOKING_DETAILS_SERVICE_VIEW_URL_PAGE =
+  "/service/$serviceId/$serviceType/$specificId/booking/$bookingId/serviceView" as const;
 
 export const VERIFICATION_RETURN_URL = `/sign-up` as const;
 export const MY_SERVICES_URL = "/my-services" as const;
@@ -242,69 +236,69 @@ export type TicketTierWherePriceIsAString = Omit<TicketTier, "price"> & {
   price: string;
 } & { cannotDelete: boolean };
 
-export type ServiceAddonApiParams = {
+export type ApiServiceAddonParams = {
   addonId: string;
   chosenQuantity: number;
 };
 
-export type ServiceBookedDayApiParams = {
+export type ApiServiceBookedDayParams = {
   serviceId: string;
   forUserId: string;
 
   startDate: string;
   endDate: string;
-  addOns: ServiceAddonApiParams[];
+  addOns: ApiServiceAddonParams[];
 
   isFreeGuest?: boolean;
   allowPromiseToPay?: boolean;
 };
 
-export type ServiceBookedDayApiParamsLuxon = Omit<
-  ServiceBookedDayApiParams,
+export type ApiServiceBookedDayParamsLuxon = Omit<
+  ApiServiceBookedDayParams,
   "startDate" | "endDate"
 > & {
   dateTimeRange: LuxonDateRange;
 };
 
-export type ServiceBookingApiParamsLuxon = Omit<
-  ServiceBookingApiParams,
+export type ApiBookingParamsLuxon = Omit<
+  ApiServiceBookingParams,
   "bookedDays"
 > & {
-  bookedDays: ServiceBookedDayApiParamsLuxon[];
+  bookedDays: ApiServiceBookedDayParamsLuxon[];
 };
 
-export type ServiceBookingApiParams = {
+export type ApiServiceBookingParams = {
   serviceId: string;
-  bookedDays: ServiceBookedDayApiParams[];
+  bookedDays: ApiServiceBookedDayParams[];
   timezone: string;
   attendeeOption: ServiceAttendeeOption;
 };
 
-export type ServiceCanBookApiParams = {} & ServiceBookingApiParams;
+export type ApiServiceCanBookParams = {} & ApiServiceBookingParams;
 
-export type ServicePriceToBookApiParams = {
+export type ApiServicePriceToBookParams = {
   // stripeAccountDBId: string;
-} & ServiceBookingApiParams;
+} & ApiServiceBookingParams;
 
-export type ServicePriceToBookApiResult = {
+export type ApiServicePriceToBookResult = {
   // taxes: number;
   // totalAfterTaxes: number;
   // currency: string;
-} & ServiceGetPriceToBookResult;
+} & FrontendServiceGetPriceToBookResult;
 
 // export type ServiceBookingApiResult = {
 //   serviceId: string;
 //   bookedDays: ServiceBookingDay[];
 // };
 
-export type ServiceCanBookApiResult = {
+export type ApiServiceCanBookResult = {
   canBook: boolean;
-  reason?: ServiceCantBookReason;
+  reason?: ApiServiceCantBookReason;
 };
 
-export type ServiceBookingApiResult = {
-  canBook: ServiceCanBookApiResult;
-  priceToBook: ServiceGetPriceToBookResult;
+export type ApiServiceBookingResult = {
+  canBook: ApiServiceCanBookResult;
+  priceToBook: FrontendServiceGetPriceToBookResult;
   booking?: ServiceBookingExt;
 };