@bash-app/bash-common 29.19.23 → 29.19.25

package/package.json

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

package/prisma/schema.prisma

@@ -238,7 +238,7 @@ model BashEvent {
   isTrending                      Boolean?
   coordinates                     Coordinates[] // A BashEvent can have multiple sets of coordinates
   // stripeAccount                  StripeAccount[]
-  rate                            Rate[]
+  // rate                            Rate[]
   venueId                         String? // Nullable, meaning it's optional
   venue                           Venue?             @relation(fields: [venueId], references: [id])
 }
@@ -271,7 +271,7 @@ model TicketTier {
   bashEvent              BashEvent            @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
   tickets                Ticket[]
   waitList               User[]
-  price                  Int                  @default(0)
+  price                  Int                  @default(0) //stored multipled by 100 to allow for decimals
   title                  String               @default("Free")
   sortOrder              Int?
   description            String?
@@ -356,26 +356,6 @@ enum BookingStatus {
   Missed
 }
 
-model Rate {
-  id                     String     @id @default(cuid())
-  serviceMultipleRatesId String?
-  serviceMultipleRates   Service?   @relation("MultipleRates", fields: [serviceMultipleRatesId], references: [id], onDelete: Cascade)
-  bashEventId            String?
-  bashEvent              BashEvent? @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  waitList               User[]
-  price                  Int        @default(0)
-  title                  String     @default("Free")
-  sortOrder              Int?
-  description            String?
-  maximumNumberOfHours   Int        @default(24)
-  maximumHourCount       Int        @default(24)
-  isDonationTier         Boolean?
-  hidden                 Boolean?
-
-  // promoCodes             BashEventPromoCode[]
-  @@unique([bashEventId, title])
-}
-
 model Booking {
   id                         String         @id @default(cuid())
   serviceId                  String
@@ -838,7 +818,7 @@ model User {
   createdOn                     DateTime              @default(now())
   stripeCustomerId              String?               @unique
   stripeAccountId               String?               @unique
-  isSuperUser                   Boolean               @default(false)
+  isSuperUser                   Boolean?               @default(false)
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
@@ -899,7 +879,7 @@ model User {
   userSubscription              UserSubscription?
   serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
-  rate                          Rate[]
+  // rate                          Rate[]
   stripeAccounts                StripeAccount[]
 }
 
@@ -998,7 +978,7 @@ model Service {
   communityInvolvement String?
   emergencyContact     String?
   contactDetails       String?
-  rates                Rate[]  @relation("MultipleRates")
+  // rates                Rate[]  @relation("MultipleRates")
   cancellationPolicy   String?
   refundPolicy         String?
   insurancePolicy      String?
@@ -1010,8 +990,7 @@ model Service {
   targetAudienceId String?         @unique
   targetAudience   TargetAudience? @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)
 
-  visibility         VisibilityPreference @default(Public)
-  availableDateTimes Availability[]       @relation("AvailableDateTimes")
+  visibility VisibilityPreference @default(Public)
 
   bashesInterestedIn BashEventType[]
   bookings           Booking[]
@@ -1028,6 +1007,8 @@ model Service {
   venue                Venue?
   organization         Organization?
 
+  serviceRatesAssociation ServiceRatesAssociation?
+
   // googleReviews GoogleReview[]
 
   bashEvent BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
@@ -1050,23 +1031,26 @@ model StripeAccount {
 }
 
 model VolunteerService {
-  id                 String                  @id @default(cuid())
+  id                String                  @id @default(cuid())
   // service            Service
-  userId             String?
-  user               User?                   @relation(fields: [userId], references: [id])
-  serviceRangeId     String?
-  serviceRange       ServiceRange?           @relation(fields: [serviceRangeId], references: [id])
-  links              Link[]                  @relation("VolunteerServiceLinks")
-  availableDateTimes Availability[]          @relation("AvailableDateTimes")
-  fullName           String?
-  address            String?
-  email              String?
-  phone              String?
-  agreedToAgreement  Boolean?                @default(false)
-  description        String?
-  status             VolunteerServiceStatus?
-  media              Media[]
-  Service            Service[]
+  userId            String?
+  user              User?                   @relation(fields: [userId], references: [id])
+  serviceRangeId    String?
+  serviceRange      ServiceRange?           @relation(fields: [serviceRangeId], references: [id])
+  links             Link[]                  @relation("VolunteerServiceLinks")
+  // availableDateTimes ServiceAvailability[]   @relation("AvailableDateTimes")
+  fullName          String?
+  address           String?
+  email             String?
+  phone             String?
+  agreedToAgreement Boolean?                @default(false)
+  description       String?
+  status            VolunteerServiceStatus?
+  media             Media[]
+
+  serviceRatesAssociation ServiceRatesAssociation?
+
+  service Service[]
 }
 
 model EventService {
@@ -1281,18 +1265,161 @@ model ServiceRange {
   Sponsor               Sponsor[]
 }
 
+// model Availability {
+//   id            String   @id @default(cuid())
+//   dayOfWeek     Int
+//   startDateTime DateTime @db.Time
+//   endDateTime   DateTime @db.Time
+//   // Rate          Rate?    @relation(fields: [rateId], references: [id])
+//   rateId        String?
+// }
+
+// model Rate {
+//   id                     String         @id @default(cuid())
+//   serviceMultipleRatesId String?
+//   serviceMultipleRates   Service?       @relation("MultipleRates", fields: [serviceMultipleRatesId], references: [id], onDelete: Cascade)
+//   bashEventId            String?
+//   bashEvent              BashEvent?     @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+//   waitList               User[]
+//   price                  Int            @default(0)
+//   title                  String         @default("Free")
+//   sortOrder              Int?
+//   description            String?
+//   maximumNumberOfHours   Int            @default(24)
+//   maximumHourCount       Int            @default(24)
+//   isDonationTier         Boolean?
+//   hidden                 Boolean?
+//   Availability           Availability[]
+
+//   // promoCodes             BashEventPromoCode[]
+//   @@unique([bashEventId, title])
+// }
+
+// model ServiceRate {
+//   id                  String                @id @default(cuid())
+//   rateType            ServiceRateType
+//   rate                Int?
+//   ServiceSpecialRates ServiceSpecialRates[]
+// }
+
+// model ServiceGeneralRates {
+//   id String @id @default(cuid())
+
+//   serviceRateId String?
+//   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
+
+//   // generalHourlyRate Int
+//   // generalDailyRate  Int
+//   // generalWeeklyRate  Int
+//   // generalMonthlyRate Int
+// }
+
+enum ServiceRateType {
+  General
+  Weekday
+  Special
+  // CLOSED
+  // HOURLY
+  // DAILY
+  // WEEKLY
+}
+
+//can optionally be associated with a package
+model ServiceAddon {
+  id          String @id @default(cuid())
+  name        String
+  description String
+  price       Int?
+  quantity    Int
+
+  servicePackage   ServicePackage? @relation(fields: [servicePackageId], references: [id], onDelete: Cascade)
+  servicePackageId String?
+
+  serviceRatesAssociation   ServiceRatesAssociation? @relation(fields: [serviceRatesAssociationId], references: [id], onDelete: Cascade)
+  serviceRatesAssociationId String?
+}
+
+model ServicePackage {
+  id          String @id @default(cuid())
+  name        String
+  description String
+  price       Int
+
+  serviceAddons ServiceAddon[]
+
+  serviceRatesAssociation   ServiceRatesAssociation? @relation(fields: [serviceRatesAssociationId], references: [id], onDelete: Cascade)
+  serviceRatesAssociationId String?
+}
+
+model ServiceRate {
+  id                      String                   @id @default(cuid())
+  rateType                ServiceRateType
+  hourlyRate              Int?
+  dailyRate               Int?
+  serviceSpecialRates     ServiceSpecialRates?
+  serviceDailyRates       ServiceDailyRates?
+  serviceRatesAssociation ServiceRatesAssociation?
+
+  @@index([rateType])
+}
+
+model ServiceSpecialRates {
+  id        String   @id @default(cuid())
+  startDate DateTime @db.Date
+  endDate   DateTime @db.Date
+
+  serviceRateId String?
+  serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
+  isAvailable   Boolean
+
+  serviceRatesAssociation ServiceRatesAssociation?
+
+  @@unique([serviceRateId])
+}
+
 // different days of the week have different rates
 // can block of certain dates of the year and days of the week as being closed
 // can have special rates on different days of the year (single or range)
-model Availability {
-  id                 String            @id @default(cuid())
-  dayOfWeek          Int
-  startDateTime      DateTime          @db.Time
-  endDateTime        DateTime          @db.Time
+// free trial period with promo code (1 or 2 months of listing for free)
+model ServiceDailyRates {
+  id        String   @id @default(cuid())
+  dayOfWeek Int
+  startTime DateTime @db.Time
+  endTime   DateTime @db.Time
+
+  serviceRateId String?
+  serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
+
+  serviceRatesAssociation ServiceRatesAssociation?
+
+  @@unique([serviceRateId])
+}
+
+model ServiceRatesAssociation {
+  id String @id @default(cuid())
+
   serviceId          String?
-  service            Service?          @relation("AvailableDateTimes", fields: [serviceId], references: [id])
+  service            Service?          @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   volunteerServiceId String?
-  volunteerService   VolunteerService? @relation("AvailableDateTimes", fields: [volunteerServiceId], references: [id])
+  volunteerService   VolunteerService? @relation(fields: [volunteerServiceId], references: [id], onDelete: Cascade)
+
+  serviceGeneralRatesId String?
+  serviceGeneralRates   ServiceRate? @relation(fields: [serviceGeneralRatesId], references: [id], onDelete: Cascade)
+
+  serviceDailyRatesId String?
+  serviceDailyRates   ServiceDailyRates? @relation(fields: [serviceDailyRatesId], references: [id], onDelete: Cascade)
+
+  serviceSpecialRatesId String?
+  serviceSpecialRates   ServiceSpecialRates? @relation(fields: [serviceSpecialRatesId], references: [id], onDelete: Cascade)
+
+  addons   ServiceAddon[]
+  packages ServicePackage[]
+
+  @@unique([serviceId])
+  @@unique([volunteerServiceId])
+  @@unique([serviceGeneralRatesId])
+  @@unique([serviceDailyRatesId])
+  @@unique([serviceSpecialRatesId])
 }
 
 enum VisibilityPreference {

package/src/definitions.ts

@@ -5,7 +5,7 @@ import {
   Contact,
   DayOfWeek,
   Prisma,
-  Rate,
+  // Rate,
   ServiceTypes,
   Ticket,
   TicketTier,
@@ -203,26 +203,26 @@ export interface NumberOfHoursForDate {
   bookingDateTime: DateTimeArgType;
 }
 
-export interface AvailableNumberOfHoursForRate {
-  rate: Rate;
-  availableHours: NumberOfHoursForDate[];
-}
+// export interface AvailableNumberOfHoursForRate {
+//   rate: Rate;
+//   availableHours: NumberOfHoursForDate[];
+// }
 
-export interface AvailableHoursForRateForDate {
-  rate: Rate,
-  availableHoursForDate: NumberOfHoursForDate;
-}
+// export interface AvailableHoursForRateForDate {
+//   rate: Rate,
+//   availableHoursForDate: NumberOfHoursForDate;
+// }
 
-export interface AvailableHoursForRate {
-  rate: Rate;
-  availableHours: NumberOfHoursForDate[];
-}
+// export interface AvailableHoursForRate {
+//   rate: Rate;
+//   availableHours: NumberOfHoursForDate[];
+// }
 
-export interface DeletedAndHiddenRates {
-  deletedRates: Rate[];
-  hiddenRates: Rate[];
-  errorType?: ApiErrorType;
-}
+// export interface DeletedAndHiddenRates {
+//   deletedRates: Rate[];
+//   hiddenRates: Rate[];
+//   errorType?: ApiErrorType;
+// }
 
 export interface SignInEmailWithPassword {
   email: string;

package/src/extendedSchemas.ts

@@ -12,7 +12,8 @@ import {
   Reminder,
   Checkout,
   ServiceLink,
-  Link, Venue, Availability,
+  Link, Venue, 
+  // Availability,
   TargetAudience,
   Vendor,
   EventService,
@@ -26,9 +27,14 @@ import {
   VisibilityPreference,
   BashEventType,
   Coordinates,
-  Rate,
+  // Rate,
   GoogleReview,
   ServiceTypes,
+  ServiceRatesAssociation,
+  ServiceRate,
+  ServiceDailyRates,
+  ServiceSpecialRates,
+  ServiceAddon,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
 
@@ -117,10 +123,11 @@ export const SERVICE_DATA_TO_INCLUDE = {
   // eventTasks: true,
   media: true,
   stripeAccount: true,
-  availableDateTimes: true,
+  // availableDateTimes: true,
   serviceLinks: {
     include: SERVICE_LINK_DATA_TO_INCLUDE
   },
+  serviceRatesAssociation: true
 } satisfies Prisma.ServiceInclude;
 
 // Create the final object dynamically
@@ -169,6 +176,28 @@ export const SERVICE_FULL_DATA_TO_INCLUDE = {
   ...createAllTrueObject(serviceKeysArray)
 } satisfies Prisma.ServiceInclude;
 
+export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
+  serviceAddons: true
+} satisfies Prisma.ServicePackageInclude;
+
+export const SERVICE_DAILYRATES_DATA_TO_INCLUDE = {
+  serviceRate: true
+} satisfies Prisma.ServiceDailyRatesInclude;
+
+export const SERVICE_SPECIALRATES_DATA_TO_INCLUDE = {
+  serviceRate: true
+} satisfies Prisma.ServiceSpecialRatesInclude;
+
+export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
+  serviceGeneralRates: true,
+  serviceDailyRates: true,
+  serviceSpecialRates: true,
+  addons: true,
+  packages:  {
+    include: SERVICE_PACKAGE_DATA_TO_INCLUDE
+  },
+} satisfies Prisma.ServiceRatesAssociationInclude;
+
 export interface BashNotificationExt extends BashNotification {
   creator?: PublicUser;
   bashEvent?: BashEvent;
@@ -229,10 +258,10 @@ export interface ServiceExt extends Service {
 
   stripeAccount?: StripeAccount | null;
 
-  availableDateTimes?: Availability[];
+  // availableDateTimes?: Availability[];
 
   bookings?: Booking[];
-  rates?: Rate[];
+  // rates?: Rate[];
   targetAudience?: TargetAudience | null;
   media?: Media[];
   serviceLinks?: ServiceLinkExt[];
@@ -245,8 +274,30 @@ export interface ServiceExt extends Service {
   venue?: Venue;
   organization?: Organization;
 
+  serviceRatesAssociation?: ServiceRatesAssociationExt;
+
   // googleReviews: GoogleReview[];
 }
+export interface ServicePackageExt extends ServiceDailyRates {
+  serviceAddons: ServiceAddon[]
+}
+
+export interface ServiceDailyRatesExt extends ServiceDailyRates {
+  serviceRate?: ServiceRate;
+}
+export interface ServiceSpecialRatesExt extends ServiceRatesAssociation {
+  serviceRate?: ServiceRate;
+}
+
+export interface ServiceRatesAssociationExt extends ServiceRatesAssociation {
+  serviceGeneralRates?: ServiceRate;
+  serviceDailyRates?: ServiceDailyRates;
+  serviceSpecialRates?: ServiceSpecialRates;
+
+  packages?: ServicePackageExt;
+  addons: ServiceAddon[];
+}
+
 
 export interface EventServiceExt extends EventService {
   service: ServiceExt;
@@ -293,7 +344,7 @@ export interface VolunteerServiceExt extends VolunteerService {
   serviceRange?: ServiceRange | null;
   media?: Media[];
   links?: Link[];
-  availableDateTimes?: Availability[];
+  // availableDateTimes?: Availability[];
 }
 
 export interface ServiceLinkExt extends ServiceLink {

package/src/utils/venueUtils.ts

@@ -14,8 +14,8 @@ export type VenuePricingPlanMap = {
 
 export const VenuePricingPlanData: VenuePricingPlanMap = {
     [VenuePricingPlanOption.Percentage]: {
-        name: "Pay per booking",
-        description: "15% of each booking goes to Bash",
+        name: "Pay per booking,",
+        description: "15% of each booking goes to Bash.",
         percentageFee: 0.15,
         monthlyFee: 0.0,
         flatFee: 0.0