@bash-app/bash-common 27.3.1 → 27.3.3

package/package.json

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

package/src/definitions.ts

@@ -103,6 +103,11 @@ export const ServiceTypes = {
   'EntertainmentServices': 'entertainmentServices',
 } satisfies {[key: string]: keyof ServiceExt}
 
+// export const ServiceStatus = {
+//   'Draft': 'draft',
+//   'Created': 'created',
+// } satisfies {[key: string]: keyof Service}
+
 export type FilterFields = {
   price: string[];
   ageRequirement: string[];

package/src/extendedSchemas.ts

@@ -157,6 +157,7 @@ export interface EventServiceExt extends EventService {
   links: ServiceLinkExt[];
   crowdSize?: AmountOfGuests;
   media?: Media[];
+  serviceType: ServiceTypes;
 }
 
 export interface EntertainmentServiceExt extends EntertainmentService {
@@ -166,6 +167,8 @@ export interface EntertainmentServiceExt extends EntertainmentService {
   links: ServiceLinkExt[];
   crowdSize?: AmountOfGuests;
   media?: Media[];
+  status: ServiceStatus;
+  serviceType: ServiceTypes;
 }
 
 export interface ExhibitorExt extends Exhibitor {
@@ -175,6 +178,8 @@ export interface ExhibitorExt extends Exhibitor {
   links: ServiceLinkExt[];
   crowdSize?: AmountOfGuests;
   media?: Media[];
+  status: ServiceStatus;
+  serviceType: ServiceTypes;
 }
 
 export interface SponsorExt extends Sponsor {
@@ -184,6 +189,8 @@ export interface SponsorExt extends Sponsor {
   links: ServiceLinkExt[];
   crowdSize?: AmountOfGuests;
   media?: Media[];
+  status: ServiceStatus;
+  serviceType: ServiceTypes;
 }
 
 export interface VendorExt extends Vendor {
@@ -193,21 +200,12 @@ export interface VendorExt extends Vendor {
   links: ServiceLinkExt[];
   crowdSize?: AmountOfGuests;
   media?: Media[];
+  status: ServiceStatus;
+  serviceType: ServiceTypes;
 }
 
-export const VENDOR_DATA_TO_INCLUDE = {
-  availableDateTimes: true,
-  targetAudience: true,
-  links: true,
-  crowdSize: true,
-  media: true,
-} satisfies Prisma.VendorInclude;
-
-export const SERVICE_LINK_DATA_TO_INCLUDE = {
-  link: true,
-} satisfies Prisma.ServiceLinkInclude;
-
 export interface VenueExt extends Venue {
+  owner: User;
   service?: Service;
   availableDateTimes?: Availability[]; 
   targetAudience?: TargetAudience | null;
@@ -215,23 +213,10 @@ export interface VenueExt extends Venue {
   coverPhotoUrl?: string;
   media?: Media[];
   amountOfGuests?: AmountOfGuests | null;
-  
+  status: ServiceStatus;
+  serviceType: ServiceTypes;
 }
 
-
-export const VOLUNTEER_DATA_TO_INCLUDE = {
-  links: {
-    include: {
-      serviceLinks: true,
-    },
-  },
-  media: true,
-  serviceRange: true,
-} satisfies Prisma.VolunteerServiceInclude;
-
-
-
-
 export interface OrganizationExt extends Organization {
   service?: Service;
   availableDateTimes: Availability[];
@@ -240,6 +225,7 @@ export interface OrganizationExt extends Organization {
   crowdSize?: AmountOfGuests;
   media?: Media[];
   status: ServiceStatus;
+  serviceType: ServiceTypes;
 }
 
 export interface VolunteerServiceExt extends VolunteerService {
@@ -256,8 +242,6 @@ export interface VolunteerServiceExt extends VolunteerService {
   status: VolunteerServiceStatus | null;
 }
 
-
-
 export interface ServiceExt extends Service {
   owner?: PublicUser; 
   media?: Media[];