@bash-app/bash-common 30.96.0 → 30.97.1

package/src/extendedSchemas.ts

@@ -10,6 +10,7 @@ import {
     BlogPost,
     BlogTag,
     Checkout,
+    Competition,
     Contact,
     Coordinates,
     Demerit,
@@ -23,11 +24,13 @@ import {
     Notification,
     Organization,
     Prisma,
+    Prize,
     Recurrence,
     Reminder,
     Review,
     Service,
     ServiceAddon,
+    TaskComment,
     ServiceBooking,
     ServiceBookingAddOn,
     ServiceBookingCheckout,
@@ -153,6 +156,14 @@ export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
 
 export interface SponsoredEventExt extends SponsoredEvent {}
 
+export interface PrizeExt extends Prize {
+  winner?: PublicUser | null;
+}
+
+export interface CompetitionExt extends Competition {
+  prizes: PrizeExt[];
+}
+
 export interface BashEventExt extends BashEvent {
   targetAudience?: TargetAudience;
   amountOfGuests?: AmountOfGuests;
@@ -168,6 +179,7 @@ export interface BashEventExt extends BashEvent {
   venueServiceId?: string;
   venueOwner?: PublicUser;
   sponsorships?: SponsoredEventExt[];
+  competitions?: CompetitionExt[];
 }
 
 export const TICKET_TIER_DATA_TO_INCLUDE = {
@@ -205,6 +217,17 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
   media: true,
   eventTasks: true,
   invitations: true,
+  competitions: {
+    include: {
+      prizes: {
+        include: {
+          winner: {
+            select: FRONT_END_USER_DATA_TO_SELECT,
+          },
+        },
+      },
+    },
+  },
 } satisfies Prisma.BashEventInclude;
 
 export const BASH_EVENT_DATA_TO_CLONE = [
@@ -741,9 +764,20 @@ export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
   },
 } satisfies Prisma.NotificationInclude;
 
+export interface TaskCommentExt extends TaskComment {
+  author: PublicUser;
+}
+
+export const TASK_COMMENT_DATA_TO_INCLUDE = {
+  author: {
+    select: FRONT_END_USER_DATA_TO_SELECT,
+  },
+} satisfies Prisma.TaskCommentInclude;
+
 export interface EventTaskExt extends EventTask {
   creator: PublicUser;
   assignedTo?: PublicUser | null;
+  comments?: TaskCommentExt[];
 }
 
 export const EVENT_TASK_DATA_TO_INCLUDE = {
@@ -753,6 +787,12 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
   assignedTo: {
     select: FRONT_END_USER_DATA_TO_SELECT,
   },
+  comments: {
+    include: TASK_COMMENT_DATA_TO_INCLUDE,
+    orderBy: {
+      createdAt: 'desc' as const,
+    },
+  },
 } satisfies Prisma.EventTaskInclude;
 
 export interface InvitationExt extends Invitation {

package/src/index.ts

@@ -5,6 +5,7 @@ export * from "./utils/addressUtils";
 export * from "./utils/apiUtils";
 export * from "./utils/arrayUtils";
 export * from "./utils/awsS3Utils";
+export * from "./utils/bashCashPaymentUtils";
 export * from "./utils/contentFilterUtils";
 export * from "./utils/dateTimeUtils";
 export * from "./utils/objUtils";

package/src/utils/bashCashPaymentUtils.ts

@@ -0,0 +1,146 @@
+/**
+ * BashCash Payment Utilities
+ * Handles calculations and conversions for BashCash payment system
+ */
+
+// 1 BashCash credit = 1 cent = $0.01
+export const BASHCASH_TO_CENTS_RATE = 1;
+export const CENTS_TO_BASHCASH_RATE = 1;
+
+/**
+ * Convert USD cents to BashCash credits
+ * @param cents Amount in cents (e.g., 28750 = $287.50)
+ * @returns BashCash credits (e.g., 28750 credits)
+ */
+export function centsToBashCash(cents: number): number {
+  return Math.floor(cents * CENTS_TO_BASHCASH_RATE);
+}
+
+/**
+ * Convert BashCash credits to USD cents
+ * @param credits BashCash credits (e.g., 28750 credits)
+ * @returns Amount in cents (e.g., 28750 = $287.50)
+ */
+export function bashCashToCents(credits: number): number {
+  return Math.floor(credits * BASHCASH_TO_CENTS_RATE);
+}
+
+/**
+ * Format BashCash credits for display
+ * @param credits BashCash credits
+ * @returns Formatted string (e.g., "28,750 credits")
+ */
+export function formatBashCash(credits: number): string {
+  return `${credits.toLocaleString('en-US')} credit${credits === 1 ? '' : 's'}`;
+}
+
+/**
+ * Format BashCash credits with USD equivalent
+ * @param credits BashCash credits
+ * @returns Formatted string (e.g., "28,750 credits ($287.50)")
+ */
+export function formatBashCashWithUSD(credits: number): string {
+  const cents = bashCashToCents(credits);
+  const dollars = (cents / 100).toFixed(2);
+  return `${formatBashCash(credits)} ($${dollars})`;
+}
+
+/**
+ * Calculate maximum BashCash that can be used for a booking
+ * @param totalCents Total booking cost in cents
+ * @param userBalance User's BashCash balance in credits
+ * @returns Maximum BashCash credits that can be applied
+ */
+export function calculateMaxBashCashForBooking(
+  totalCents: number,
+  userBalance: number
+): number {
+  // No cap on BashCash usage for service bookings (can pay 100% if they have enough)
+  const maxPossible = centsToBashCash(totalCents);
+  return Math.min(maxPossible, userBalance);
+}
+
+/**
+ * Calculate split payment amounts
+ * @param totalCents Total booking cost in cents
+ * @param bashCashToUse BashCash credits user wants to apply
+ * @returns Object with bashCashCents and stripeCents
+ */
+export function calculateSplitPayment(
+  totalCents: number,
+  bashCashToUse: number
+): {
+  bashCashCents: number;
+  stripeCents: number;
+  bashCashCredits: number;
+} {
+  const bashCashCents = bashCashToCents(bashCashToUse);
+  const stripeCents = Math.max(0, totalCents - bashCashCents);
+  
+  return {
+    bashCashCents,
+    stripeCents,
+    bashCashCredits: bashCashToUse,
+  };
+}
+
+/**
+ * Validate BashCash payment
+ * @param bashCashToUse BashCash credits to use
+ * @param userBalance User's current balance
+ * @param totalCents Total booking cost
+ * @returns Validation result
+ */
+export function validateBashCashPayment(
+  bashCashToUse: number,
+  userBalance: number,
+  totalCents: number
+): {
+  valid: boolean;
+  errorMessage?: string;
+} {
+  if (bashCashToUse < 0) {
+    return {
+      valid: false,
+      errorMessage: "BashCash amount cannot be negative",
+    };
+  }
+
+  if (bashCashToUse > userBalance) {
+    return {
+      valid: false,
+      errorMessage: `Insufficient BashCash balance. You have ${formatBashCash(userBalance)}, but tried to use ${formatBashCash(bashCashToUse)}.`,
+    };
+  }
+
+  const bashCashCents = bashCashToCents(bashCashToUse);
+  if (bashCashCents > totalCents) {
+    return {
+      valid: false,
+      errorMessage: `BashCash amount ($${(bashCashCents / 100).toFixed(2)}) exceeds booking total ($${(totalCents / 100).toFixed(2)}).`,
+    };
+  }
+
+  return { valid: true };
+}
+
+/**
+ * Calculate BashCash cashback for a service booking (3%)
+ * @param amountCents Amount paid in cents
+ * @returns BashCash credits earned as cashback
+ */
+export function calculateServiceBookingCashback(amountCents: number): number {
+  const CASHBACK_RATE = 0.03; // 3% for service bookings
+  return Math.floor((amountCents * CASHBACK_RATE));
+}
+
+/**
+ * Calculate BashCash cashback for a ticket purchase (5%)
+ * @param amountCents Amount paid in cents
+ * @returns BashCash credits earned as cashback
+ */
+export function calculateTicketCashback(amountCents: number): number {
+  const CASHBACK_RATE = 0.05; // 5% for ticket purchases
+  return Math.floor((amountCents * CASHBACK_RATE));
+}
+

package/src/utils/service/apiServiceBookingApiUtils.ts

@@ -167,6 +167,7 @@ export function serviceGetPriceToBookFromBooking(
     daysTotalBeforeTaxesCents: booking.daysTotalATBCents,
     subtotalBeforeTaxesCents: booking.subtotalATBCents,
     totalBeforeTaxesCents: booking.totalATBCents,
+    totalWithFees: booking.totalATBCents, // Same as totalATBCents
   } as FrontendServiceGetPriceToBookResult;
 }
 

package/src/utils/service/frontendServiceBookingUtils.ts

@@ -77,6 +77,7 @@ export interface FrontendServiceGetPriceToBookResult {
   daysTotalBeforeTaxesCents: number;
   subtotalBeforeTaxesCents: number; //sum of all daysTotalBeforeTaxesCents, plus addOns/packages
   totalBeforeTaxesCents: number;
+  totalWithFees: number; // Total including all fees (same as totalBeforeTaxesCents, kept for compatibility)
 
   minimumTimeBlockHours?: number; //only valid on generalRate
 }
@@ -317,6 +318,7 @@ export function frontendServiceGetPriceToBookFees(
     daysTotalBeforeTaxesCents: daysTotalBeforeTaxesCents,
     subtotalBeforeTaxesCents: subtotalBeforeTaxesCents,
     totalBeforeTaxesCents: totalBeforeTaxesCents,
+    totalWithFees: totalBeforeTaxesCents, // Same as totalBeforeTaxesCents
     additionalFees: allAdditionalFees,
     addOns: usedAddons,
     minimumTimeBlockHours: minimumTimeBlockHours,