@bash-app/bash-common 30.75.2 → 30.78.0

package/src/utils/recurrenceUtils.ts

@@ -37,26 +37,58 @@ function getRecurringBashEventPossibleDatesTimesInternal(
   recurrence: Recurrence | undefined | null,
   toDate: boolean
 ): (DateTime | Date)[] {
+  console.log("🚨 getRecurringBashEventPossibleDatesTimesInternal called:", {
+    startDateTime,
+    recurrence,
+    toDate,
+  });
+
   if (
     !recurrence ||
     !recurrence.frequency ||
     recurrence.frequency === RecurringFrequency.Never
   ) {
+    console.log("🚨 Early return: No recurrence or frequency is Never");
     return [];
   }
 
   let recurrenceDates: DateTime[] = [];
-  const beginningDate = findEarliestPossibleBashEventDate(
-    startDateTime
-  ) as DateTime; // Don't allow dates before the current date
+  
+  // For Monthly and Yearly, start from the event's actual date, not "today"
+  // This ensures we generate dates relative to the event's schedule
+  const shouldUseEventDate = 
+    recurrence.frequency === RecurringFrequency.Monthly || 
+    recurrence.frequency === RecurringFrequency.Yearly;
+  
+  const beginningDate = shouldUseEventDate 
+    ? (startDateTime ? dateTimeFromDate(startDateTime) as DateTime : DateTime.local())
+    : findEarliestPossibleBashEventDate(startDateTime) as DateTime;
+
+  console.log("🚨 beginningDate:", beginningDate?.toISO(), "shouldUseEventDate:", shouldUseEventDate);
 
   switch (recurrence.frequency) {
+    case RecurringFrequency.Daily:
+      console.log("🚨 Calling getDailyRecurringDates");
+      recurrenceDates = getDailyRecurringDates(beginningDate, recurrence);
+      break;
     case RecurringFrequency.Weekly:
+      console.log("🚨 Calling getWeeklyRecurringDates");
       recurrenceDates = getWeeklyRecurringDates(beginningDate, recurrence);
       break;
+    case RecurringFrequency.Monthly:
+      console.log("🚨 Calling getMonthlyRecurringDates");
+      recurrenceDates = getMonthlyRecurringDates(beginningDate, recurrence);
+      break;
+    case RecurringFrequency.Yearly:
+      console.log("🚨 Calling getYearlyRecurringDates");
+      recurrenceDates = getYearlyRecurringDates(beginningDate, recurrence);
+      break;
     default:
-      console.error(`Only weekly frequency is currently supported`);
+      console.error(`Unsupported frequency: ${recurrence.frequency}`);
   }
+  
+  console.log("🚨 recurrenceDates before mapping:", recurrenceDates.length, recurrenceDates.map(d => d.toISO()));
+
   return recurrenceDates
     .map((date: DateTime): string =>
       date.toFormat(LUXON_DATETIME_FORMAT_ISO_LIKE)
@@ -75,6 +107,39 @@ function getRecurringBashEventPossibleDatesTimesInternal(
     });
 }
 
+/**
+ * Get the daily recurring dates
+ * @param beginningDateTime The beginning DateTime of the event, adjusted to be no earlier than now.
+ * @param recurrence
+ */
+function getDailyRecurringDates(
+  beginningDateTime: DateTime,
+  recurrence: Recurrence
+): DateTime[] {
+  if (recurrence.frequency !== RecurringFrequency.Daily) {
+    throw new Error(
+      `Cannot do a daily recurrence if the frequency isn't daily.`
+    );
+  }
+
+  const interval = recurrence.interval ?? 1;
+  const recurrenceEnds = dateTimeFromDate(recurrence.ends).endOf("day");
+  const numberOfDays = recurrenceEnds.diff(beginningDateTime, "days").days;
+  const numberOfOccurrences = Math.ceil(numberOfDays / interval);
+
+  const recurrenceDates: DateTime[] = [];
+  let currentDate = beginningDateTime;
+
+  for (let i = 0; i < numberOfOccurrences && currentDate <= recurrenceEnds; i++) {
+    if (currentDate >= beginningDateTime) {
+      recurrenceDates.push(currentDate);
+    }
+    currentDate = currentDate.plus({ days: interval });
+  }
+
+  return recurrenceDates;
+}
+
 /**
  * Get the weekly recurring dates
  * @param beginningDateTime The beginning DateTime of the event, adjusted to be no earlier than now.
@@ -137,6 +202,117 @@ function getBeginningOfWeekInterval(
   return date.endOf("week").plus({ days: numberOfDaysToAdd });
 }
 
+/**
+ * Get the monthly recurring dates
+ * @param beginningDateTime The beginning DateTime of the event, adjusted to be no earlier than now.
+ * @param recurrence
+ */
+function getMonthlyRecurringDates(
+  beginningDateTime: DateTime,
+  recurrence: Recurrence
+): DateTime[] {
+  if (recurrence.frequency !== RecurringFrequency.Monthly) {
+    throw new Error(
+      `Cannot do a monthly recurrence if the frequency isn't monthly.`
+    );
+  }
+
+  const interval = recurrence.interval ?? 1;
+  const recurrenceEnds = dateTimeFromDate(recurrence.ends).endOf("day");
+  const dayOfMonth = recurrence.repeatOnDayOfMonth ?? beginningDateTime.day;
+
+  console.log("📅 Monthly recurrence debug:", {
+    beginningDateTime: beginningDateTime.toISO(),
+    recurrenceEnds: recurrenceEnds.toISO(),
+    dayOfMonth,
+    interval,
+    "beginningDateTime.day": beginningDateTime.day,
+    "beginningDateTime.daysInMonth": beginningDateTime.daysInMonth,
+  });
+
+  const recurrenceDates: DateTime[] = [];
+  let currentDate = beginningDateTime.set({ day: Math.min(dayOfMonth, beginningDateTime.daysInMonth || 31) });
+
+  console.log("📅 Initial currentDate:", currentDate.toISO());
+
+  // If the day of month is after the current day, start from the current month
+  if (currentDate < beginningDateTime) {
+    console.log("📅 currentDate < beginningDateTime, adding 1 month");
+    currentDate = currentDate.plus({ months: 1 });
+    currentDate = currentDate.set({ day: Math.min(dayOfMonth, currentDate.daysInMonth || 31) });
+    console.log("📅 New currentDate after adjustment:", currentDate.toISO());
+  }
+
+  let iterations = 0;
+  while (currentDate <= recurrenceEnds && iterations < 100) {
+    iterations++;
+    console.log(`📅 Iteration ${iterations}: currentDate=${currentDate.toISO()}, recurrenceEnds=${recurrenceEnds.toISO()}, currentDate <= recurrenceEnds: ${currentDate <= recurrenceEnds}`);
+    
+    if (currentDate >= beginningDateTime) {
+      // Set the time to match the beginning time
+      const dateWithTime = dateTimeSetTime(currentDate, beginningDateTime);
+      console.log(`📅 Adding date: ${dateWithTime.toISO()}`);
+      recurrenceDates.push(dateWithTime);
+    }
+    currentDate = currentDate.plus({ months: interval });
+    // Handle months with fewer days (e.g., Feb 31 -> Feb 28/29)
+    currentDate = currentDate.set({ day: Math.min(dayOfMonth, currentDate.daysInMonth || 31) });
+  }
+
+  console.log("📅 Monthly recurrence complete:", {
+    totalDates: recurrenceDates.length,
+    dates: recurrenceDates.map(d => d.toISO()),
+  });
+
+  return recurrenceDates;
+}
+
+/**
+ * Get the yearly recurring dates
+ * @param beginningDateTime The beginning DateTime of the event, adjusted to be no earlier than now.
+ * @param recurrence
+ */
+function getYearlyRecurringDates(
+  beginningDateTime: DateTime,
+  recurrence: Recurrence
+): DateTime[] {
+  if (recurrence.frequency !== RecurringFrequency.Yearly) {
+    throw new Error(
+      `Cannot do a yearly recurrence if the frequency isn't yearly.`
+    );
+  }
+
+  const interval = recurrence.interval ?? 1;
+  const recurrenceEnds = dateTimeFromDate(recurrence.ends).endOf("day");
+  
+  // Use the repeatYearlyDate if provided, otherwise use the beginning date
+  const baseDate = recurrence.repeatYearlyDate 
+    ? dateTimeFromDate(recurrence.repeatYearlyDate)
+    : beginningDateTime;
+
+  const recurrenceDates: DateTime[] = [];
+  let currentDate = baseDate.set({ 
+    year: beginningDateTime.year,
+    hour: beginningDateTime.hour,
+    minute: beginningDateTime.minute,
+    second: beginningDateTime.second 
+  });
+
+  // If we've already passed this date this year, start from next year
+  if (currentDate < beginningDateTime) {
+    currentDate = currentDate.plus({ years: interval });
+  }
+
+  while (currentDate <= recurrenceEnds) {
+    if (currentDate >= beginningDateTime) {
+      recurrenceDates.push(currentDate);
+    }
+    currentDate = currentDate.plus({ years: interval });
+  }
+
+  return recurrenceDates;
+}
+
 export function freqToGrammarString(
   freq: RecurringFrequency,
   interval: number | undefined,

package/src/utils/service/frontendServiceBookingUtils.ts

@@ -33,8 +33,12 @@ import {
   ServiceBookingAddOnBase,
 } from "./serviceBookingTypes";
 import { convertDollarsToCents } from "../paymentUtils";
+import { SERVICE_FEE_PERCENTAGE } from "../../definitions";
 
-export const SERVICE_BOOKING_PROCESSING_FEE_PERCENT = 0.15;
+// Use centralized service fee percentage (15% base rate for Basic tier)
+// Note: This is the DEFAULT processing fee. Actual fees may be lower based on membership tier.
+// See definitions.ts for SERVICE_FEE_BASIC, SERVICE_FEE_PRO, etc.
+export const SERVICE_BOOKING_PROCESSING_FEE_PERCENT = SERVICE_FEE_PERCENTAGE;
 
 export interface ServiceAddonInput extends ServiceAddon {
   chosenQuantity?: number;

package/src/utils/userSubscriptionUtils.ts

@@ -1,22 +1,19 @@
 import { ServiceTypes, MembershipTier } from "@prisma/client";
 
+// Re-export from definitions.ts for backwards compatibility
+export { 
+  SERVICE_SUBSCRIPTION_TIERS,
+  type UserSubscriptionServiceTierInfo,
+  type UserSubscriptionServiceTierInfoMap 
+} from "../definitions";
+
 export const ServiceSubscriptionTier = {
-  Ally: "Ally",
+  Free: "Free",
+  Ally: "Ally", 
   Partner: "Partner",
-  Patreon: "Patron",
+  Patron: "Patron",
 } as const;
-export type ServiceSubscriptionTier = "Ally" | "Partner" | "Patron";
-
-export type UserSubscriptionServiceTierInfo = {
-  name: string;
-  type?: ServiceSubscriptionTier;
-  description: string;
-  price: number;
-};
-
-export type UserSubscriptionServiceTierInfoMap = {
-  [key in ServiceSubscriptionTier]: UserSubscriptionServiceTierInfo;
-};
+export type ServiceSubscriptionTier = "Free" | "Ally" | "Partner" | "Patron";
 
 export type UserSubscriptionInfo = {
   name: string;
@@ -40,6 +37,7 @@ export type UserServiceSubscriptionTierFromServiceTypes = {
 };
 
 export const SERVICE_TIER_TO_SERVICES_LIST = {
+  Free: ["EventServices", "EntertainmentServices"],
   Ally: ["EventServices", "EntertainmentServices"],
   Partner: ["Vendors", "Exhibitors", "Sponsors"],
   Patron: ["Venues", "Organizations"],
@@ -48,9 +46,13 @@ export const SERVICE_TIER_TO_SERVICES_LIST = {
 export const SERVICE_TIER_FROM_SERVICE_TYPE = Object.entries(
   SERVICE_TIER_TO_SERVICES_LIST
 ).reduce((sofar, [type, serviceTypes]) => {
-  serviceTypes.forEach(
-    (serviceType) => (sofar[serviceType] = type as ServiceSubscriptionTier)
-  );
+  serviceTypes.forEach((serviceType) => {
+    // Default to Free tier for EventServices and EntertainmentServices
+    // Higher tiers can be chosen by the user
+    if (!sofar[serviceType] || type === "Free") {
+      sofar[serviceType] = type as ServiceSubscriptionTier;
+    }
+  });
   return sofar;
 }, {} as UserServiceSubscriptionTierFromServiceTypes);
 
@@ -77,27 +79,7 @@ export const USER_SUBSCRIPTION_TYPES = {
   // }
 } as UserSubscriptionServiceInfoMap;
 
-export const SERVICE_SUBSCRIPTION_TIERS = {
-  Ally: {
-    name: "Ally",
-    description: "Ally",
-    price: 14,
-  },
-  Partner: {
-    name: "Partner",
-    description: "Partner",
-    price: 49.0,
-  },
-  Patron: {
-    name: "Patron",
-    description: "Patron",
-    price: 99.0,
-  },
-} as UserSubscriptionServiceTierInfoMap;
-
+// Set the type field on each tier info object
 Object.entries(USER_SUBSCRIPTION_TYPES).forEach(
   ([type, info]) => (info.type = type as MembershipTier)
 );
-Object.entries(SERVICE_SUBSCRIPTION_TIERS).forEach(
-  ([type, info]) => (info.type = type as ServiceSubscriptionTier)
-);

package/src/utils/service/venueUtils.ts

@@ -1,30 +0,0 @@
-import { VenuePricingPlan as VenuePricingPlanOption } from "@prisma/client";
-
-export type VenuePricingPlanData = {
-  name: string;
-  description: string;
-  percentageFee: number;
-  monthlyFee: number;
-  flatFee: number;
-};
-
-export type VenuePricingPlanMap = {
-  [key in VenuePricingPlanOption]: VenuePricingPlanData;
-};
-
-export const VENUE_PRICING_PLAN_DATA: VenuePricingPlanMap = {
-  [VenuePricingPlanOption.Percentage]: {
-    name: "Pay per booking",
-    description: "15% of each booking goes to Bash.",
-    percentageFee: 0.15,
-    monthlyFee: 0.0,
-    flatFee: 0.0,
-  },
-  [VenuePricingPlanOption.Subscription]: {
-    name: "Monthly subscription",
-    description: "Pay $100/month and keep 100% of each booking.",
-    percentageFee: 0.0,
-    monthlyFee: 100.0,
-    flatFee: 0.0,
-  },
-} as const;