@bash-app/bash-common 21.0.0 → 21.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "21.0.0",
+  "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[]
@@ -327,7 +327,7 @@ enum UserSubscriptionType {
   VIP
 }
 
-model SubServiceSubscription {
+model ServiceSubscription {
   id                   String  @id @default(cuid())
   ownerId              String
   owner                User    @relation(fields: [ownerId], references: [id], onDelete: Cascade)
@@ -343,8 +343,8 @@ enum BookingStatus {
 
 model Booking {
   id                         String         @id @default(cuid())
-  serviceId                  String
-  service                    Business       @relation(fields: [serviceId], references: [id])
+  businessId                 String
+  business                   Business       @relation(fields: [businessId], references: [id])
   validDate                  DateTime?
   forUserId                  String?
   forUser                    User?          @relation(fields: [forUserId], references: [id])
@@ -359,7 +359,7 @@ model Booking {
   checkoutId                 String?
   checkout                   Checkout?      @relation(fields: [checkoutId], references: [id])
 
-  @@index([serviceId])
+  @@index([businessId])
   @@index([forUserId])
   @@index([checkoutId])
 }
@@ -573,7 +573,7 @@ model TargetAudience {
   showOnDetailPage Boolean    @default(true)
 
   bashEvent            BashEvent?
-  service              Business?
+  business             Business?
   venue                Venue?
   vendor               Vendor?
   eventService         EventService?
@@ -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 {
@@ -782,11 +782,11 @@ enum SponsorType {
 }
 
 model User {
-  id                            String                   @id @default(cuid())
-  email                         String                   @unique
-  createdOn                     DateTime                 @default(now())
-  stripeCustomerId              String?                  @unique
-  stripeAccountId               String?                  @unique
+  id                            String                @id @default(cuid())
+  email                         String                @unique
+  createdOn                     DateTime              @default(now())
+  stripeCustomerId              String?               @unique
+  stripeAccountId               String?               @unique
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
@@ -797,11 +797,11 @@ model User {
   dob                           DateTime?
   gender                        Gender?
   sex                           Sex?
-  roles                         UserRole[]               @default([User])
-  services                      Business[]
-  createdEvents                 BashEvent[]              @relation("CreatedEvent")
-  ticketsISent                  Ticket[]                 @relation("TicketsISent")
-  ticketsIOwn                   Ticket[]                 @relation("TicketsIOwn")
+  roles                         UserRole[]            @default([User])
+  businesses                    Business[]
+  createdEvents                 BashEvent[]           @relation("CreatedEvent")
+  ticketsISent                  Ticket[]              @relation("TicketsISent")
+  ticketsIOwn                   Ticket[]              @relation("TicketsIOwn")
   reviews                       Review[]
   sponsorships                  SponsoredEvent[]
   investments                   Investment[]
@@ -820,30 +820,30 @@ model User {
   magicLinkExpiration           DateTime?
   magicLinkUsed                 DateTime?
   idVerified                    DateTime?
-  streetAddress                 String?
+  street                        String?
   city                          String?
   state                         String?
-  postalCode                    String?
-  country                       String?                  @default("US")
+  zipCode                       String?
+  country                       String?               @default("US")
   phone                         String?
-  documentIDId                  String?                  @unique
+  documentIDId                  String?               @unique
   documentID                    DocumentID?
   comment                       BashComment[]
   associatedBashes              AssociatedBash[]
-  invitationsCreatedByMe        Invitation[]             @relation("InvitationsCreatedByMe")
-  invitationsSentToMe           Invitation[]             @relation("InvitationsSentToMe")
-  notificationsCreatedByMe      BashNotification[]       @relation("NotificationsCreatedByMe")
-  remindersCreatedByMe          Reminder[]               @relation("RemindersCreatedByMe")
-  remindersAssignedToMe         Reminder[]               @relation("RemindersAssignedToMe")
-  eventTasksAssignedToMe        EventTask[]              @relation("TasksAssignedToMe")
+  invitationsCreatedByMe        Invitation[]          @relation("InvitationsCreatedByMe")
+  invitationsSentToMe           Invitation[]          @relation("InvitationsSentToMe")
+  notificationsCreatedByMe      BashNotification[]    @relation("NotificationsCreatedByMe")
+  remindersCreatedByMe          Reminder[]            @relation("RemindersCreatedByMe")
+  remindersAssignedToMe         Reminder[]            @relation("RemindersAssignedToMe")
+  eventTasksAssignedToMe        EventTask[]           @relation("TasksAssignedToMe")
   checkouts                     Checkout[]
   ticketTiersWaitListsIveJoined TicketTier[]
   contacts                      Contact[]
   bashEventPromoCodesIUsed      BashEventPromoCode[]
-  ServiceCheckout               ServiceCheckout[]
+  serviceCheckouts              ServiceCheckout[]
   bookingForMe                  Booking[]
-  bashSubscription              UserSubscription?
-  subServiceSubcriptions        SubServiceSubscription[]
+  userSubscription              UserSubscription?
+  serviceSubcriptions           ServiceSubscription[]
 }
 
 model Contact {
@@ -881,18 +881,16 @@ 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 Service")
+  name                  String                 @default("New Business")
   coverPhoto            String?
   agreedToAgreement     Boolean?
   media                 Media[]
-  serviceTypes          ServiceType[]
   customServiceTag      String[]
   yearsOfExperince      YearsOfExperience      @default(LessThanOneYear)
   serviceLinks          ServiceLink[]
@@ -903,10 +901,9 @@ model Business {
   // bashesInterestedIn    BashEventType[]
   status                ServiceStatus          @default(Draft)
   venues                Venue[]
-  serviceRangeId        String                 @unique
-  serviceRange          ServiceRange           @relation("ServiceRange", fields: [serviceRangeId], references: [id], onDelete: Cascade)
-  targetAudience        TargetAudience?        @relation(fields: [targetAudienceId], references: [id])
   targetAudienceId      String?                @unique
+  targetAudience        TargetAudience?        @relation(fields: [targetAudienceId], references: [id])
+  volunteerService      VolunteerService?
   eventServices         EventService[]
   entertainmentServices EntertainmentService[]
   vendors               Vendor[]
@@ -926,18 +923,24 @@ model Business {
   @@index([phone])
 }
 
+model VolunteerService {
+  id         String   @id @default(cuid())
+  businessId String   @unique
+  business   Business @relation(fields: [businessId], references: [id])
+}
+
 model EventService {
   id                   String               @id @default(cuid())
-  service              Business?            @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   eventServiceName     String
   eventServiceTypes    EventServiceType[]
   eventServiceSubType  String?
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -969,17 +972,17 @@ model EventService {
 
 model EntertainmentService {
   id                          String                     @id @default(cuid())
-  service                     Business?                  @relation(fields: [serviceId], references: [id])
-  serviceId                   String?
+  business                    Business?                  @relation(fields: [businessId], references: [id])
+  businessId                  String?
   entertainmentServiceName    String
   entertainmentServiceTypes   EntertainmentServiceType[]
   entertainmentServiceSubType String?
   genre                       MusicGenreType?
   email                       String
-  streetAddress               String
+  street                      String
   city                        String
   state                       String
-  postalCode                  String
+  zipCode                     String
   country                     String
   phone                       String
   coverPhoto                  String?
@@ -1010,14 +1013,14 @@ model EntertainmentService {
 
 model Vendor {
   id                   String               @id @default(cuid())
-  service              Business?            @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   vendorName           String
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -1049,14 +1052,14 @@ model Vendor {
 
 model Exhibitor {
   id                   String               @id @default(cuid())
-  service              Business?            @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   exhibitorName        String
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -1087,14 +1090,14 @@ model Exhibitor {
 
 model Sponsor {
   id                   String               @id @default(cuid())
-  service              Business?            @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   sponsorName          String
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -1126,14 +1129,14 @@ model Sponsor {
 
 model Venue {
   id                   String               @id @default(cuid())
-  service              Business             @relation(fields: [serviceId], references: [id])
-  serviceId            String
+  business             Business             @relation(fields: [businessId], references: [id])
+  businessId           String
   venueName            String
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -1142,6 +1145,8 @@ model Venue {
   status               ServiceStatus        @default(Draft)
   yearsInBusiness      YearsOfExperience
   description          String?
+  serviceRangeId       String               @unique
+  serviceRange         ServiceRange         @relation(fields: [serviceRangeId], references: [id], onDelete: Cascade)
   capacityId           String?              @unique
   capacity             AmountOfGuests?      @relation(fields: [capacityId], references: [id], onDelete: Cascade)
   amenities            String[]
@@ -1169,15 +1174,15 @@ model Venue {
 
 model Organization {
   id                   String               @id @default(cuid())
-  service              Business?            @relation(fields: [serviceId], references: [id])
-  serviceId            String?
+  business             Business?            @relation(fields: [businessId], references: [id])
+  businessId           String?
   organizationName     String
   organizationType     OrganizationType[]
   email                String
-  streetAddress        String
+  street               String
   city                 String
   state                String
-  postalCode           String
+  zipCode              String
   country              String
   phone                String
   coverPhoto           String?
@@ -1274,10 +1279,11 @@ enum YearsOfExperience {
 }
 
 model ServiceRange {
-  id                  String    @id @default(cuid())
-  min                 Int       @default(0)
-  max                 Int       @default(50)
-  serviceServiceRange Business? @relation("ServiceRange")
+  id  String @id @default(cuid())
+  min Int    @default(0)
+  max Int    @default(50)
+
+  venue Venue?
 }
 
 model Availability {
@@ -1316,17 +1322,6 @@ enum MusicGenreType {
   Acoustic
 }
 
-enum ServiceType {
-  Volunteer
-  EventService
-  EntertainmentService
-  Vendor
-  Exhibitor
-  Sponsor
-  Venue
-  Organization
-}
-
 enum UserRole {
   User
   Vendor
@@ -1381,8 +1376,8 @@ model VerificationToken {
 
 model ServiceLink {
   id                     String                @id @default(cuid())
-  serviceId              String
-  service                Business              @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  businessId             String
+  business               Business              @relation(fields: [businessId], references: [id], onDelete: Cascade)
   linkId                 String
   link                   Link                  @relation(fields: [linkId], references: [id], onDelete: Cascade)
   eventService           EventService?         @relation(fields: [eventServiceId], references: [id])
@@ -1400,5 +1395,5 @@ model ServiceLink {
   organization           Organization?         @relation(fields: [organizationId], references: [id])
   organizationId         String?
 
-  @@index([serviceId])
+  @@index([businessId])
 }

package/src/definitions.ts

@@ -4,13 +4,12 @@ import {
   BashEventVibeTags,
   Contact,
   DayOfWeek,
-  ServiceType,
   Ticket,
   TicketTier,
   User,
   YearsOfExperience
 } from "@prisma/client";
-import { CheckoutExt, PublicUser } from "./extendedSchemas";
+import {BusinessExt, 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},}$`);
@@ -89,6 +88,22 @@ export type DateTimeArgType = Date | string | undefined | null;
 export type RequiredStripeInfoMissingErrorDataType = { [k in keyof User]?: { type: string, label: string } };
 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 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[];
   ageRequirement: string[];
@@ -295,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;
 };
@@ -411,20 +440,6 @@ export const BashEventTypeToString: BashEventTypeToStringType = {
   [BashEventType.Other]: "Other",
 }
 
-export type ServiceTypeToStringType = {
-  [key in 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 RecordKey = string | number | symbol;
 export type PartialExcept<T, K extends keyof T> = Partial<T> & {[P in K]: T[P]};
 type GetTypeOfArray<T> = T extends (infer U)[] ? U : never;
@@ -458,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,
-  ServiceType,
+  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>[] = [
@@ -176,6 +175,19 @@ export interface VendorExt extends Vendor {
   media?: Media[];
 }
 
+export const VENDOR_DATA_TO_INCLUDE = {
+  business: true,
+  availableDateTimes: true,
+  targetAudience: true,
+  links: true,
+  crowdSize: true,
+  media: true,
+}
+
+export const SERVICE_LINK_DATA_TO_INCLUDE = {
+  link: true,
+}
+
 export interface VenueExt extends Venue {
   business: Business;
   availableDateTimes: Availability[];
@@ -185,6 +197,17 @@ export interface VenueExt extends Venue {
   media?: Media[];
 }
 
+export const VENUE_DATA_TO_INCLUDE = {
+  business: true,
+  availableDateTimes: true,
+  targetAudience: true,
+  links: {
+    include: SERVICE_LINK_DATA_TO_INCLUDE
+  },
+  capacity: true,
+  media: true,
+}
+
 export interface OrganizationExt extends Organization {
   business: Business;
   availableDateTimes: Availability[];
@@ -195,28 +218,12 @@ export interface OrganizationExt extends Organization {
   status: ServiceStatus;
 }
 
-export const VENUE_DATA_TO_INCLUDE = {
-  service: true,
-  availableDateTimes: true,
-  targetAudience: true,
-  links: true,
-  capacity: true,
-  media: true,
-}
-export const VENDOR_DATA_TO_INCLUDE = {
-  service: true,
-  availableDateTimes: true,
-  targetAudience: true,
-  links: true,
-  crowdSize: true,
-  media: true,
-}
 
-export interface ServiceExt extends Business {
+export interface BusinessExt extends Business {
   owner: PublicUser;
   media: Media[];
-  serviceRange: ServiceRange;
-  targetAudience: TargetAudience;
+  targetAudience?: TargetAudience | null;
+  volunteerService?: VolunteerService | null;
   serviceLinks?: ServiceLinkExt[];
   venues?: Venue[];
   eventServices?: EventService[];
@@ -226,23 +233,14 @@ export interface ServiceExt extends Business {
   sponsors?: Sponsor[];
   organizations?: Organization[];
   bookings?: Booking[];
-  serviceTypes: ServiceType[];
 }
 
-export interface ServiceLinkExt extends ServiceLink {
-  link: Link;
-}
-
-export const SERVICE_LINK_DATA_TO_INCLUDE = {
-  link: true,
-}
-
-export const SERVICE_DATA_TO_INCLUDE = {
+export const BUSINESS_DATA_TO_INCLUDE = {
   owner: {
     select: FRONT_END_USER_DATA_TO_SELECT
   },
   media: true,
-  serviceRange: true,
+  volunteerService: true,
   targetAudience: true,
   serviceLinks: {
     include: SERVICE_LINK_DATA_TO_INCLUDE
@@ -253,6 +251,10 @@ export const SERVICE_DATA_TO_INCLUDE = {
   vendors: {
     include: VENDOR_DATA_TO_INCLUDE
   }
+} satisfies Prisma.BusinessInclude
+
+export interface ServiceLinkExt extends ServiceLink {
+  link: Link;
 }
 
 export interface InvitationExt extends Invitation {
@@ -337,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`;