@bash-app/bash-common 30.263.0 → 30.272.0

package/prisma/schema.prisma

@@ -78,6 +78,7 @@ model BashFeedPost {
   repostOfPostId      String?
   repostOf            BashFeedPost?        @relation("BashFeedPostRepost", fields: [repostOfPostId], references: [id], onDelete: Cascade)
   repostShells        BashFeedPost[]       @relation("BashFeedPostRepost")
+  visibility          BashFeedPostVisibility @default(Public)
 
   // Relationships
   user         User                @relation(fields: [userId], references: [id], onDelete: Cascade)
@@ -589,6 +590,7 @@ model Invitation {
   inviteDate     DateTime?       @default(now())
   acceptedDate   DateTime?
   rejectedDate   DateTime?
+  revokedDate    DateTime?
   maybeDate      DateTime?
   isFreeGuest    Boolean         @default(false)
   sentCount      Int             @default(1) // Number of times this invitation email has been sent (1 on initial send; incremented on each host-confirmed re-invite for the same email + bash)
@@ -928,6 +930,7 @@ model BashEvent {
   bookingOffers ServiceBookingOffer[]
   promotionBlastEntitlements PromotionBlastEntitlement[]
   promotionBlasts            PromotionBlast[]
+  orgPromotionalPackages     OrgPromotionalPackage[]
 
   @@index([templateId])
   @@index([parentEventId])
@@ -1421,6 +1424,73 @@ model PromotionBlastPushDelivery {
   @@index([bashEventId])
 }
 
+// --- Org Promotional Packages (host pays org to endorse event to members) ---
+enum OrgPromotionalPackageStatus {
+  PENDING_APPROVAL
+  ACTIVE
+  COMPLETED
+  REJECTED
+  EXPIRED
+  REFUNDED
+}
+
+model OrgPromotionalPackage {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  organizationId String
+  organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  bashEventId    String
+  bashEvent      BashEvent    @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  hostUserId     String
+  hostUser       User         @relation("OrgPromoHost", fields: [hostUserId], references: [id], onDelete: Cascade)
+
+  tierId               String
+  maxReach             Int
+  orgFeeCents          Int
+  bashPlatformFeeCents Int
+  totalCents           Int
+
+  stripePaymentIntentId String @unique
+  authorizedAt          DateTime
+  capturedAt            DateTime?
+  status                OrgPromotionalPackageStatus @default(PENDING_APPROVAL)
+
+  hostNote         String?
+  orgResponseNote  String?
+  approvedByUserId String?
+  approvedBy       User?    @relation("OrgPromoApprover", fields: [approvedByUserId], references: [id], onDelete: SetNull)
+  activatedAt      DateTime?
+
+  membersNotifiedAt  DateTime?
+  notifyError        String?
+  notifyAttemptCount Int      @default(0)
+
+  deliveries OrgPromotionalDelivery[]
+
+  @@index([organizationId, status])
+  @@index([bashEventId, status])
+  @@index([hostUserId])
+  @@index([status])
+}
+
+model OrgPromotionalDelivery {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+
+  packageId String
+  package   OrgPromotionalPackage @relation(fields: [packageId], references: [id], onDelete: Cascade)
+  userId    String
+  user      User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  channel String
+
+  @@unique([packageId, userId, channel])
+  @@index([packageId])
+  @@index([userId])
+}
+
 /// USPS carrier-route catalog (Utah MVP; expand for national rollout).
 model PostalCarrierRoute {
   id               String  @id @default(cuid())
@@ -2013,6 +2083,7 @@ model Ticket {
   allowPromiseToPay          Boolean?
   status                     TicketStatus @default(Pending)
   isFreeGuest                Boolean?
+  isNamedGuest               Boolean      @default(false)
   geoFenceCheckInUnnecessary Boolean?
   checkedInAt                DateTime?
   checkedOutAt               DateTime?
@@ -2791,6 +2862,9 @@ model User {
   sentBookingOffers              ServiceBookingOffer[]        @relation("OfferSender")
   receivedBookingOffers          ServiceBookingOffer[]        @relation("OfferRecipient")
   promotionBlastEntitlements     PromotionBlastEntitlement[]  @relation("PromotionBlastPartner")
+  orgPromotionalPackagesHosted OrgPromotionalPackage[]      @relation("OrgPromoHost")
+  orgPromotionalPackagesApproved OrgPromotionalPackage[]    @relation("OrgPromoApprover")
+  orgPromotionalDeliveries     OrgPromotionalDelivery[]
   promotionBlastsOwned           PromotionBlast[]             @relation("PromotionBlastOwner")
   promotionBlastsPaused          PromotionBlast[]             @relation("PromotionBlastPausedBy")
   promotionBlastRedemptions      PromotionBlastRedemption[]
@@ -3229,6 +3303,13 @@ model Contact {
   contactEmail             String?
   fullName                 String?
   phone                    String?
+  /// Mailing address line 1 (street number and name). Maps to Lob `address1`.
+  street                   String?
+  /// Mailing address line 2 (apt, suite, unit). Maps to Lob `address2`.
+  addressLine2             String?
+  city                     String?
+  state                    String?
+  zipCode                  String?
   requestToConnectSent     DateTime?
   requestToConnectAccepted DateTime?
   contactOwner             User      @relation(fields: [contactOwnerId], references: [id], onDelete: Cascade)
@@ -4172,6 +4253,10 @@ model Organization {
 
   smsSendLogs SmsSendLog[]
 
+  /// Per-tier promotional package rates for external hosts (community / spotlight / featured).
+  promotionalPackageRates Json?
+  orgPromotionalPackages  OrgPromotionalPackage[]
+
   @@index([ownerId])
   @@index([slug])
   @@index([parentOrganizationId])
@@ -5889,6 +5974,15 @@ enum AiApprovalVerdict {
   Reject
 }
 
+/// Feed post audience (future: filter feed queries by visibility).
+enum BashFeedPostVisibility {
+  Public
+  FollowersOnly
+  ContactsOnly
+  ConnectionsOnly
+  OnlyMe
+}
+
 /// How a user is associated with a bash (for BashFeedPost display: "Sarah attended...", "Mike is hosting...")
 enum BashAssociationType {
   Hosting
@@ -7561,14 +7655,8 @@ enum MusicGenreType {
 
 enum UserRole {
   User
-  Vendor
-  Sponsor
-  Investor
-  LoanProvider
-  VenueProvider
-  ServiceProvider
-  SuperAdmin
-  Exhibitor
+  Admin
+  SuperUser
 }
 
 enum UserStatus {
@@ -7732,6 +7820,7 @@ enum CreditSourceType {
   PostAfterEvent // First BashFeed post linked to event after it ends
   ReferralCodeUsed // Flat bonus for referrer when code drives a ticket/signup
   VenueLoyaltyRedemption // BashPoints moved through a VenueLoyaltyRedemption claim/redeem/refund
+  PartnerPromoRedemption // BashPoints spent to unlock a local partner promo code
 }
 
 enum ReferralTier {
@@ -9137,21 +9226,61 @@ enum PartnerTier {
   Featured
 }
 
+enum PartnerListingType {
+  Gear
+  LocalService
+}
+
+enum LocalServiceCategory {
+  GetReady
+  WearAndStyle
+  EatAndDrink
+  Move
+  Recover
+  Wellness
+  HealthAndEssentials
+  HomeAndLife
+  ContentAndKeepsakes
+  HostShortcuts
+  PerksAndRetail
+  Other
+}
+
 model PartnerBrand {
-  id                String           @id @default(cuid())
+  id                String                @id @default(cuid())
   name              String
   logoUrl           String?
   websiteUrl        String?
-  description       String?          @db.Text
-  tier              PartnerTier      @default(Standard)
-  isActive          Boolean          @default(true)
+  description       String?               @db.Text
+  tier              PartnerTier           @default(Standard)
+  isActive          Boolean               @default(true)
   affiliateBaseUrl  String?
   listingFeeMonthly Int? // cents; null = affiliate-only
-  createdAt         DateTime         @default(now())
+  listingType       PartnerListingType    @default(Gear)
+  address           String?               @db.Text
+  phone             String?
+  citySlug          String?
+  stateSlug         String?
+  serviceTimings    String[]              @default([])
+  serviceCategory   LocalServiceCategory?
+  promoHeadline     String?
+  promoCode         String?
+  bookingUrl        String?
+  /// Weekly hours: { hours: { Monday: [{ open, close }] }, openDays: { Monday: true } }
+  businessHours     Json?
+  timezone          String?
+  latitude          Float?
+  longitude         Float?
+  bashPointsCost    Int?
+  clicks            Int                   @default(0)
+  createdAt         DateTime              @default(now())
   products          PartnerProduct[]
   adSlots           PartnerAdSlot[]
+  sourceInquiry     PartnerInquiry?
 
   @@index([isActive, tier])
+  @@index([listingType, citySlug])
+  @@index([serviceCategory])
 }
 
 model PartnerProduct {
@@ -9209,12 +9338,17 @@ model PartnerInquiry {
   website     String?
   description String               @db.Text
   categories  String[]
-  status      PartnerInquiryStatus @default(Pending)
-  adminNote   String?              @db.Text
-  createdAt   DateTime             @default(now())
-  updatedAt   DateTime             @updatedAt
+  listingType PartnerListingType   @default(Gear)
+  city        String?
+  status          PartnerInquiryStatus @default(Pending)
+  adminNote       String?              @db.Text
+  createdBrandId  String?              @unique
+  createdBrand    PartnerBrand?        @relation(fields: [createdBrandId], references: [id], onDelete: SetNull)
+  createdAt       DateTime             @default(now())
+  updatedAt       DateTime             @updatedAt
 
   @@index([status, createdAt])
+  @@index([listingType])
 }
 
 // ============================================

package/src/__tests__/requestAuthUser.test.ts

@@ -0,0 +1,120 @@
+import { UserRole } from "@prisma/client";
+import {
+  parseRequestAuthFromJwtPayload,
+  parseUserRolesFromJwtClaim,
+  userHasSuperUserAccess,
+  userHasAdminAccess,
+} from "../requestAuthUser.js";
+
+describe("parseUserRolesFromJwtClaim", () => {
+  it("returns undefined when claim is absent", () => {
+    expect(parseUserRolesFromJwtClaim(undefined)).toBeUndefined();
+  });
+
+  it("defaults empty array to User", () => {
+    expect(parseUserRolesFromJwtClaim([])).toEqual([UserRole.User]);
+  });
+
+  it("accepts valid enum values", () => {
+    expect(parseUserRolesFromJwtClaim([UserRole.User, UserRole.SuperUser])).toEqual([
+      UserRole.User,
+      UserRole.SuperUser,
+    ]);
+  });
+
+  it("rejects non-array and unknown role strings", () => {
+    expect(parseUserRolesFromJwtClaim("User")).toBeNull();
+    expect(parseUserRolesFromJwtClaim(["NotARealRole"])).toBeNull();
+  });
+});
+
+describe("parseRequestAuthFromJwtPayload", () => {
+  it("parses session-style payload with roles", () => {
+    expect(
+      parseRequestAuthFromJwtPayload({
+        id: "u-1",
+        email: "a@test.com",
+        roles: [UserRole.SuperUser],
+        isSuperUser: false,
+        givenName: "Ada",
+      }),
+    ).toEqual({
+      id: "u-1",
+      email: "a@test.com",
+      roles: [UserRole.SuperUser],
+      isSuperUser: undefined,
+      username: undefined,
+      givenName: "Ada",
+      familyName: undefined,
+    });
+  });
+
+  it("returns null when roles claim is absent", () => {
+    expect(
+      parseRequestAuthFromJwtPayload({
+        id: "u-legacy",
+        email: "legacy@test.com",
+      }),
+    ).toBeNull();
+  });
+
+  it("returns null when identity claims are missing or roles are invalid", () => {
+    expect(parseRequestAuthFromJwtPayload(null)).toBeNull();
+    expect(parseRequestAuthFromJwtPayload({ email: "a@test.com" })).toBeNull();
+    expect(
+      parseRequestAuthFromJwtPayload({
+        id: "u-1",
+        email: "a@test.com",
+        roles: ["BadRole"],
+      }),
+    ).toBeNull();
+  });
+});
+
+describe("userHasSuperUserAccess", () => {
+  it("allows SuperUser role or isSuperUser flag", () => {
+    expect(
+      userHasSuperUserAccess({
+        roles: [UserRole.User, UserRole.SuperUser],
+      }),
+    ).toBe(true);
+    expect(
+      userHasSuperUserAccess({
+        roles: [UserRole.User],
+        isSuperUser: true,
+      }),
+    ).toBe(true);
+    expect(
+      userHasSuperUserAccess({
+        roles: [UserRole.User],
+        isSuperUser: false,
+      }),
+    ).toBe(false);
+  });
+});
+
+describe("userHasAdminAccess", () => {
+  it("allows Admin role", () => {
+    expect(
+      userHasAdminAccess({ roles: [UserRole.Admin] }),
+    ).toBe(true);
+  });
+
+  it("allows SuperUser role", () => {
+    expect(
+      userHasAdminAccess({ roles: [UserRole.SuperUser] }),
+    ).toBe(true);
+  });
+
+  it("allows isSuperUser flag regardless of role", () => {
+    expect(
+      userHasAdminAccess({ roles: [UserRole.User], isSuperUser: true }),
+    ).toBe(true);
+  });
+
+  it("rejects plain User role", () => {
+    expect(
+      userHasAdminAccess({ roles: [UserRole.User], isSuperUser: false }),
+    ).toBe(false);
+  });
+});

package/src/__tests__/statusEnums.test.ts

@@ -138,6 +138,7 @@ describe("status enum value sets", () => {
         "PostAfterEvent",
         "ReferralCodeUsed",
         "VenueLoyaltyRedemption",
+        "PartnerPromoRedemption",
       ].sort(),
     );
   });

package/src/definitions.ts

@@ -473,6 +473,8 @@ export const HTTP_CODE_FORBIDDEN = 403 as const;
 export const HTTP_CODE_NOT_FOUND = 404 as const;
 export const ERR_UNAUTHORIZED_REQUEST =
   "Unauthorized to perform requested action. Have you logged in?" as const;
+export const ERR_SESSION_EXPIRED =
+  "Your session has expired — please refresh or log in again." as const;
 
 export const DEFAULT_PRISMA_TTL_SECONDS = 60 as const;
 export const PRISMA_MEDIA_TTL_SECONDS = 60 * 5; // 5 hours

package/src/extendedSchemas.ts

@@ -1217,6 +1217,9 @@ export interface InvitationExtraData extends Invitation {
   organizerTitle?: string;
   isOwnershipTransfer?: boolean;
   includeQRCode?: boolean; // Controls whether QR code should be included in the invitation email
+  sendEmail?: boolean; // When false, skip email notification (default true)
+  existingTicketId?: string; // Link invitation to an existing ticket instead of creating a new one
+  revoke?: boolean; // Host action: set revokedDate
 }
 
 export interface AssociatedBashExt extends AssociatedBash {

package/src/index.ts

@@ -1,4 +1,5 @@
 export * from "./definitions.js";
+export * from "./requestAuthUser.js";
 export * from "./sms/smsTemplates.js";
 export * from "./legalTemplates.js";
 export * from "./utmAttribution.js";
@@ -153,6 +154,8 @@ export {
   PrizePaymentMethod,
   PrizePaymentStatus,
   PartnerTier,
+  PartnerListingType,
+  LocalServiceCategory,
   PaymentProvider,
   PrizeType,
   ProjectorSetupFormat,
@@ -276,6 +279,8 @@ export type {
   SuggestionUpvote,
 } from "@prisma/client";
 
+export * from "./utils/localPartnerHours.js";
+export * from "./utils/eventCitySlug.js";
 export * from "./utils/addressUtils.js";
 export * from "./utils/apiUtils.js";
 export * from "./utils/arrayUtils.js";
@@ -335,6 +340,7 @@ export * from "./utils/blogUtils.js";
 export * from "./utils/entityUtils.js";
 export * from "./utils/flyerUtils.js";
 export * from "./utils/promotionBlastUtils.js";
+export * from "./utils/orgPromotionalPackageUtils.js";
 export * from "./utils/guestSurface.js";
 export * from "./utils/ticketTierSchedule.js";
 export * from "./utils/lobFlyerUtils.js";

package/src/mirroredPrismaEnums.ts

@@ -176,6 +176,7 @@ export const CreditSourceType = {
   PostAfterEvent: "PostAfterEvent",
   ReferralCodeUsed: "ReferralCodeUsed",
   VenueLoyaltyRedemption: "VenueLoyaltyRedemption",
+  PartnerPromoRedemption: "PartnerPromoRedemption",
 } as const satisfies Record<CreditSourceTypeEnum, CreditSourceTypeEnum>;
 
 export type CreditSourceType = CreditSourceTypeEnum;

package/src/partnerStoreTypes.ts

@@ -1,4 +1,8 @@
-import type { PartnerTier } from "@prisma/client";
+import type {
+  LocalServiceCategory,
+  PartnerListingType,
+  PartnerTier,
+} from "@prisma/client";
 
 /** Product row returned by BashStore / wizard suggestion APIs (no internal counters). */
 export type PartnerProductPublic = {
@@ -28,9 +32,136 @@ export type PartnerStoreResponse = {
   brands: (PartnerBrandSummary & { products: PartnerProductPublic[] })[];
 };
 
-/** GET /api/partner/suggestions — at most one suggestion */
-export type PartnerSuggestionResponse = {
+export type LocalPartnerOfferPublic = {
+  id: string;
+  name: string;
+  description: string | null;
+  imageUrl: string | null;
+  affiliateUrl: string;
+  priceSummary: string | null;
+};
+
+export type LocalPartnerPublic = {
+  id: string;
+  name: string;
+  logoUrl: string | null;
+  websiteUrl: string | null;
+  description: string | null;
+  tier: PartnerTier;
+  address: string | null;
+  phone: string | null;
+  citySlug: string | null;
+  stateSlug: string | null;
+  serviceTimings: string[];
+  serviceCategory: LocalServiceCategory | null;
+  promoHeadline: string | null;
+  promoCode: string | null;
+  bookingUrl: string | null;
+  businessHours: unknown;
+  timezone: string | null;
+  latitude: number | null;
+  longitude: number | null;
+  bashPointsCost: number | null;
+  distanceMiles: number | null;
+  offers: LocalPartnerOfferPublic[];
+};
+
+/** Gear wizard ad slot suggestion */
+export type PartnerGearSuggestion = {
+  kind: "gear";
   slotId: string;
   product: PartnerProductPublic;
   brand: PartnerBrandSummary;
 };
+
+/** Local service partner surfaced in wizard or feed contexts */
+export type PartnerLocalSuggestion = {
+  kind: "local";
+  partner: LocalPartnerPublic;
+};
+
+/** GET /api/partner/suggestions — at most one suggestion */
+export type PartnerSuggestionResponse = PartnerGearSuggestion | PartnerLocalSuggestion;
+
+export type ClaimPartnerPromoResponse = {
+  promoCode: string;
+  bashPointsCost: number;
+  balanceAfter: number;
+};
+
+/** GET /api/partner/local-services */
+export type LocalServiceListingResponse = {
+  featured: LocalPartnerPublic | null;
+  partners: LocalPartnerPublic[];
+};
+
+/** Display labels for LocalServiceCategory enum values. */
+export const LOCAL_SERVICE_CATEGORY_LABELS: Record<LocalServiceCategory, string> = {
+  GetReady: "Get Ready",
+  WearAndStyle: "Wear & Style",
+  EatAndDrink: "Eat & Drink",
+  Move: "Move",
+  Recover: "Recover",
+  Wellness: "Wellness",
+  HealthAndEssentials: "Health & Essentials",
+  HomeAndLife: "Home & Life",
+  ContentAndKeepsakes: "Content & Keepsakes",
+  HostShortcuts: "Host Shortcuts",
+  PerksAndRetail: "Perks & Retail",
+  Other: "Other",
+};
+
+/** Ordered list for filter chips in BashStore Local Partners tab. */
+export const LOCAL_SERVICE_CATEGORY_ORDER: LocalServiceCategory[] = [
+  "GetReady",
+  "WearAndStyle",
+  "EatAndDrink",
+  "Move",
+  "Recover",
+  "Wellness",
+  "HealthAndEssentials",
+  "HomeAndLife",
+  "ContentAndKeepsakes",
+  "HostShortcuts",
+  "PerksAndRetail",
+  "Other",
+];
+
+export const LOCAL_SERVICE_TIMING_OPTIONS = [
+  { value: "pre_event", label: "Pre-event" },
+  { value: "day_of", label: "Day-of" },
+  { value: "post_event", label: "Post-event" },
+] as const;
+
+export type LocalServiceTiming = (typeof LOCAL_SERVICE_TIMING_OPTIONS)[number]["value"];
+
+export const PARTNER_LISTING_TYPE_LABELS: Record<PartnerListingType, string> = {
+  Gear: "Gear",
+  LocalService: "Local Service",
+};
+
+/** Admin / inquiry payloads for BashStore partner listing requests. */
+export type PartnerInquiryRecord = {
+  id: string;
+  contactName: string;
+  email: string;
+  brandName: string;
+  website: string | null;
+  description: string;
+  categories: string[];
+  listingType: PartnerListingType;
+  city: string | null;
+  status: "Pending" | "Reviewed" | "Approved" | "Rejected";
+  adminNote: string | null;
+  createdBrandId: string | null;
+  createdAt: string;
+};
+
+/** GET /api/partner/inquiry-status */
+export type PartnerInquiryStatusResponse = {
+  brandName: string;
+  status: string;
+  listingLive: boolean;
+  storeUrl: string | null;
+  createdBrandId: string | null;
+};