@bash-app/bash-common 28.2.0 → 28.4.0

package/package.json

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

package/prisma/schema.prisma

@@ -564,15 +564,14 @@ enum Privacy {
 }
 
 model TargetAudience {
-  id               String     @id @default(cuid())
-  ageRange         AgeRange   @default(NoPreference)
-  gender           Gender     @default(NoPreference)
-  occupation       Occupation @default(NoPreference)
-  education        Education  @default(NoPreference)
-  showOnDetailPage Boolean    @default(true)
+  id               String       @id @default(cuid())
+  ageRange         AgeRange[]
+  gender           Gender[]
+  occupation       Occupation[]
+  education        Education[]
+  showOnDetailPage Boolean      @default(true)
   bashEvent        BashEvent?
-  service          Service?   @relation(fields: [serviceId], references: [id]) //Check: Can a service have multiple target audiences?
-  serviceId        String?
+  service          Service?
 }
 
 enum AgeRange {
@@ -615,6 +614,13 @@ enum ServiceStatus {
   Created
 }
 
+enum ServiceCondition {
+  Pending
+  Published
+  Suspended
+  Deactivated
+}
+
 enum VolunteerServiceStatus {
   Draft
   Pending
@@ -871,8 +877,9 @@ model AssociatedBash {
 model Service {
   id String @id @default(cuid())
 
-  serviceType   ServiceTypes
-  serviceStatus ServiceStatus @default(Draft)
+  serviceType     ServiceTypes
+  serviceStatus   ServiceStatus    @default(Draft)
+  serviceCondtion ServiceCondition @default(Pending)
 
   //current owner
   ownerId String?
@@ -912,12 +919,14 @@ model Service {
   stripeAccountId String?
   stripeAccount   StripeAccount? @relation(fields: [stripeAccountId], references: [id], onDelete: Cascade)
 
+  targetAudienceId String?         @unique
+  targetAudience   TargetAudience? @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)
+
   visibility         VisibilityPreference @default(Public)
   availableDateTimes Availability[]       @relation("AvailableDateTimes")
 
   bashesInterestedIn BashEventType[]
   bookings           Booking[]
-  targetAudiences    TargetAudience[]
   media              Media[]
   ServiceLink        ServiceLink[]
 

package/src/extendedSchemas.ts

@@ -159,7 +159,7 @@ export interface ServiceExt extends Service {
   availableDateTimes?: Availability[];
 
   bookings?: Booking[];
-  targetAudiences?: TargetAudience[];
+  targetAudiences?: TargetAudience;
   media?: Media[];
   serviceLinks?: ServiceLinkExt[];
 
@@ -198,12 +198,12 @@ export interface VendorExt extends Vendor {
 }
 
 export interface VenueExt extends Venue {
-  service?: ServiceExt;
+  service: ServiceExt;
   crowdSize?: AmountOfGuests;
 }
 
 export interface OrganizationExt extends Organization {
-  service?: ServiceExt;
+  service: ServiceExt;
   amountOfGuests?: AmountOfGuests;
 }
 //-----------------------------------------