@bash-app/bash-common 26.1.0 → 26.1.2

package/package.json

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

package/prisma/schema.prisma

@@ -1187,22 +1187,20 @@ model Venue {
   serviceId            String
   serviceConnectionId  String?
   serviceConnection    String?
-  venueName            String
-  email                String
-  street               String
-  city                 String
-  state                String
-  zipCode              String
-  country              String
-  phone                String
+  venueName            String?
+  email                String?
+  street               String?
+  city                 String?
+  state                String?
+  zipCode              String?
+  country              String?
+  phone                String?
   coverPhoto           String?
   media                Media[]
   visibility           VisibilityPreference @default(Public)
   status               ServiceStatus        @default(Draft)
   yearsInBusiness      YearsOfExperience    @default(LessThanOneYear)
   description          String?
-  serviceRangeId       String               @unique
-  serviceRange         ServiceRange         @relation(fields: [serviceRangeId], references: [id], onDelete: Cascade)
   amenities            String[]
   menuItems            String?
   additionalInfo       String?
@@ -1342,7 +1340,6 @@ model ServiceRange {
   min               Int                @default(0)
   max               Int                @default(50)
   volunteerServices VolunteerService[]
-  venue             Venue?
 }
 
 model Availability {

package/src/extendedSchemas.ts

@@ -189,25 +189,14 @@ export const SERVICE_LINK_DATA_TO_INCLUDE = {
 
 export interface VenueExt extends Venue {
   service?: Service;
-  availableDateTimes: Availability[];
+  availableDateTimes?: Availability[];
   targetAudience?: TargetAudience | null;
-  links: ServiceLinkExt[];
-  serviceRange: ServiceRange;
+  links?: ServiceLinkExt[];
+  serviceRange?: ServiceRange;
   media?: Media[];
   amountOfGuests?: AmountOfGuests | null; // Reflecting the correct relation with AmountOfGuests
 }
 
-export const VENUE_DATA_TO_INCLUDE = {
-  availableDateTimes: true,
-  targetAudience: true,
-  links: {
-    include: SERVICE_LINK_DATA_TO_INCLUDE
-  },
-  media: true,
-  serviceRange: true,
-  amountOfGuests: true,
-} satisfies Prisma.VenueInclude;
-
 export const VOLUNTEER_DATA_TO_INCLUDE = {
   links: {
     include: {
@@ -264,23 +253,6 @@ export interface ServiceExt extends Service {
   bookings?: Booking[];
 }
 
-export const BUSINESS_DATA_TO_INCLUDE = {
-  owner: {
-    select: FRONT_END_USER_DATA_TO_SELECT,
-  },
-  media: true,
-  targetAudience: true,
-  serviceLinks: {
-    include: SERVICE_LINK_DATA_TO_INCLUDE,
-  },
-  venues: {
-    include: VENUE_DATA_TO_INCLUDE,
-  },
-  vendors: {
-    include: VENDOR_DATA_TO_INCLUDE,
-  },
-} 
-
 
 export interface ServiceLinkExt extends ServiceLink {
   link: Link;