@bash-app/bash-common 30.310.0 → 30.314.0

package/src/extendedSchemas.ts

@@ -268,14 +268,18 @@ export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
   },
 } satisfies Prisma.UserSelect;
 
-export interface SponsoredEventExt extends SponsoredEvent {}
+export type SponsoredEventExt = SponsoredEvent;
 
 /** Minimal service identity used wherever a competition prize/offer just needs to point at a listing. */
-export interface ServiceRefLite {
-  id: string;
-  serviceName: string | null;
-  coverPhoto: string | null;
-}
+export const SERVICE_REF_LITE_SELECT = {
+  id: true,
+  serviceName: true,
+  coverPhoto: true,
+} satisfies Prisma.ServiceSelect;
+
+export type ServiceRefLite = Prisma.ServiceGetPayload<{
+  select: typeof SERVICE_REF_LITE_SELECT;
+}>;
 
 export interface PrizeExt extends Prize {
   winner?: PublicUser | null;
@@ -283,6 +287,18 @@ export interface PrizeExt extends Prize {
   sourceService?: ServiceRefLite | null;
 }
 
+/** Minimal prize-slot identity used wherever a sponsor offer just needs to point at the slot it's filling. */
+export const PRIZE_SLOT_REF_SELECT = {
+  id: true,
+  name: true,
+  placeName: true,
+  sponsorCostCents: true,
+} satisfies Prisma.PrizeSelect;
+
+export type PrizeSlotRef = Prisma.PrizeGetPayload<{
+  select: typeof PRIZE_SLOT_REF_SELECT;
+}>;
+
 export interface CompetitionPrizeOfferExt {
   id: string;
   competitionId: string;
@@ -300,17 +316,12 @@ export interface CompetitionPrizeOfferExt {
   respondedAt?: Date | string | null;
   offeredBy?: PublicUser;
   sourceService?: ServiceRefLite | null;
-  targetPrize?: {
-    id: string;
-    name: string;
-    placeName: string | null;
-    sponsorCostCents: number | null;
-  } | null;
+  targetPrize?: PrizeSlotRef | null;
 }
 
 /** One competition participant row + resolved user; shared by CompetitionExt.participants and the host roster endpoint. */
 export interface CompetitionParticipantExt extends CompetitionParticipant {
-  user?: Pick<PublicUser, "uploadedImage" | "image"> | null;
+  user?: PublicUser | null;
 }
 
 /** Competition row + relations; Override keeps new columns visible before consumers refresh Prisma. */
@@ -516,24 +527,27 @@ export type BashEventUpsertWireInput = Override<
   }
 >;
 
+/** Minimal ticket-holder identity — narrower than PublicUser/PublicTeaserUser; used wherever a ticket
+ * relation just needs to identify who owns/holds it (not a full public profile). */
+export const TICKET_HOLDER_USER_SELECT = {
+  id: true,
+  email: true,
+  givenName: true,
+  familyName: true,
+} satisfies Prisma.UserSelect;
+
+export type TicketHolderUser = Prisma.UserGetPayload<{
+  select: typeof TICKET_HOLDER_USER_SELECT;
+}>;
+
 export const TICKET_TIER_DATA_TO_INCLUDE = {
   tickets: {
     include: {
       owner: {
-        select: {
-          id: true,
-          email: true,
-          givenName: true,
-          familyName: true,
-        },
+        select: TICKET_HOLDER_USER_SELECT,
       },
       forUser: {
-        select: {
-          id: true,
-          email: true,
-          givenName: true,
-          familyName: true,
-        },
+        select: TICKET_HOLDER_USER_SELECT,
       },
     },
   },
@@ -583,7 +597,7 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
             select: FRONT_END_USER_DATA_TO_SELECT,
           },
           sourceService: {
-            select: { id: true, serviceName: true, coverPhoto: true },
+            select: SERVICE_REF_LITE_SELECT,
           },
         },
       },
@@ -673,9 +687,15 @@ export const VENUE_DATA_TO_REMOVE: RemoveCommonProperties<
   // 'bashEvents',
 ] as const;
 
-export const VENDOR_DATA_TO_INCLUDE = {
+/** Shared by Vendor/EventService/EntertainmentService/Exhibitor/Sponsor includes — each model has
+ * its own identically-shaped `crowdSize`/`serviceRange` relations (attendance preferences). */
+export const SERVICE_SUBTYPE_CROWD_RANGE_INCLUDE = {
   crowdSize: true,
   serviceRange: true,
+} as const;
+
+export const VENDOR_DATA_TO_INCLUDE = {
+  ...SERVICE_SUBTYPE_CROWD_RANGE_INCLUDE,
 } satisfies Prisma.VendorInclude;
 
 export const VOLUNTEER_DATA_TO_INCLUDE = {
@@ -707,24 +727,20 @@ export type VolunteerServiceExt = Prisma.VolunteerServiceGetPayload<{
 export const VENUE_DATA_TO_INCLUDE = {} satisfies Prisma.VenueInclude;
 
 export const EVENT_SERVICE_DATA_TO_INCLUDE = {
-  crowdSize: true,
-  serviceRange: true,
+  ...SERVICE_SUBTYPE_CROWD_RANGE_INCLUDE,
   formatOptions: true,
 } satisfies Prisma.EventServiceInclude;
 
 export const ENTERTAINMENT_SERVICE_DATA_TO_INCLUDE = {
-  crowdSize: true,
-  serviceRange: true,
+  ...SERVICE_SUBTYPE_CROWD_RANGE_INCLUDE,
 } satisfies Prisma.EntertainmentServiceInclude;
 
 export const SPONSOR_DATA_TO_INCLUDE = {
-  crowdSize: true,
-  serviceRange: true,
+  ...SERVICE_SUBTYPE_CROWD_RANGE_INCLUDE,
 } satisfies Prisma.SponsorInclude;
 
 export const EXHIBITOR_DATA_TO_INCLUDE = {
-  crowdSize: true,
-  serviceRange: true,
+  ...SERVICE_SUBTYPE_CROWD_RANGE_INCLUDE,
 } satisfies Prisma.ExhibitorInclude;
 
 // Lightweight include for public service listings (browse pages).
@@ -928,10 +944,9 @@ export interface ServiceBookingAddOnExt extends ServiceBookingAddOn {
 export interface ServiceBookingPackageExt extends ServiceBookingPackage {
   package: ServicePackageExt;
 }
-export interface ServiceBookingPriceBreakdownExt
-  extends ServiceBookingPriceBreakdown {}
+export type ServiceBookingPriceBreakdownExt = ServiceBookingPriceBreakdown;
 
-export interface ServiceBookingFeeExt extends ServiceBookingFee {}
+export type ServiceBookingFeeExt = ServiceBookingFee;
 export interface ServiceBookingDayExt extends ServiceBookingDay {
   addOns: ServiceBookingAddOnExt[];
   packages: ServiceBookingPackageExt[];
@@ -1169,32 +1184,28 @@ export type ServiceExtNoIds = Omit<
   | "serviceRatesAssociationId"
   | "serviceId"
 >;
-export interface EventServiceExt extends EventService {
+/** Attendance-preference overlay shared by every bookable service subtype — mirrors
+ * SERVICE_SUBTYPE_CROWD_RANGE_INCLUDE so the type and the select/include it's derived from stay in sync. */
+export interface ServiceSubtypeCrowdRange {
   crowdSize?: AmountOfGuests;
   serviceRange?: ServiceRange;
+}
+
+export interface EventServiceExt extends EventService, ServiceSubtypeCrowdRange {
   formatOptions?: ServiceFormatOption[];
 }
 
 export interface EntertainmentServiceExt
-  extends Omit<EntertainmentService, "notableVenueEntries"> {
-  crowdSize?: AmountOfGuests;
-  serviceRange?: ServiceRange;
+  extends Omit<EntertainmentService, "notableVenueEntries">,
+    ServiceSubtypeCrowdRange {
   notableVenueEntries?: EntertainmentNotableVenueEntry[];
 }
 
-export interface ExhibitorExt extends Exhibitor {
-  crowdSize?: AmountOfGuests;
-  serviceRange?: ServiceRange;
-}
+export interface ExhibitorExt extends Exhibitor, ServiceSubtypeCrowdRange {}
 
-export interface SponsorExt extends Sponsor {
-  crowdSize?: AmountOfGuests;
-  serviceRange?: ServiceRange;
-}
+export interface SponsorExt extends Sponsor, ServiceSubtypeCrowdRange {}
 
-export interface VendorExt extends Vendor {
-  crowdSize?: AmountOfGuests;
-  serviceRange?: ServiceRange;
+export interface VendorExt extends Vendor, ServiceSubtypeCrowdRange {
   spaceRequirements?: VendorSpaceRequirements;
   insurance?: VendorInsurance;
   permits?: VendorPermit[];
@@ -1203,6 +1214,108 @@ export interface VendorExt extends Vendor {
   };
 }
 
+//-------------------------------------------------------------------------------------------------------------------------------
+// Partner (Vendor/Exhibitor/Sponsor) booking requests
+//
+// VendorBookingRequest/ExhibitorBookingRequest/SponsorBookingRequest are three separate Prisma
+// models (a real merge into one polymorphic table is a future schema migration — see the
+// bash-common schema/type consolidation plan). Until then, these GetPayload-derived types give
+// the API and app a single shared, real contract instead of hand-typed hand-drift per package.
+//-------------------------------------------------------------------------------------------------------------------------------
+
+/** Minimal contact identity embedded on a partner booking request (hostUser, or the service owner). */
+export const PARTNER_BOOKING_CONTACT_SELECT = {
+  id: true,
+  email: true,
+  givenName: true,
+  familyName: true,
+} satisfies Prisma.UserSelect;
+
+export type PartnerBookingContact = Prisma.UserGetPayload<{
+  select: typeof PARTNER_BOOKING_CONTACT_SELECT;
+}>;
+
+/** Minimal event ref embedded on a partner booking request. */
+export const PARTNER_BOOKING_BASH_EVENT_SELECT = {
+  id: true,
+  title: true,
+  startDateTime: true,
+  endDateTime: true,
+} satisfies Prisma.BashEventSelect;
+
+export type PartnerBookingBashEventRef = Prisma.BashEventGetPayload<{
+  select: typeof PARTNER_BOOKING_BASH_EVENT_SELECT;
+}>;
+
+export const VENDOR_BOOKING_REQUEST_INCLUDE = {
+  hostUser: { select: PARTNER_BOOKING_CONTACT_SELECT },
+  vendorService: { include: { owner: { select: PARTNER_BOOKING_CONTACT_SELECT } } },
+  bashEvent: { select: PARTNER_BOOKING_BASH_EVENT_SELECT },
+} satisfies Prisma.VendorBookingRequestInclude;
+
+export type VendorBookingRequestExt = Prisma.VendorBookingRequestGetPayload<{
+  include: typeof VENDOR_BOOKING_REQUEST_INCLUDE;
+}>;
+
+export const EXHIBITOR_BOOKING_REQUEST_INCLUDE = {
+  hostUser: { select: PARTNER_BOOKING_CONTACT_SELECT },
+  exhibitorService: { include: { owner: { select: PARTNER_BOOKING_CONTACT_SELECT } } },
+  bashEvent: { select: PARTNER_BOOKING_BASH_EVENT_SELECT },
+} satisfies Prisma.ExhibitorBookingRequestInclude;
+
+export type ExhibitorBookingRequestExt = Prisma.ExhibitorBookingRequestGetPayload<{
+  include: typeof EXHIBITOR_BOOKING_REQUEST_INCLUDE;
+}>;
+
+export const SPONSOR_BOOKING_REQUEST_INCLUDE = {
+  hostUser: { select: PARTNER_BOOKING_CONTACT_SELECT },
+  sponsorService: { include: { owner: { select: PARTNER_BOOKING_CONTACT_SELECT } } },
+  bashEvent: { select: PARTNER_BOOKING_BASH_EVENT_SELECT },
+} satisfies Prisma.SponsorBookingRequestInclude;
+
+export type SponsorBookingRequestExt = Prisma.SponsorBookingRequestGetPayload<{
+  include: typeof SPONSOR_BOOKING_REQUEST_INCLUDE;
+}>;
+
+/** Fields common to all three partner booking request models (same name + type on every model).
+ * `status` is intentionally excluded — Vendor/Exhibitor/SponsorBookingStatus are separate (if
+ * byte-identical) enums, so each Ext type keeps its own nominal status field. */
+export type PartnerBookingRequestBase = Pick<
+  VendorBookingRequestExt,
+  | "id"
+  | "createdAt"
+  | "updatedAt"
+  | "hostUserId"
+  | "bashEventId"
+  | "expectedGuests"
+  | "eventDuration"
+  | "eventDescription"
+  | "specialRequests"
+  | "contactPreference"
+  | "urgency"
+  | "paymentTiming"
+  | "depositPercentage"
+  | "competitorRestrictions"
+  | "cancellationPolicy"
+  | "pricingModelAllowList"
+  | "paymentAmount"
+  | "paymentStatus"
+  | "stripePaymentIntentId"
+  | "paidAt"
+  | "respondedAt"
+  | "feeStructure"
+  | "percentageRate"
+  | "hostUser"
+  | "bashEvent"
+>;
+
+/** Discriminated union of the three partner booking request types — `partnerType` is attached
+ * by the API (it isn't a DB column) so callers can narrow without checking which service-ref key is present. */
+export type PartnerBookingRequest =
+  | ({ partnerType: "vendor" } & VendorBookingRequestExt)
+  | ({ partnerType: "exhibitor" } & ExhibitorBookingRequestExt)
+  | ({ partnerType: "sponsor" } & SponsorBookingRequestExt);
+
 // Future type for venue unavailable dates (not yet implemented in database)
 // To implement: Add VenueUnavailableDate model to Prisma schema
 export interface UnavailableDate {
@@ -1595,12 +1708,40 @@ export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
   },
 } satisfies Prisma.UserSelect;
 
+/** Plain `reviews` shape queried by `FRONT_END_USER_DATA_TO_SELECT` alone (no nested `comments`). */
+type PublicUserPlainReview = Prisma.UserGetPayload<{
+  select: typeof FRONT_END_USER_DATA_TO_SELECT;
+}>["reviews"][number];
+
+/** `reviews` shape when a query additionally merges in `USER_DATA_SELECT_REVIEWS_COMMENTS` on top of
+ * `FRONT_END_USER_DATA_TO_SELECT` (nested `comments` included). */
+export type PublicUserReviewWithComments = Prisma.UserGetPayload<{
+  select: typeof USER_DATA_SELECT_REVIEWS_COMMENTS;
+}>["reviews"][number];
+
+type PublicUserBase = Prisma.UserGetPayload<{
+  select: typeof FRONT_END_USER_DATA_TO_SELECT;
+}>;
+
+/** Real `User` select shape for public profile surfaces — derived via `GetPayload` (like `PublicTeaserUser`)
+ * so relation/computed fields (e.g. `reviews`, `contacts`) can't silently drift from what
+ * `FRONT_END_USER_DATA_TO_SELECT` actually queries. The four relation fields below stay optional (not
+ * required-but-nullable, as a strict `GetPayload` would make them) because some call sites — e.g. auth/session
+ * flows — legitimately pass a scalar-only `User` row through this type without ever including them.
+ * `reviews` is additionally re-widened to a union since some call sites merge in
+ * `USER_DATA_SELECT_REVIEWS_COMMENTS` for nested review comments. */
 export type PublicUser = Omit<
-  Pick<UserExt, keyof typeof FRONT_END_USER_DATA_TO_SELECT>,
-  "userSubscription"
-> & {
-  userSubscription?: PublicUserSubscription | null;
-} & Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;
+  PublicUserBase,
+  "reviews" | "contacts" | "socialMediaProfiles" | "userSubscription"
+> &
+  Partial<Pick<PublicUserBase, "contacts" | "socialMediaProfiles" | "userSubscription">> & {
+    reviews?: (PublicUserPlainReview | PublicUserReviewWithComments)[] | null;
+  };
+
+/** Self-account (`/me`) select shape — derived via `GetPayload` the same way `PublicUser` is. */
+export type PrivateUser = Prisma.UserGetPayload<{
+  select: typeof PRIVATE_USER_ACCOUNT_TO_SELECT;
+}>;
 
 export type PublicStripeAccount = Pick<
   StripeAccountExt,

package/src/index.ts

@@ -35,6 +35,8 @@ export * from "./userReportTypes.js";
 export * from "./mirroredPrismaEnums.js";
 export * from "./utils/featuredDiscoveryGeo.js";
 export * from "./utils/organizationEntitlements.js";
+export * from "./serviceTypeLabels.js";
+export * from "./targetAudienceLabels.js";
 
 // Re-export ALL Prisma enums as values (usable as runtime constants, e.g. ServiceTypes.Entertainment)
 // Excludes enums already re-exported by definitions.ts, mirroredPrismaEnums.ts, and membershipDefinitions.ts:

package/src/mirroredPrismaEnums.ts

@@ -86,6 +86,22 @@ export const ServiceBookingSettlementStatus = {
 
 export type ServiceBookingSettlementStatus = ServiceBookingSettlementStatusEnum;
 
+/**
+ * Display label for `ServiceBookingSettlementStatus` — consolidated from the hand-typed
+ * `STATUS_UI.label` copy in `EventPromoterBookingCard.tsx`. Icon/color styling stays local to
+ * that component (UI-specific, not a bash-common concern); only the text is shared here.
+ */
+export const ServiceBookingSettlementStatusLabel: Record<
+  ServiceBookingSettlementStatus,
+  string
+> = {
+  Pending: "Awaiting settle",
+  Settled: "Settled",
+  SettlementPaymentFailed: "Payment failed",
+  SettlementHeld: "Held for review",
+  SettlementDisputed: "Disputed",
+};
+
 /**
  * Mirrors Prisma `PricingModel`. Includes the Phase 1 additions
  * `PER_PAID_ATTENDEE` and `PER_BASHPOINTS_ATTENDEE` introduced by the

package/src/serviceTypeLabels.ts

@@ -0,0 +1,24 @@
+import { ServiceTypes } from "@prisma/client";
+
+/**
+ * Human-readable label for every `ServiceTypes` value — the raw enum ("EventServices",
+ * "EntertainmentServices") is not fit for display copy.
+ *
+ * Single source of truth for what was previously four drifted, hand-typed copies:
+ * `homeServicesSort.ts`, `CategoryRequestsPage.tsx`, `serviceCategorySuggestionApi.ts`,
+ * and the `TAB_CONFIG` labels in `HowServices.tsx`.
+ *
+ * Note: this is distinct from `SERVICE_TYPE_DISPLAY_LABEL` in `definitions.ts`, which only
+ * covers the two values `COMPLEMENTARY_SERVICE_TYPE` can produce (Vendors/EventServices) for
+ * "also list as" copy — that narrower map stays as-is.
+ */
+export const SERVICE_TYPE_LABELS: Record<ServiceTypes, string> = {
+  [ServiceTypes.EntertainmentServices]: "Entertainment",
+  [ServiceTypes.EventServices]: "Event Services",
+  [ServiceTypes.Vendors]: "Vendors",
+  [ServiceTypes.Exhibitors]: "Exhibitors",
+  [ServiceTypes.Sponsors]: "Sponsors",
+  [ServiceTypes.Venues]: "Venues",
+  [ServiceTypes.Organizations]: "Organizations",
+  [ServiceTypes.Volunteers]: "Volunteers",
+};

package/src/targetAudienceLabels.ts

@@ -0,0 +1,54 @@
+import { AgeRange, Education, Gender, Occupation } from "@prisma/client";
+
+/**
+ * Display labels for `BashEvent`/`Service` target-audience demographics — consolidated from
+ * byte-identical copies that lived in `WhoTargetAudience.tsx` (bash event wizard) and
+ * `ServicesTargetAudience.tsx` (service wizard). Follows the `IncomeRangeLabel` precedent in
+ * `definitions.ts`.
+ */
+export const AgeRangeLabel: Record<AgeRange, string> = {
+  NoPreference: "Anyone",
+  Sixteen_17: "16-17",
+  EighteenPlus: "18+",
+  Eighteen_20: "18-20",
+  TwentyOnePlus: "21+",
+  TwentyOne_25: "21-25",
+  TwentySix_34: "26-34",
+  ThirtyFive_49: "35-49",
+  Fifty_64: "50-64",
+  SixtyFivePlus: "65+",
+};
+
+export const GenderLabel: Record<Gender, string> = {
+  NoPreference: "Anyone",
+  Male: "Male",
+  Female: "Female",
+  Other: "Other",
+};
+
+export const OccupationLabel: Record<Occupation, string> = {
+  NoPreference: "Anyone",
+  Students: "Students",
+  Entrepreneurs: "Entrepreneurs",
+  SmallBusinesses: "Small Businesses",
+  Corporations: "Corporations",
+  Professionals: "Professionals",
+  Creatives: "Creatives",
+  AngelInvestors: "Angel Investors",
+  FamilyOffices: "Family Offices",
+  Retirees: "Retirees",
+  Academics: "Academics",
+  Government: "Government",
+  NonProfits: "Non-Profits",
+};
+
+export const EducationLabel: Record<Education, string> = {
+  NoPreference: "Anyone",
+  HighSchool: "High School",
+  SomeCollege: "Some College",
+  InCollege: "In College",
+  GraduateStudent: "Graduate Students",
+  Bachelors: "Bachelor's Degree",
+  Masters: "Master's Degree",
+  Doctorate: "Doctorate",
+};

package/src/utils/service/serviceBookingTypes.ts

@@ -53,7 +53,7 @@ export type ServiceBookingRequiredData = MakeNullablePropsOptional<
   MakeOptional<
     ServiceBookingExt,
     | "id"
-    | "isVendorBid"
+    | "isProviderInitiatedOffer"
     | "bashEventId"
     | "vendorEventDetails"
     | "serviceId"