@bash-app/bash-common 27.2.10 → 27.2.12

package/package.json

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

package/prisma/schema.prisma

@@ -17,7 +17,7 @@ model Club {
   street  String
   userId  String
   price   Int?
-  events  BashEvent[]
+  events  BashEvent[] 
   members ClubMember[]
   admin   ClubAdmin[]
 }
@@ -900,6 +900,7 @@ model Service {
   // stripeServiceCustomerId              String?               @unique
   stripeBusinessId      String                 @unique
   // stripeBusinessType  String  @default("Individual")
+  serviceType ServiceTypes
   creatorId             String
   creator               User                   @relation("CreatedService", fields: [creatorId], references: [id], onDelete: Cascade)
   dateCreated           DateTime               @default(now())

package/src/definitions.ts

@@ -9,7 +9,7 @@ import {
   User,
   YearsOfExperience
 } from "@prisma/client";
-import { ServiceExt, CheckoutExt, PublicUser, VolunteerServiceExt} from "./extendedSchemas";
+import { CheckoutExt, PublicUser} 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,17 +91,6 @@ 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',
-  'Venues': 'venues',
-  'Vendors': 'vendors',
-  'Sponsors': 'sponsors',
-  'Exhibitors': 'exhibitors',
-  'EntertainmentServices': 'entertainmentServices',
-} satisfies {[key: string]: keyof ServiceExt}
 
 export type FilterFields = {
   price: string[];
@@ -307,7 +296,6 @@ 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',
@@ -315,19 +303,6 @@ export const YearsOfExperienceToString: { [key in YearsOfExperience]: string } =
   [YearsOfExperience.FivePlusYears]: 'More than five years',
 };
 
-export type ServiceTypeToStringType = {
-  [key in ValueOf<typeof ServiceTypes>]: string;
-};
-export const ServiceTypeToString: ServiceTypeToStringType = {
-  [ServiceTypes.EventServices]: "/servicesDefault.webp",
-  [ServiceTypes.EntertainmentServices]: "/servicesDefault.webp",
-  [ServiceTypes.Vendors]: "/servicesDefault.webp",
-  [ServiceTypes.Exhibitors]: "/servicesDefault.webp",
-  [ServiceTypes.Sponsors]: "/servicesDefault.webp",
-  [ServiceTypes.Venues]: "/servicesDefault.webp",
-  [ServiceTypes.Organizations]: "/servicesDefault.webp"
-}
-
 export type BashEventTypeToStringType = {
   [key in BashEventType]: string;
 };

package/src/extendedSchemas.ts

@@ -24,7 +24,7 @@ import {
   Booking,
   VolunteerService, Prisma, ServiceRange,
 } from "@prisma/client";
-import {ServiceTypes, UnionFromArray} from "./definitions";
+import {UnionFromArray} from "./definitions";
 
 export const FRONT_END_USER_DATA_TO_SELECT = {
   id: true,
@@ -272,7 +272,6 @@ targetAudience?: TargetAudience | null;
   sponsors?: Sponsor[];
   organizations?: Organization[];
   bookings?: Booking[];
-  type?: keyof typeof ServiceTypes; // Add this line to include the service type
 }