@bash-app/bash-common 27.3.0 → 27.3.2

package/package.json

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

package/src/definitions.ts

@@ -9,7 +9,7 @@ import {
   User,
   YearsOfExperience
 } from "@prisma/client";
-import { CheckoutExt, PublicUser, ServiceExt} from "./extendedSchemas";
+import { ServiceExt, CheckoutExt, PublicUser, VolunteerServiceExt} from "./extendedSchemas";
 
 export const PASSWORD_MIN_LENGTH = 10 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{${PASSWORD_MIN_LENGTH},}$`);
@@ -91,6 +91,8 @@ export type ContactOrUser = Contact | PublicUser;
 export type UnionFromArray<T extends ReadonlyArray<any>> = T[number];
 export type ValueOf<T> = T[keyof T];
 
+export type ValueOfServiceType = ValueOf<typeof ServiceTypes>;
+
 export const ServiceTypes = {
   'EventServices': 'eventServices',
   'Organizations': 'organizations',
@@ -100,6 +102,7 @@ export const ServiceTypes = {
   'Exhibitors': 'exhibitors',
   'EntertainmentServices': 'entertainmentServices',
 } satisfies {[key: string]: keyof ServiceExt}
+
 export type FilterFields = {
   price: string[];
   ageRequirement: string[];
@@ -304,12 +307,14 @@ export const DayOfWeekToString: { [key in DayOfWeek]: string } = {
   [DayOfWeek.Saturday]: 'S',
 }
 
+
 export const YearsOfExperienceToString: { [key in YearsOfExperience]: string } = {
   [YearsOfExperience.LessThanOneYear]: 'Less than one year',
   [YearsOfExperience.OneToThreeYears]: 'One to three years',
   [YearsOfExperience.ThreeToFiveYears]: 'Three to five years',
   [YearsOfExperience.FivePlusYears]: 'More than five years',
 };
+
 export type ServiceTypeToStringType = {
   [key in ValueOf<typeof ServiceTypes>]: string;
 };
@@ -322,6 +327,7 @@ export const ServiceTypeToString: ServiceTypeToStringType = {
   [ServiceTypes.Venues]: "/servicesDefault.webp",
   [ServiceTypes.Organizations]: "/servicesDefault.webp"
 }
+
 export type BashEventTypeToStringType = {
   [key in BashEventType]: string;
 };

package/src/extendedSchemas.ts

@@ -166,6 +166,7 @@ export interface EntertainmentServiceExt extends EntertainmentService {
   links: ServiceLinkExt[];
   crowdSize?: AmountOfGuests;
   media?: Media[];
+  status: ServiceStatus;
 }
 
 export interface ExhibitorExt extends Exhibitor {
@@ -175,6 +176,7 @@ export interface ExhibitorExt extends Exhibitor {
   links: ServiceLinkExt[];
   crowdSize?: AmountOfGuests;
   media?: Media[];
+  status: ServiceStatus;
 }
 
 export interface SponsorExt extends Sponsor {
@@ -184,6 +186,7 @@ export interface SponsorExt extends Sponsor {
   links: ServiceLinkExt[];
   crowdSize?: AmountOfGuests;
   media?: Media[];
+  status: ServiceStatus;
 }
 
 export interface VendorExt extends Vendor {
@@ -193,21 +196,11 @@ export interface VendorExt extends Vendor {
   links: ServiceLinkExt[];
   crowdSize?: AmountOfGuests;
   media?: Media[];
+  status: ServiceStatus;
 }
 
-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 +208,9 @@ export interface VenueExt extends Venue {
   coverPhotoUrl?: string;
   media?: Media[];
   amountOfGuests?: AmountOfGuests | null;
-  
+  status: ServiceStatus;
 }
 
-
-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[];
@@ -256,8 +235,6 @@ export interface VolunteerServiceExt extends VolunteerService {
   status: VolunteerServiceStatus | null;
 }
 
-
-
 export interface ServiceExt extends Service {
   owner?: PublicUser; 
   media?: Media[];