@bash-app/bash-common 2.0.0 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/prisma/schema.prisma

@@ -157,12 +157,12 @@ model BashEventPromoCode {
   bashEventId              String
   bashEvent                BashEvent @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
   code                     String
-  currency                 String    @default("USD")
+  stripeCouponId           String?
   discountAmountInCents    Int?
-  discountAmountPercentage Float?
+  discountAmountPercentage Int?
+  maxRedemptions           Int?
+  redeemBy                 DateTime?
   usedBy                   User[]
-  validStartDateTime       DateTime  @default(now())
-  validUntilDateTime       DateTime?
 
   @@unique([bashEventId, code])
 }

package/src/definitions.ts

@@ -157,6 +157,7 @@ export interface StripeCreateBashEventTicketsCheckoutSessionArgs {
   currency: string;
   paymentMethodType: string;
   ticketListStr: string;
+  promoCode?: string;
 }
 
 export interface StripeCreateBashEventDonationCheckoutSessionArgs {

package/src/utils/paymentUtils.ts

@@ -1,7 +1,27 @@
-import {TicketTier} from "@prisma/client";
+import {BashEventPromoCode, TicketTier} from "@prisma/client";
 import {BASH_FEE_PERCENTAGE, NumberOfTicketsForDate, PRICE_DOLLARS_AND_CENTS_RATIO} from "../definitions";
 
 
+/**
+ * Returns the amount of discount in dollars
+ * @param totalInDollars
+ * @param promoCode
+ */
+export function calculateDiscountFromPromoCode(totalInDollars: number, promoCode: BashEventPromoCode | undefined): number {
+  if (promoCode) {
+    if (promoCode.discountAmountInCents) {
+      const discountInDollars = convertCentsToDollars(promoCode.discountAmountInCents);
+      return Math.max(0, discountInDollars); // Ensure we don't discount more than 100%
+    }
+    if (promoCode.discountAmountPercentage) {
+      const discountInDollars = totalInDollars * (promoCode.discountAmountPercentage / 100);
+      return Math.min(totalInDollars, discountInDollars); // Ensure we don't discount more than 100%
+    }
+  }
+  return 0;
+}
+
+
 /**
  * Returns the total price based on a map where the keys are the ticketTierIds
  * @param ticketTiers
@@ -18,13 +38,13 @@ export function calculateTotalPriceWithoutTax(ticketTiers: TicketTier[], ticketL
   return total;
 }
 
-export function convertCentsToDollars(price: number | undefined): number {
+export function convertCentsToDollars(price: number | undefined | null): number {
   if (!price) {
     return 0;
   }
   return price / PRICE_DOLLARS_AND_CENTS_RATIO;
 }
-export function convertDollarsToCents(price: number | undefined): number {
+export function convertDollarsToCents(price: number | undefined | null): number {
   if (!price) {
     return 0;
   }