@bash-app/bash-common 30.215.0 → 30.217.0

package/src/utils/service/__tests__/serviceRateUtils.test.ts

@@ -0,0 +1,288 @@
+import { ServiceRatePricingType, ServiceRateType } from "@prisma/client";
+import { DateTime } from "luxon";
+import {
+  SERVICE_DAILY_RATE_HOURS_MIN,
+  serviceBookingCalcDayPriceBreakdown,
+  serviceBookingPriceBreakdownGetTypeText,
+  getServiceRatePricingInfo,
+  serviceRatesFilter,
+  serviceRatesHasRates,
+} from "../serviceRateUtils";
+import type { ServiceRatesLuxon } from "../serviceRateUtils";
+import type { LuxonDateRange } from "../../luxonUtils";
+import type { ServiceRate } from "@prisma/client";
+import type { ServiceSpecialRatesExtT, ServiceDailyRatesExtT } from "../serviceRateTypes";
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function makeRange(startISO: string, endISO: string): LuxonDateRange {
+  return {
+    start: DateTime.fromISO(startISO, { zone: "utc" }),
+    end: DateTime.fromISO(endISO, { zone: "utc" }),
+  };
+}
+
+function makeRate(overrides: Partial<ServiceRate> = {}): ServiceRate {
+  return {
+    id: "r1",
+    rateType: ServiceRateType.General,
+    hourlyRateCents: null,
+    dailyRateCents: null,
+    flatRateCents: null,
+    serviceRatesAssociationId: "sra1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    ...overrides,
+  } as ServiceRate;
+}
+
+const RANGE_8H = makeRange("2025-07-01T09:00:00Z", "2025-07-01T17:00:00Z");
+
+// ---------------------------------------------------------------------------
+// serviceBookingPriceBreakdownGetTypeText
+// ---------------------------------------------------------------------------
+
+describe("serviceBookingPriceBreakdownGetTypeText", () => {
+  it("returns rateType + space + pricingType", () => {
+    const info = {
+      rateType: ServiceRateType.General,
+      pricingType: ServiceRatePricingType.Hourly,
+      hours: 2,
+      piTotalCents: 200,
+      rateCents: 100,
+      unitCount: 2,
+      dateTimeRange: RANGE_8H,
+    };
+    expect(serviceBookingPriceBreakdownGetTypeText(info)).toBe("General Hourly");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// serviceBookingCalcDayPriceBreakdown — flat rate
+// ---------------------------------------------------------------------------
+
+describe("serviceBookingCalcDayPriceBreakdown — flat rate", () => {
+  it("uses flat rate when flatRateCents is set, ignoring hourly", () => {
+    const rate = makeRate({ flatRateCents: 50000, hourlyRateCents: 10000 });
+    const result = serviceBookingCalcDayPriceBreakdown(RANGE_8H, [rate], false, 8);
+
+    expect(result.pricingType).toBe("Flat");
+    expect(result.rateCents).toBe(50000);
+    expect(result.piTotalCents).toBe(50000);
+    expect(result.unitCount).toBe(1);
+  });
+
+  it("assigns rateType from the matching rate", () => {
+    const rate = makeRate({ flatRateCents: 20000, rateType: ServiceRateType.Special });
+    const result = serviceBookingCalcDayPriceBreakdown(RANGE_8H, [rate], false, 4);
+    expect(result.rateType).toBe(ServiceRateType.Special);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// serviceBookingCalcDayPriceBreakdown — hourly rate
+// ---------------------------------------------------------------------------
+
+describe("serviceBookingCalcDayPriceBreakdown — hourly rate", () => {
+  it("calculates hourly total correctly", () => {
+    const rate = makeRate({ hourlyRateCents: 5000 });
+    const result = serviceBookingCalcDayPriceBreakdown(RANGE_8H, [rate], false, 3);
+
+    expect(result.pricingType).toBe(ServiceRatePricingType.Hourly);
+    expect(result.rateCents).toBe(5000);
+    expect(result.unitCount).toBe(3);
+    expect(result.piTotalCents).toBe(15000);
+  });
+
+  it("returns zero total when no hourly rate available", () => {
+    const result = serviceBookingCalcDayPriceBreakdown(RANGE_8H, [], false, 3);
+    expect(result.piTotalCents).toBe(0);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// serviceBookingCalcDayPriceBreakdown — daily rate
+// ---------------------------------------------------------------------------
+
+describe("serviceBookingCalcDayPriceBreakdown — daily rate", () => {
+  it("calculates daily total based on full-day slots", () => {
+    const rate = makeRate({ dailyRateCents: 40000 });
+    // 16 hours = floor(16/8) = 2 days
+    const result = serviceBookingCalcDayPriceBreakdown(RANGE_8H, [rate], true, 16);
+
+    expect(result.pricingType).toBe(ServiceRatePricingType.Daily);
+    expect(result.rateCents).toBe(40000);
+    expect(result.unitCount).toBe(2);
+    expect(result.piTotalCents).toBe(80000);
+  });
+
+  it("falls back to hourly when isFullDay=true but no daily rate available", () => {
+    const rate = makeRate({ hourlyRateCents: 3000 });
+    const result = serviceBookingCalcDayPriceBreakdown(RANGE_8H, [rate], true, 8);
+    expect(result.pricingType).toBe(ServiceRatePricingType.Hourly);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// getServiceRatePricingInfo
+// ---------------------------------------------------------------------------
+
+describe("getServiceRatePricingInfo", () => {
+  it("returns hourly pricing when hours < SERVICE_DAILY_RATE_HOURS_MIN", () => {
+    const generalRate = makeRate({ hourlyRateCents: 2000 });
+    const result = getServiceRatePricingInfo(RANGE_8H, generalRate, [], [], "UTC", 4);
+    expect(result.pricingType).toBe(ServiceRatePricingType.Hourly);
+    expect(result.piTotalCents).toBe(8000);
+  });
+
+  it("returns daily pricing when hours >= SERVICE_DAILY_RATE_HOURS_MIN", () => {
+    const generalRate = makeRate({ dailyRateCents: 30000 });
+    const result = getServiceRatePricingInfo(RANGE_8H, generalRate, [], [], "UTC", SERVICE_DAILY_RATE_HOURS_MIN);
+    expect(result.pricingType).toBe(ServiceRatePricingType.Daily);
+    expect(result.piTotalCents).toBe(30000);
+  });
+
+  it("prefers special rate over general rate", () => {
+    const generalRate = makeRate({ hourlyRateCents: 1000 });
+    const specialRate = {
+      id: "sp1",
+      isAvailable: true,
+      serviceRate: makeRate({ hourlyRateCents: 9999 }),
+      dateTimeRange: RANGE_8H,
+    } as unknown as ServiceSpecialRatesExtT;
+
+    const result = getServiceRatePricingInfo(RANGE_8H, generalRate, [], [specialRate], "UTC", 2);
+    expect(result.rateCents).toBe(9999);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// serviceRatesFilter
+// ---------------------------------------------------------------------------
+
+describe("serviceRatesFilter", () => {
+  const range = makeRange("2025-07-01T09:00:00Z", "2025-07-01T17:00:00Z");
+
+  it("keeps special rates that intersect and are available", () => {
+    const specialRate: ServiceSpecialRatesExtT = {
+      id: "sp1",
+      isAvailable: true,
+      serviceRate: makeRate({ hourlyRateCents: 5000 }),
+      dateTimeRange: makeRange("2025-07-01T10:00:00Z", "2025-07-01T14:00:00Z"),
+    } as unknown as ServiceSpecialRatesExtT;
+
+    const rates: ServiceRatesLuxon = {
+      generalRate: null,
+      specialRates: [specialRate],
+      dailyRates: [],
+    };
+
+    const result = serviceRatesFilter(rates, [range]);
+    expect(result.specialRates).toHaveLength(1);
+  });
+
+  it("excludes special rates that are unavailable", () => {
+    const blockedRate: ServiceSpecialRatesExtT = {
+      id: "sp2",
+      isAvailable: false,
+      serviceRate: makeRate(),
+      dateTimeRange: range,
+    } as unknown as ServiceSpecialRatesExtT;
+
+    const rates: ServiceRatesLuxon = {
+      generalRate: null,
+      specialRates: [blockedRate],
+      dailyRates: [],
+    };
+
+    const result = serviceRatesFilter(rates, [range]);
+    expect(result.specialRates).toHaveLength(0);
+  });
+
+  it("excludes special rates outside the requested range", () => {
+    const outsideRate: ServiceSpecialRatesExtT = {
+      id: "sp3",
+      isAvailable: true,
+      serviceRate: makeRate({ hourlyRateCents: 5000 }),
+      dateTimeRange: makeRange("2025-08-01T09:00:00Z", "2025-08-01T17:00:00Z"),
+    } as unknown as ServiceSpecialRatesExtT;
+
+    const rates: ServiceRatesLuxon = {
+      generalRate: null,
+      specialRates: [outsideRate],
+      dailyRates: [],
+    };
+
+    const result = serviceRatesFilter(rates, [range]);
+    expect(result.specialRates).toHaveLength(0);
+  });
+
+  it("preserves the generalRate unchanged", () => {
+    const generalRate = makeRate({ hourlyRateCents: 1000 });
+    const rates: ServiceRatesLuxon = {
+      generalRate,
+      specialRates: [],
+      dailyRates: [],
+    };
+    expect(serviceRatesFilter(rates, [range]).generalRate).toBe(generalRate);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// serviceRatesHasRates
+// ---------------------------------------------------------------------------
+
+describe("serviceRatesHasRates", () => {
+  it("returns true when generalRate has hourly rate", () => {
+    const rates: ServiceRatesLuxon = {
+      generalRate: makeRate({ hourlyRateCents: 1000 }),
+      specialRates: [],
+      dailyRates: [],
+    };
+    expect(serviceRatesHasRates(rates)).toBe(true);
+  });
+
+  it("returns true when generalRate has flat rate", () => {
+    const rates: ServiceRatesLuxon = {
+      generalRate: makeRate({ flatRateCents: 5000 }),
+      specialRates: [],
+      dailyRates: [],
+    };
+    expect(serviceRatesHasRates(rates)).toBe(true);
+  });
+
+  it("returns false when all rates are zero/null", () => {
+    const rates: ServiceRatesLuxon = {
+      generalRate: makeRate(),
+      specialRates: [],
+      dailyRates: [],
+    };
+    expect(serviceRatesHasRates(rates)).toBe(false);
+  });
+
+  it("returns true when a special rate has a daily rate", () => {
+    const specialRate: ServiceSpecialRatesExtT = {
+      id: "sp1",
+      isAvailable: true,
+      serviceRate: makeRate({ dailyRateCents: 10000 }),
+      dateTimeRange: RANGE_8H,
+    } as unknown as ServiceSpecialRatesExtT;
+    const rates: ServiceRatesLuxon = {
+      generalRate: null,
+      specialRates: [specialRate],
+      dailyRates: [],
+    };
+    expect(serviceRatesHasRates(rates)).toBe(true);
+  });
+
+  it("returns falsy when generalRate is null and no special/daily rates", () => {
+    const rates: ServiceRatesLuxon = {
+      generalRate: null,
+      specialRates: [],
+      dailyRates: [],
+    };
+    expect(serviceRatesHasRates(rates)).toBeFalsy();
+  });
+});

package/src/utils/service/serviceDBUtils.ts

@@ -1,14 +1,19 @@
-import { ServiceExt } from "../../extendedSchemas.js";
-import { DeepPartial } from "../typeUtils.js";
+import type { ServiceExt } from "../../extendedSchemas.js";
+import type { DeepPartial } from "../typeUtils.js";
 
-/** Converts service data for DB write. Currently a pass-through; rate conversion was removed. */
-export function serviceToDb(
-  service: DeepPartial<ServiceExt>
-): DeepPartial<ServiceExt> {
+/**
+ * Maps a service record from the API / DB into the client `ServiceExt` shape
+ * (e.g. date normalization). Identity until a stricter transform is needed.
+ */
+export function serviceFromDb<T extends ServiceExt | null | undefined>(
+  service: T
+): T {
   return service;
 }
 
-/** Converts service data from DB read. Currently a pass-through; rate conversion was removed. */
-export function serviceFromDb(service: ServiceExt): ServiceExt {
+/**
+ * Maps a partial `ServiceExt` from the client for upsert payloads.
+ */
+export function serviceToDb<T extends DeepPartial<ServiceExt>>(service: T): T {
   return service;
 }

package/src/utils/service/serviceUtils.ts

@@ -915,3 +915,11 @@ export function serviceRelevantData(
     )
   );
 }
+
+/**
+ * Returns the contextually correct label for a service's sellable items.
+ * Vendors sell "Products"; entertainers and other service types sell "Merch".
+ */
+export function getVendorSalesLabel(serviceType: ServiceTypes): "Products" | "Merch" {
+  return serviceType === ServiceTypes.Vendors ? "Products" : "Merch";
+}

package/src/utmAttribution.ts

@@ -16,11 +16,7 @@ const SESSION_KEYS = {
 } as const;
 
 /** Normalize optional UTM strings from API args (Stripe checkout / payment intent body). */
-export function utmFieldsFromCheckoutArgs(args: {
-  utmSource?: string;
-  utmMedium?: string;
-  utmCampaign?: string;
-}): UtmFields | undefined {
+export function utmFieldsFromCheckoutArgs(args: UtmFields): UtmFields | undefined {
   const s = args.utmSource?.trim();
   const m = args.utmMedium?.trim();
   const c = args.utmCampaign?.trim();

package/src/venueLoyaltyRedemption.ts

@@ -0,0 +1,22 @@
+/**
+ * API shapes for venue loyalty perk requests (guest claim + host list/redeem).
+ */
+
+export interface VenueLoyaltyRedemptionGuestDto {
+  id: string;
+  venueId: string;
+  userId: string;
+  templateId: string;
+  claimedAt: string;
+  redeemedAt: string | null;
+  guestNotes: string | null;
+  hostNotes: string | null;
+}
+
+export interface VenueLoyaltyRedemptionListItem extends VenueLoyaltyRedemptionGuestDto {
+  user: {
+    email: string;
+    givenName: string | null;
+    familyName: string | null;
+  };
+}