@bash-app/bash-common 15.4.0 → 16.0.0

package/package.json

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

package/prisma/schema.prisma

@@ -512,14 +512,13 @@ model TargetAudience {
 
 model ServiceTargetAudience {
   id               String     @id @default(cuid())
-  serviceId        String
   ageRange         AgeRange   @default(NoPreference)
   gender           Gender     @default(NoPreference)
   occupation       Occupation @default(NoPreference)
   education        Education  @default(NoPreference)
   showOnDetailPage Boolean    @default(true)
-
-  service Service @relation(fields: [serviceId], references: [id])
+  Venue            Venue?     @relation(fields: [venueId], references: [id])
+  venueId          String?
 }
 
 enum AgeRange {
@@ -633,6 +632,7 @@ model Media {
   businessesReferencingMe      Business[]
   sponsoredEventsReferencingMe SponsoredEvent[]
   servicesReferencingMe        Service[]
+  venueReferencingMe        Venue[]
 }
 
 enum MediaType {
@@ -801,9 +801,46 @@ model AssociatedBash {
 }
 
 model Service {
+  id                String               @id @default(cuid())
+  ownerId           String
+  owner             User                 @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  email             String
+  streetAddress     String
+  city              String
+  state             String
+  postalCode        String
+  country           String
+  phone             String
+  privacy           Privacy              @default(Public)
+  title             String
+  coverPhoto        String?
+  agreedToAgreement Boolean?
+  media             Media[]
+  serviceTypes      ServiceType[]
+  subServiceTypes   SubServiceType[]
+  serviceTag        ServiceTag[]
+  customServiceTag  String[]
+  yearsOfExperince  YearsOfExperience    @default(LessThanOneYear)
+  serviceLinks      ServiceLink[]
+  description       String?
+  canContact        Boolean?
+  // musicGenre            MusicGenreType?
+  visibility        VisibilityPreference @default(Public)
+  // bashesInterestedIn    BashEventType[]
+  status            ServiceStatus        @default(Draft)
+  venues            Venue[]
+  serviceRangeId    String               @unique
+  serviceRange      ServiceRange         @relation("ServiceRange", fields: [serviceRangeId], references: [id], onDelete: Cascade)
+
+  @@index([email])
+  @@index([phone])
+}
+
+model Venue {
   id                    String                  @id @default(cuid())
-  ownerId               String
-  owner                 User                    @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  service               Service?                @relation(fields: [serviceId], references: [id])
+  serviceId             String?
+  venueName             String
   email                 String
   streetAddress         String
   city                  String
@@ -811,56 +848,28 @@ model Service {
   postalCode            String
   country               String
   phone                 String
-  privacy               Privacy                 @default(Public)
-  title                 String
-  coverPhoto            String?
-  agreedToAgreement     Boolean?
-  media                 Media[]
-  serviceTypes          ServiceType[]
-  subServiceTypes       SubServiceType[]
-  serviceTag            ServiceTag[]
-  customServiceTag      String[]
-  yearsOfExperince      YearsOfExperience       @default(LessThanOneYear)
-  serviceLinks          ServiceLink[]
-  description           String?
-  canContact            Boolean?
-  musicGenre            MusicGenreType?
-  visibility            VisibilityPreference    @default(Public)
-  bashesInterestedIn    BashEventType[]
+  coverPhoto        String?
+  media             Media[]
+  capacity              Int?
+  amenities             String[]
+  additionalInfo        String?
+  features              String[]
+  venueTypes            String[]
+  availableDateTimes    Availability[]          @relation("AvailableDateTimes")
+  // specialDateTimes   Availability[] @relation("SpecialDateTimes")
+  mission               String?
+  pitch                 String?
+  communityInvolvement  String?
+  emergencyContact      String?
+  contactDetails        String?
+  rates                 String?
+  cancellationPolicy    String?
+  refundPolicy          String?
+  safetyPolicy          String?
   crowdSizeId           String                  @unique
   crowdSize             ServiceRange            @relation("CrowdSize", fields: [crowdSizeId], references: [id], onDelete: Cascade)
-  serviceRangeId        String                  @unique
-  serviceRange          ServiceRange            @relation("ServiceRange", fields: [serviceRangeId], references: [id], onDelete: Cascade)
-  availableDateTimes    String[] /// Stored in format: ["startDateTime,endDateTime",...]
   serviceTargetAudience ServiceTargetAudience[]
-  status                ServiceStatus           @default(Draft)
-  venues                Venue[]
-
-  @@index([email])
-  @@index([phone])
-}
-
-model Venue {
-  id                   String         @id @default(cuid())
-  service              Service?       @relation(fields: [serviceId], references: [id])
-  serviceId            String?
-  venueName            String
-  capacity             Int?
-  amenities            String[]
-  additionalInfo       String?
-  features             String[]
-  venueTypes           String[]
-  availableDateTimes   Availability[] @relation("AvailableDateTimes")
-  // specialDateTimes   Availability[] @relation("SpecialDateTimes")
-  mission              String?
-  pitch                String?
-  communityInvolvement String?
-  emergencyContact     String?
-  contactDetails       String?
-  rates                String?
-  cancellationPolicy   String?
-  refundPolicy         String?
-  safetyPolicy         String?
+  bashesInterestedIn    BashEventType[]
 }
 
 enum ServiceTag {
@@ -886,7 +895,7 @@ model ServiceRange {
   id                  String   @id @default(cuid())
   min                 Int      @default(0)
   max                 Int      @default(50)
-  serviceCrowdSize    Service? @relation("CrowdSize")
+  serviceCrowdSize    Venue?   @relation("CrowdSize")
   serviceServiceRange Service? @relation("ServiceRange")
 }