@bash-app/bash-common 30.173.0 → 30.176.0

package/src/extendedSchemas.ts

@@ -22,6 +22,7 @@ import {
     Exhibitor,
     IdeaConfiguration,
     IdeaInterest,
+    IdeaInterestResponse,
     Invitation,
     Link,
     Media,
@@ -75,7 +76,12 @@ import {
     VolunteerService
 } from "@prisma/client";
 import { BlogStatus, SERVICE_LINK_DATA_TO_INCLUDE } from "./definitions.js";
-import { RemoveCommonProperties, UnionFromArray } from "./utils/typeUtils.js";
+import {
+  DeepPartial,
+  Override,
+  RemoveCommonProperties,
+  UnionFromArray,
+} from "./utils/typeUtils.js";
 
 export interface ApiResponse<T> {
   data: T;
@@ -148,6 +154,10 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
   isFirstInCity: true,
   /** Venmo / Zelle / CashApp handle for off-platform payouts (promoters). */
   paymentHandle: true,
+  /** Host reputation fields */
+  hostRating: true,
+  totalRatings: true,
+  totalEventsHosted: true,
 } satisfies Prisma.UserSelect;
 
 export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
@@ -175,7 +185,10 @@ export interface CompetitionExt extends Competition {
   votes?: CompetitionVote[];
 }
 
-export interface BashEventExt extends BashEvent {
+export interface BashEventExt extends Omit<
+  BashEvent,
+  "ideaExpiresAt" | "ideaInterestThreshold" | "isAutoApprovable"
+> {
   targetAudience?: TargetAudience;
   amountOfGuests?: AmountOfGuests;
   recurrence?: Recurrence;
@@ -191,13 +204,44 @@ export interface BashEventExt extends BashEvent {
   venueOwner?: PublicUser;
   sponsorships?: SponsoredEventExt[];
   competitions?: CompetitionExt[];
-  interests?: IdeaInterest[];
+  interests?: (IdeaInterest & { responses?: IdeaInterestResponse[] })[];
   configurations?: IdeaConfiguration[];
+  /** GET /event/:id — tickets sold (non-cancelled), for social proof */
+  goingCount?: number;
+  /** GET /event/:id when status=Idea — total IdeaInterest rows */
+  ideaInterestCount?: number;
+  /** GET /event/:id — PublicBashRsvp counts (published / presale) */
+  publicRsvpCounts?: { going: number; interested: number; notGoing: number };
+  /** Current viewer's soft RSVP (PublicBashRsvp), if any */
+  myPublicRsvpStatus?: string | null;
+  /** GET /event/:id when status=Idea — viewer's IdeaInterest row (matched by email) */
+  myIdeaInterest?: (IdeaInterest & { responses: IdeaInterestResponse[] }) | null;
+  /** Rolling expiry timestamp for Idea events (aligned with Prisma `BashEvent.ideaExpiresAt`) */
+  ideaExpiresAt: Date | null;
+  /** Whether the Idea has met the auto-approval threshold */
+  isAutoApprovable: boolean;
+  /** Number of interests needed for auto-publish (see DEFAULT_IDEA_INTEREST_THRESHOLD) */
+  ideaInterestThreshold: number | null;
+  /** GET /event/:id when status=Idea — distinct service providers who sent a service-offer notification */
+  ideaServiceProviderInterestCount?: number;
   // Event page visual customisation (stored as scalar columns on BashEvent)
   backgroundImage: string | null;
   themeColor: string | null;
 }
 
+/**
+ * Incoming create/update payload (e.g. Express JSON body): core date fields may still be ISO strings
+ * until normalized in the API (`getBashEventWithNormalizedDates` / `upsertBashEvent`).
+ */
+export type BashEventUpsertWireInput = Override<
+  DeepPartial<BashEventExt>,
+  Partial<BashEventExt> & {
+    startDateTime?: Date | string | null;
+    endDateTime?: Date | string | null;
+    ideaExpiresAt?: Date | string | null;
+  }
+>;
+
 export const TICKET_TIER_DATA_TO_INCLUDE = {
   tickets: {
     include: {
@@ -846,7 +890,6 @@ export interface TargetAudienceExt extends TargetAudience {
   tags?: string[];
   createdAt?: Date;
   updatedAt?: Date;
-  notes?: string;
   isHighlighted?: boolean;
   associatedCampaigns?: string[];
   icon?: string;
@@ -866,6 +909,9 @@ export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
   creator: {
     select: {
       image: true,
+      uploadedImage: true,
+      imageUpdatedAt: true,
+      uploadedImageUpdatedAt: true,
     },
   },
   service: {

package/src/index.ts

@@ -1,9 +1,18 @@
 export * from "./definitions.js";
 export * from "./extendedSchemas.js";
+export * from "./bashFeedTypes.js";
 export * from "./membershipDefinitions.js";
 
 // Re-export commonly used Prisma types
-export type { Service, Organization, User, BashEvent } from '@prisma/client';
+export type {
+  Service,
+  Organization,
+  User,
+  BashEvent,
+  BashFeedPost,
+  BashAssociationType,
+  Privacy,
+} from '@prisma/client';
 
 export * from "./utils/addressUtils.js";
 export * from "./utils/apiUtils.js";

package/src/utils/addressUtils.ts

@@ -30,6 +30,21 @@ export function databaseAddressStringToAddressValues(addressString: string | und
 }
 
 
+/**
+ * City, state/region, and country for compact card/list UIs (no street or full formatted address).
+ * Detail pages should use {@link databaseAddressStringToOneLineString} or full address fields.
+ */
+export function formatLocalityForCardDisplay(
+  city?: string | null,
+  state?: string | null,
+  country?: string | null
+): string {
+  const parts = [city?.trim(), state?.trim(), country?.trim()].filter(
+    (p): p is string => !!p && p.length > 0
+  );
+  return parts.join(", ");
+}
+
 export function databaseAddressStringToOneLineString(addressString: string | undefined | null): string {
   if (addressString) {
     // Special handling for place-only addresses