@bash-app/bash-common 21.0.1 → 21.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "21.0.1",
+  "version": "21.1.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -25,9 +25,9 @@
     "qrcode": "^1.5.3"
   },
   "peerDependencies": {
-    "@prisma/client": "^5.16.2",
+    "@prisma/client": "^5.18.0",
     "dayjs": "^1.11.10",
-    "prisma": "^5.16.2",
+    "prisma": "^5.18.0",
     "react-tailwindcss-datepicker": "^1.6.6",
     "tsx": "^4.10.3"
   },

package/prisma/schema.prisma

@@ -14,7 +14,7 @@ datasource db {
 model Club {
   id      String       @id @default(cuid())
   name    String
-  address String
+  street  String
   userId  String
   price   Int?
   events  BashEvent[]
@@ -624,23 +624,23 @@ enum ServiceStatus {
 }
 
 model DocumentID {
-  id            String  @id @default(cuid())
-  givenName     String?
-  familyName    String?
-  middleName    String?
-  suffix        String?
-  streetAddress String?
-  city          String?
-  state         String?
-  stateName     String?
-  postalCode    String?
-  idNumber      String?
-  expires       String?
-  dob           String?
-  issueDate     String?
-  idType        String?
-  userId        String? @unique
-  user          User?   @relation(fields: [userId], references: [id], onDelete: Cascade)
+  id         String  @id @default(cuid())
+  givenName  String?
+  familyName String?
+  middleName String?
+  suffix     String?
+  street     String?
+  city       String?
+  state      String?
+  stateName  String?
+  zipCode    String?
+  idNumber   String?
+  expires    String?
+  dob        String?
+  issueDate  String?
+  idType     String?
+  userId     String? @unique
+  user       User?   @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
 model EventLink {
@@ -820,10 +820,10 @@ model User {
   magicLinkExpiration           DateTime?
   magicLinkUsed                 DateTime?
   idVerified                    DateTime?
-  streetAddress                 String?
+  street                        String?
   city                          String?
   state                         String?
-  postalCode                    String?
+  zipCode                       String?
   country                       String?               @default("US")
   phone                         String?
   documentIDId                  String?               @unique
@@ -842,7 +842,7 @@ model User {
   bashEventPromoCodesIUsed      BashEventPromoCode[]
   serviceCheckouts              ServiceCheckout[]
   bookingForMe                  Booking[]
-  bashSubscription              UserSubscription?
+  userSubscription              UserSubscription?
   serviceSubcriptions           ServiceSubscription[]
 }
 
@@ -881,11 +881,10 @@ model Business {
   owner                 User                   @relation(fields: [ownerId], references: [id], onDelete: Cascade)
   dateCreated           DateTime               @default(now())
   email                 String
-  location              String?
-  streetAddress         String
+  street                String
   city                  String
   state                 String
-  postalCode            String
+  zipCode               String
   country               String
   phone                 String
   name                  String                 @default("New Business")
@@ -938,10 +937,10 @@ model EventService {
   eventServiceTypes    EventServiceType[]
   eventServiceSubType  String?
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -980,10 +979,10 @@ model EntertainmentService {
   entertainmentServiceSubType String?
   genre                       MusicGenreType?
   email                       String
-  streetAddress               String
+  street                      String
   city                        String
   state                       String
-  postalCode                  String
+  zipCode                     String
   country                     String
   phone                       String
   coverPhoto                  String?
@@ -1018,10 +1017,10 @@ model Vendor {
   businessId           String?
   vendorName           String
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -1057,10 +1056,10 @@ model Exhibitor {
   businessId           String?
   exhibitorName        String
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -1095,10 +1094,10 @@ model Sponsor {
   businessId           String?
   sponsorName          String
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -1134,10 +1133,10 @@ model Venue {
   businessId           String
   venueName            String
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -1180,10 +1179,10 @@ model Organization {
   organizationName     String
   organizationType     OrganizationType[]
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?

package/src/definitions.ts

@@ -88,16 +88,21 @@ export type DateTimeArgType = Date | string | undefined | null;
 export type RequiredStripeInfoMissingErrorDataType = { [k in keyof User]?: { type: string, label: string } };
 export type ContactOrUser = Contact | PublicUser;
 
-export const ServiceTypes: (keyof BusinessExt)[] = [
-  'volunteerService',
-  'eventServices',
-  'organizations',
-  'venues',
-  'vendors',
-  'sponsors',
-  'exhibitors',
-  'entertainmentServices',
-] as const;
+export type UnionFromArray<T extends ReadonlyArray<any>> = T[number];
+export type ValueOf<T> = T[keyof T];
+
+export type ValueOfServiceType = ValueOf<typeof ServiceType>;
+
+export const ServiceType = {
+  'Volunteer': 'volunteerService',
+  'EventService': 'eventServices',
+  'Organization': 'organizations',
+  'Venue': 'venues',
+  'Vendor': 'vendors',
+  'Sponsor': 'sponsors',
+  'Exhibitor': 'exhibitors',
+  'EntertainmentService': 'entertainmentServices',
+} satisfies {[key: string]: keyof BusinessExt}
 
 export type FilterFields = {
   price: string[];
@@ -305,6 +310,20 @@ export const YearsOfExperienceToString: { [key in YearsOfExperience]: string } =
   [YearsOfExperience.FivePlusYears]: 'More than five years',
 };
 
+export type ServiceTypeToStringType = {
+  [key in ValueOf<typeof ServiceType>]: string;
+};
+export const ServiceTypeToString: ServiceTypeToStringType = {
+  [ServiceType.Volunteer]: "/servicesDefault.webp",
+  [ServiceType.EventService]: "/servicesDefault.webp",
+  [ServiceType.EntertainmentService]: "/servicesDefault.webp",
+  [ServiceType.Vendor]: "/servicesDefault.webp",
+  [ServiceType.Exhibitor]: "/servicesDefault.webp",
+  [ServiceType.Sponsor]: "/servicesDefault.webp",
+  [ServiceType.Venue]: "/servicesDefault.webp",
+  [ServiceType.Organization]: "/servicesDefault.webp"
+}
+
 export type BashEventTypeToStringType = {
   [key in BashEventType]: string;
 };
@@ -454,3 +473,14 @@ type AllKeysUnion<T> = T extends object
   : never;
 
 export type AllKeys<T> = AllKeysUnion<T>[];
+
+
+
+export interface IAddress {
+  place?: string;
+  street: string;
+  city: string;
+  state: string;
+  zipCode: string;
+  country: string;
+}

package/src/extendedSchemas.ts

@@ -8,7 +8,7 @@ import {
   User,
   TicketTier, Business, Review, Media, BashComment, Recurrence, Contact,
   BashNotification, BashEventPromoCode,
-  Reminder, ServiceRange,
+  Reminder,
   Checkout,
   ServiceLink,
   Link, Venue, Availability,
@@ -21,8 +21,9 @@ import {
   Sponsor,
   Organization,
   Booking,
-  VolunteerService,
+  VolunteerService, Prisma,
 } from "@prisma/client";
+import {UnionFromArray} from "./definitions";
 
 export const FRONT_END_USER_DATA_TO_SELECT = {
   id: true,
@@ -31,18 +32,17 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
   familyName: true,
   image: true,
   uploadedImage: true,
-  services: true,
-}
+} satisfies Prisma.UserSelect;
 
 export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
   ...FRONT_END_USER_DATA_TO_SELECT,
-  streetAddress: true,
+  street: true,
   city: true,
   state: true,
-  postalCode: true,
+  zipCode: true,
   country: true,
   phone: true,
-}
+} satisfies Prisma.UserSelect;
 
 export interface BashEventExt extends BashEvent {
   targetAudience?: TargetAudience;
@@ -59,7 +59,7 @@ export interface BashEventExt extends BashEvent {
 
 export const TICKET_TIER_DATA_TO_INCLUDE = {
   promoCodes: true,
-}
+} satisfies Prisma.TicketTierInclude;
 
 export const BASH_EVENT_DATA_TO_INCLUDE = {
   creator: {
@@ -73,7 +73,7 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
   },
   eventTasks: true,
   media: true,
-}
+} satisfies Prisma.BashEventInclude;
 
 export const BASH_EVENT_DATA_TO_CLONE = [
   'ticketTiers',
@@ -83,7 +83,6 @@ export const BASH_EVENT_DATA_TO_CLONE = [
 ] as const;
 
 type RemoveCommonProperties<T, U> = keyof (Omit<T, keyof U> & Omit<U, keyof T>);
-export type UnionFromArray<T extends ReadonlyArray<any>> = T[number];
 type BashEventExtMinusDataToCloneType = Omit<BashEventExt, UnionFromArray<typeof BASH_EVENT_DATA_TO_CLONE>>;
 
 export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEventExtMinusDataToCloneType>[] = [
@@ -185,6 +184,10 @@ export const VENDOR_DATA_TO_INCLUDE = {
   media: true,
 }
 
+export const SERVICE_LINK_DATA_TO_INCLUDE = {
+  link: true,
+}
+
 export interface VenueExt extends Venue {
   business: Business;
   availableDateTimes: Availability[];
@@ -198,7 +201,9 @@ export const VENUE_DATA_TO_INCLUDE = {
   business: true,
   availableDateTimes: true,
   targetAudience: true,
-  links: true,
+  links: {
+    include: SERVICE_LINK_DATA_TO_INCLUDE
+  },
   capacity: true,
   media: true,
 }
@@ -217,8 +222,8 @@ export interface OrganizationExt extends Organization {
 export interface BusinessExt extends Business {
   owner: PublicUser;
   media: Media[];
-  targetAudience: TargetAudience;
-  volunteerService?: VolunteerService;
+  targetAudience?: TargetAudience | null;
+  volunteerService?: VolunteerService | null;
   serviceLinks?: ServiceLinkExt[];
   venues?: Venue[];
   eventServices?: EventService[];
@@ -230,14 +235,6 @@ export interface BusinessExt extends Business {
   bookings?: Booking[];
 }
 
-export interface ServiceLinkExt extends ServiceLink {
-  link: Link;
-}
-
-export const SERVICE_LINK_DATA_TO_INCLUDE = {
-  link: true,
-}
-
 export const BUSINESS_DATA_TO_INCLUDE = {
   owner: {
     select: FRONT_END_USER_DATA_TO_SELECT
@@ -254,6 +251,10 @@ export const BUSINESS_DATA_TO_INCLUDE = {
   vendors: {
     include: VENDOR_DATA_TO_INCLUDE
   }
+} satisfies Prisma.BusinessInclude
+
+export interface ServiceLinkExt extends ServiceLink {
+  link: Link;
 }
 
 export interface InvitationExt extends Invitation {
@@ -338,7 +339,7 @@ export interface UserExtraData extends User {
 }
 
 export interface UserExt extends User {
-  services?: Business[] | null;
+  businesses?: Business[] | null;
 
   // Do not include in fetch as there could be thousands of these
   associatedBashes?: AssociatedBash[] | null;

package/src/utils/addressUtils.ts

@@ -1,18 +1,10 @@
+import {IAddress} from "../definitions";
 
 const ADDRESS_DELIM = '|';
 
 const googleMapsApiKey = process.env.REACT_APP_GOOGLE_MAP_API_KEY as string;
 
 
-export interface IAddress {
-  place: string;
-  street: string;
-  city: string;
-  state: string;
-  zipCode: string;
-  country: string;
-}
-
 export function addressHasEnoughDataForGeolocation(address: IAddress): boolean {
   return !!((address.place && address.city && address.state) || (address.street && address.city && address.state));
 }
@@ -60,6 +52,13 @@ export function databaseAddressStringToDisplayString(addressString: string | und
   return '';
 }
 
+export function addressToDisplayString(address: IAddress): string {
+  let addressArr = address.place ? [address.place] : [];
+  addressArr = [...addressArr, address.street, address.city, address.state];
+  const addressStr = addressArr.filter((str) => !!str).join(', ');
+  return `${addressStr} ${address.zipCode}`;
+}
+
 
 export async function getAddressFromCoordinates( lat: number, lng: number ): Promise<IAddress> {
   const apiUrl = `https://maps.googleapis.com/maps/api/geocode/json?latlng=${lat},${lng}&key=${googleMapsApiKey}&loading=async`;