@bash-app/bash-common 29.19.18 → 29.19.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.19.18",
+  "version": "29.19.20",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -43,4 +43,4 @@
     "tslib": "^2.6.2",
     "typescript": "^5.2.2"
   }
-}
+}

package/prisma/schema.prisma

@@ -227,8 +227,8 @@ model BashEvent {
   dateTimePublished               DateTime?
   comments                        BashComment[]
   includedItems                   String[]
-  associatedBashesReferencingMe   AssociatedBash[] //maybe rename later to AssociatedWithABash
-  associatedServicesReferencingMe Service[] //maybe rename later to AssociatedWithAService
+  associatedBashesReferencingMe   AssociatedBash[] // maybe rename later to AssociatedWithABash
+  associatedServicesReferencingMe Service[] // maybe rename later to AssociatedWithAService
   bashNotificationsReferencingMe  BashNotification[]
   checkouts                       Checkout[]
   eventTasks                      EventTask[]
@@ -371,8 +371,8 @@ model Rate {
   maximumHourCount       Int        @default(24)
   isDonationTier         Boolean?
   hidden                 Boolean?
-  // promoCodes             BashEventPromoCode[]
 
+  // promoCodes             BashEventPromoCode[]
   @@unique([bashEventId, title])
 }
 
@@ -917,7 +917,7 @@ model Contact {
   @@index([contactEmail])
 }
 
-//anyone that is invited to the bash, is an organizer of a bash, and or the creator/owner of the bash...for having others (including services) edit or post about a bash in the bashfeed
+// anyone that is invited to the bash, is an organizer of a bash, and or the creator/owner of the bash...for having others (including services) edit or post about a bash in the bashfeed
 model AssociatedBash {
   id           String      @id @default(cuid())
   bashEventId  String
@@ -934,7 +934,7 @@ model AssociatedBash {
   @@unique([ownerEmail, bashEventId])
 }
 
-//anyone that is invited to be an organizer of a service profile or is the creator/owner...for having others edit or post about a service in the bashfeed (but the service must be associated with a bash to post)
+// anyone that is invited to be an organizer of a service profile or is the creator/owner...for having others edit or post about a service in the bashfeed (but the service must be associated with a bash to post)
 model AssociatedService {
   id          String   @id @default(cuid())
   serviceId   String
@@ -950,7 +950,7 @@ model AssociatedService {
   @@unique([ownerEmail, serviceId])
 }
 
-//Common data for all services; 1-1 relation between each individual service model such as Venue
+// Common data for all services; 1-1 relation between each individual service model such as Venue
 model Service {
   id String @id @default(cuid())
 
@@ -958,11 +958,11 @@ model Service {
   serviceStatus    ServiceStatus    @default(Draft)
   serviceCondition ServiceCondition @default(Pending)
 
-  //current owner
+  // current owner
   ownerId String?
   owner   User?   @relation("OwnedService", fields: [ownerId], references: [id])
 
-  //original creator
+  // original creator
   creatorId String?
   creator   User?   @relation("CreatedService", fields: [creatorId], references: [id])
 
@@ -975,7 +975,7 @@ model Service {
   serviceName String?
   tagline     String?
 
-  //this is not the business info but that which is associated with the service
+  // this is not the business info but that which is associated with the service
   place         String?
   googlePlaceId String?
   street        String?
@@ -985,7 +985,7 @@ model Service {
   country       String?
   description   String?
   // email       String?
-  // phone       String? 
+  // phone       String?
 
   pocName          String?
   pocPhoneNumber   String?
@@ -1018,6 +1018,8 @@ model Service {
   media              Media[]
   serviceLinks       ServiceLink[]
 
+  volunteerServiceId   String?
+  volunteerService     VolunteerService?     @relation(fields: [volunteerServiceId], references: [id])
   eventService         EventService?
   entertainmentService EntertainmentService?
   vendor               Vendor?
@@ -1028,7 +1030,7 @@ model Service {
 
   // googleReviews GoogleReview[]
 
-  bashEvent BashEvent[] //because a service needs to be associated with a bash to post to the bashfeed
+  bashEvent BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
 }
 
 model StripeAccount {
@@ -1064,6 +1066,7 @@ model VolunteerService {
   description        String?
   status             VolunteerServiceStatus?
   media              Media[]
+  Service            Service[]
 }
 
 model EventService {
@@ -1163,15 +1166,20 @@ model Venue {
   vibe                String?
   dress               String?
 
-  pricingPlan           PricingPlan?        @default(Percentage)
-  percentageRate        Float?              @default(0.15)
+  pricingPlan           VenuePricingPlan?   @default(Percentage)
   subscriptionStatus    SubscriptionStatus?
   subscriptionStartDate DateTime?
 
   bashEvents BashEvent[]
 }
 
-enum PricingPlan {
+// model VenuePricing {
+//   id                  String            @id @default(cuid())
+//   venuePricingPlan VenuePricingPlan
+//   percentageRate        Float?              @default(0.15)
+// }
+
+enum VenuePricingPlan {
   Percentage
   Subscription
 }
@@ -1273,9 +1281,9 @@ model ServiceRange {
   Sponsor               Sponsor[]
 }
 
-//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)
+// 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

package/src/definitions.ts

@@ -93,25 +93,15 @@ export const SERVICE_LINK_DATA_TO_INCLUDE = {
   link: true,
 } satisfies Prisma.ServiceLinkInclude;
 
-// export const SERVICE_DATA_TO_INCLUDE = {
-//   stripeAccount: true,
-//   availableDateTimes: true,
-//   targetAudience: true,
-//   media: true,
-//   serviceLinks: {
-//     include: SERVICE_LINK_DATA_TO_INCLUDE
-//   },
-//   // googleReviews: true,
-// } satisfies Prisma.ServiceInclude;
 
 // export type ServiceSpecificName = keyof Pick<
 //   ServiceExt,
-//   "eventService" | 
-//   "entertainmentService" | 
-//   "vendor" | 
-//   "exhibitor" | 
-//   "sponsor" | 
-//   "venue" | 
+//   "eventService" |
+//   "entertainmentService" |
+//   "vendor" |
+//   "exhibitor" |
+//   "sponsor" |
+//   "venue" |
 //   "organization"
 // >;
 
@@ -585,4 +575,4 @@ export interface IAddress {
   state: string;
   zipCode: string;
   country: string;
-}
+}

package/src/extendedSchemas.ts

@@ -105,6 +105,9 @@ export const SERVICE_DATA_TO_INCLUDE = {
   creator: {
     select: FRONT_END_USER_DATA_TO_SELECT
   },
+  owner: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  },
   targetAudience: true,
   // amountOfGuests: true,
   // recurrence: true,
@@ -222,15 +225,15 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
 
 //---------------Services------------------
 export interface ServiceExt extends Service {
-  owner: PublicUser;
+  owner?: PublicUser | null;
 
-  stripeAccount?: StripeAccount;
+  stripeAccount?: StripeAccount | null;
 
   availableDateTimes?: Availability[];
 
   bookings?: Booking[];
   rates?: Rate[];
-  targetAudience?: TargetAudience;
+  targetAudience?: TargetAudience | null;
   media?: Media[];
   serviceLinks?: ServiceLinkExt[];
 

package/src/utils/venueUtils.ts

@@ -0,0 +1,24 @@
+import { VenuePricingPlan as VenuePricingPlanOption } from "@prisma/client";
+
+export type VenuePricingPlan = {
+    percentageFee: number;
+    monthlyFee: number;
+    flatFee: number;
+};
+
+export type VenuePricingPlanDataType = {
+    [key in VenuePricingPlanOption]: VenuePricingPlan;
+};
+
+export const VenuePricingPlanData: VenuePricingPlanDataType = {
+    [VenuePricingPlanOption.Percentage]: {
+        percentageFee: 0.15,
+        monthlyFee: 0.0,
+        flatFee: 0.0
+    },
+    [VenuePricingPlanOption.Subscription]: {
+        percentageFee: 0.0,
+        monthlyFee: 100.0,
+        flatFee: 0.0
+    }
+};