@bash-app/bash-common 10.7.0 → 10.9.0

package/src/utils/dateTimeUtils.ts

@@ -1,186 +1,186 @@
-import {DateType, DateValueType} from "react-tailwindcss-datepicker";
-import dayjs, {Dayjs} from "dayjs";
-import dayjsUtc from "dayjs/plugin/utc";
-import dayjsTimeZone from "dayjs/plugin/timezone";
-import {DateTimeArgType} from "../definitions";
-
-dayjs.extend(dayjsUtc);
-dayjs.extend(dayjsTimeZone);
-
-
-const PARSE_TIME_REG = /^(\d{1,2}):(\d{2}) ?([APM]{0,2})$/i;
-
-export const DATETIME_FORMAT_STANDARD = "MMM D, YYYY - h:mm A";
-export const DATETIME_FORMAT_ISO_LIKE = "YYYY-MM-DD HH:mm"
-export const DATE_FORMAT_STANDARD = "MM/DD/YYYY";
-export const DATE_FORMAT_ISO = "YYYY-MM-DD";
-export const TIME_FORMAT_AM_PM = "h:mm A";
-
-export interface ITime {
-  hours: number;
-  minutes: number;
-  ampm: string;
-}
-
-export function formatDateRange(startDateTimeArg: Date | null, endDateTimeArg: Date | null): string {
-  const startDateTime = ensureDateTimeIsLocalDateTime(startDateTimeArg).tz(dayjs.tz.guess());
-  const endDateTime = ensureDateTimeIsLocalDateTime(endDateTimeArg).tz(dayjs.tz.guess());
-  if (startDateTime.isSame(endDateTime, 'day')) {
-      return `${startDateTime.format(DATETIME_FORMAT_STANDARD)} to ${endDateTime.format(TIME_FORMAT_AM_PM)}`;
-  }
-
-  return `${startDateTime.format(DATETIME_FORMAT_STANDARD)} to ${endDateTime.format(DATETIME_FORMAT_STANDARD)}`;
-}
-
-export function ensureIsDateTime(possiblyADate: DateTimeArgType): Date | undefined {
-  if (!possiblyADate) {
-    return undefined;
-  }
-  return typeof possiblyADate === 'string' ? new Date(possiblyADate) : possiblyADate;
-}
-
-export function normalizeDate(validDate: Date | string | undefined | null): Date | undefined {
-  if (validDate) {
-    if (typeof validDate === 'string') {
-      validDate = new Date(validDate);
-    }
-    validDate.setHours(validDate.getHours(), validDate.getMinutes(), 0);
-    return validDate;
-  }
-}
-
-export function normalizeDates(dates: Date[]): Date[] {
-  return dates
-    .map((date): Date | undefined => {
-      return normalizeDate(date);
-    })
-    .filter((dateTime: Date | undefined): boolean => {
-      return !!dateTime
-    }) as Date[];
-}
-
-export function formatDateTimeToISODateTimeString(date: DateTimeArgType): string | undefined {
-  if (!date) {
-    return undefined;
-  }
-  date = new Date(date);
-  return date.toISOString();
-}
-
-export function dateWithinDateRange(date: DateTimeArgType, dateRange: DateValueType | undefined): boolean {
-  const startDate = dayjs(dateRange?.startDate).startOf('day').toDate();
-  const endDate = dayjs(dateRange?.endDate).endOf('day').toDate();
-
-  return compareDateTime(date, startDate) >= 0 &&
-    compareDateTime(date, endDate) < 0;
-}
-
-export function findLatestDateTime(date1Arg: DateTimeArgType, date2Arg: DateTimeArgType): Date | undefined {
-  const date1 = dateTimeTypeToDate(date1Arg);
-  const date2 = dateTimeTypeToDate(date2Arg);
-  return compareDateTime(date1, date2) > 0 ? date1 : date2;
-}
-
-function dateTimeTypeToDate(date: DateTimeArgType): Date | undefined {
-  if (typeof date === 'string') {
-    return new Date(date);
-  }
-  else {
-    return date ?? undefined;
-  }
-}
-
-export function isDateTimeLaterThanNow(date: DateTimeArgType): boolean {
-  return compareDateTime(date, new Date()) > 0;
-}
-
-export function areDateTimesEqual(date1: DateTimeArgType,
-                                  date2: DateTimeArgType): boolean {
-  return compareDateTime(date1, date2) === 0;
-}
-
-/**
- * Returns a 1 if date1 is later than date2; 0 if both dates are equal; -1 if date2 is later than date1
- * @param date1
- * @param date2
- */
-export function compareDateTime(date1: DateTimeArgType,
-                                date2: DateTimeArgType): number {
-  if (!date1 && !date2) {
-    return 0;
-  }
-  if (!date1) {
-    return -1;
-  }
-  if (!date2) {
-    return 1;
-  }
-  if (typeof date1 === 'string') {
-    date1 = new Date(date1);
-  }
-  if (typeof date2 === 'string') {
-    date2 = new Date(date2);
-  }
-
-  const date1Time = date1.getTime();
-  const date2Time = date2.getTime();
-
-  if (date1Time > date2Time) {
-    return 1;
-  }
-  if (date1Time === date2Time) {
-    return 0;
-  }
-  else {
-    return -1;
-  }
-}
-
-export function setDateButPreserveTime(dateArg: DateType, dateWithTheTimeYouWantToKeep: DateType | undefined): Date {
-  const date = dayjs(dateArg).format(DATE_FORMAT_ISO);
-  const time = dayjs(dateWithTheTimeYouWantToKeep).format(TIME_FORMAT_AM_PM);
-  const combinedDateTime = dayjs(date + " " + time).toDate();
-  return combinedDateTime;
-}
-
-export function setTimeOnDate(date: DateType | Date | undefined, parsedTime: ITime): Date {
-  const dateTime = new Date(date ?? Date.now());
-  const parsedTimeDate = new Date();
-  parsedTimeDate.setHours(parsedTime.hours, parsedTime.minutes, 0); // Will change the date depending on time; corrected later
-  const correctTimeOnDate = setDateButPreserveTime(dateTime, parsedTimeDate);
-  return correctTimeOnDate;
-}
-
-export function ensureDateTimeIsLocalDateTime(dateArg: DateType | Dayjs | undefined): Dayjs {
-  if (dayjs(dateArg).isUTC()) {
-    const dateLocalTimeZone = dayjs(dateArg);
-    return dateLocalTimeZone;
-  }
-  else {
-    return dayjs(dateArg ?? Date.now());
-  }
-}
-
-export function formatDateTimeToTimeString(date: Date | string | undefined | null): string {
-  date = new Date(date ?? Date.now());
-  const result = dayjs(date).format("h:mm A");
-  return result;
-}
-
-export function parseTimeString(timeStr: string): ITime | null {
-  const match = timeStr.match(PARSE_TIME_REG);
-
-  if (match) {
-    const hours = parseInt(match[1], 10);
-    const minutes = parseInt(match[2], 10);
-    const ampm = match[3].toUpperCase();
-
-    if ((hours >= 0 && hours <= 12) && (minutes >= 0 && minutes <= 59) && (ampm === 'AM' || ampm === 'PM')) {
-      return {
-        hours: ampm === 'PM' && hours < 12 ? hours + 12 : hours,
-        minutes,
-        ampm };
-    }
-  }
-  return null;
-}
+import {DateType, DateValueType} from "react-tailwindcss-datepicker";
+import dayjs, {Dayjs} from "dayjs";
+import dayjsUtc from "dayjs/plugin/utc";
+import dayjsTimeZone from "dayjs/plugin/timezone";
+import {DateTimeArgType} from "../definitions";
+
+dayjs.extend(dayjsUtc);
+dayjs.extend(dayjsTimeZone);
+
+
+const PARSE_TIME_REG = /^(\d{1,2}):(\d{2}) ?([APM]{0,2})$/i;
+
+export const DATETIME_FORMAT_STANDARD = "MMM D, YYYY - h:mm A";
+export const DATETIME_FORMAT_ISO_LIKE = "YYYY-MM-DD HH:mm"
+export const DATE_FORMAT_STANDARD = "MM/DD/YYYY";
+export const DATE_FORMAT_ISO = "YYYY-MM-DD";
+export const TIME_FORMAT_AM_PM = "h:mm A";
+
+export interface ITime {
+  hours: number;
+  minutes: number;
+  ampm: string;
+}
+
+export function formatDateRange(startDateTimeArg: Date | null, endDateTimeArg: Date | null): string {
+  const startDateTime = ensureDateTimeIsLocalDateTime(startDateTimeArg).tz(dayjs.tz.guess());
+  const endDateTime = ensureDateTimeIsLocalDateTime(endDateTimeArg).tz(dayjs.tz.guess());
+  if (startDateTime.isSame(endDateTime, 'day')) {
+      return `${startDateTime.format(DATETIME_FORMAT_STANDARD)} to ${endDateTime.format(TIME_FORMAT_AM_PM)}`;
+  }
+
+  return `${startDateTime.format(DATETIME_FORMAT_STANDARD)} to ${endDateTime.format(DATETIME_FORMAT_STANDARD)}`;
+}
+
+export function ensureIsDateTime(possiblyADate: DateTimeArgType): Date | undefined {
+  if (!possiblyADate) {
+    return undefined;
+  }
+  return typeof possiblyADate === 'string' ? new Date(possiblyADate) : possiblyADate;
+}
+
+export function normalizeDate(validDate: Date | string | undefined | null): Date | undefined {
+  if (validDate) {
+    if (typeof validDate === 'string') {
+      validDate = new Date(validDate);
+    }
+    validDate.setHours(validDate.getHours(), validDate.getMinutes(), 0);
+    return validDate;
+  }
+}
+
+export function normalizeDates(dates: Date[]): Date[] {
+  return dates
+    .map((date): Date | undefined => {
+      return normalizeDate(date);
+    })
+    .filter((dateTime: Date | undefined): boolean => {
+      return !!dateTime
+    }) as Date[];
+}
+
+export function formatDateTimeToISODateTimeString(date: DateTimeArgType): string | undefined {
+  if (!date) {
+    return undefined;
+  }
+  date = new Date(date);
+  return date.toISOString();
+}
+
+export function dateWithinDateRange(date: DateTimeArgType, dateRange: DateValueType | undefined): boolean {
+  const startDate = dayjs(dateRange?.startDate).startOf('day').toDate();
+  const endDate = dayjs(dateRange?.endDate).endOf('day').toDate();
+
+  return compareDateTime(date, startDate) >= 0 &&
+    compareDateTime(date, endDate) < 0;
+}
+
+export function findLatestDateTime(date1Arg: DateTimeArgType, date2Arg: DateTimeArgType): Date | undefined {
+  const date1 = dateTimeTypeToDate(date1Arg);
+  const date2 = dateTimeTypeToDate(date2Arg);
+  return compareDateTime(date1, date2) > 0 ? date1 : date2;
+}
+
+function dateTimeTypeToDate(date: DateTimeArgType): Date | undefined {
+  if (typeof date === 'string') {
+    return new Date(date);
+  }
+  else {
+    return date ?? undefined;
+  }
+}
+
+export function isDateTimeLaterThanNow(date: DateTimeArgType): boolean {
+  return compareDateTime(date, new Date()) > 0;
+}
+
+export function areDateTimesEqual(date1: DateTimeArgType,
+                                  date2: DateTimeArgType): boolean {
+  return compareDateTime(date1, date2) === 0;
+}
+
+/**
+ * Returns a 1 if date1 is later than date2; 0 if both dates are equal; -1 if date2 is later than date1
+ * @param date1
+ * @param date2
+ */
+export function compareDateTime(date1: DateTimeArgType,
+                                date2: DateTimeArgType): number {
+  if (!date1 && !date2) {
+    return 0;
+  }
+  if (!date1) {
+    return -1;
+  }
+  if (!date2) {
+    return 1;
+  }
+  if (typeof date1 === 'string') {
+    date1 = new Date(date1);
+  }
+  if (typeof date2 === 'string') {
+    date2 = new Date(date2);
+  }
+
+  const date1Time = date1.getTime();
+  const date2Time = date2.getTime();
+
+  if (date1Time > date2Time) {
+    return 1;
+  }
+  if (date1Time === date2Time) {
+    return 0;
+  }
+  else {
+    return -1;
+  }
+}
+
+export function setDateButPreserveTime(dateArg: DateType, dateWithTheTimeYouWantToKeep: DateType | undefined): Date {
+  const date = dayjs(dateArg).format(DATE_FORMAT_ISO);
+  const time = dayjs(dateWithTheTimeYouWantToKeep).format(TIME_FORMAT_AM_PM);
+  const combinedDateTime = dayjs(date + " " + time).toDate();
+  return combinedDateTime;
+}
+
+export function setTimeOnDate(date: DateType | Date | undefined, parsedTime: ITime): Date {
+  const dateTime = new Date(date ?? Date.now());
+  const parsedTimeDate = new Date();
+  parsedTimeDate.setHours(parsedTime.hours, parsedTime.minutes, 0); // Will change the date depending on time; corrected later
+  const correctTimeOnDate = setDateButPreserveTime(dateTime, parsedTimeDate);
+  return correctTimeOnDate;
+}
+
+export function ensureDateTimeIsLocalDateTime(dateArg: DateType | Dayjs | undefined): Dayjs {
+  if (dayjs(dateArg).isUTC()) {
+    const dateLocalTimeZone = dayjs(dateArg);
+    return dateLocalTimeZone;
+  }
+  else {
+    return dayjs(dateArg ?? Date.now());
+  }
+}
+
+export function formatDateTimeToTimeString(date: Date | string | undefined | null): string {
+  date = new Date(date ?? Date.now());
+  const result = dayjs(date).format("h:mm A");
+  return result;
+}
+
+export function parseTimeString(timeStr: string): ITime | null {
+  const match = timeStr.match(PARSE_TIME_REG);
+
+  if (match) {
+    const hours = parseInt(match[1], 10);
+    const minutes = parseInt(match[2], 10);
+    const ampm = match[3].toUpperCase();
+
+    if ((hours >= 0 && hours <= 12) && (minutes >= 0 && minutes <= 59) && (ampm === 'AM' || ampm === 'PM')) {
+      return {
+        hours: ampm === 'PM' && hours < 12 ? hours + 12 : hours,
+        minutes,
+        ampm };
+    }
+  }
+  return null;
+}

package/src/utils/paymentUtils.ts

@@ -1,56 +1,56 @@
-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
- * @param ticketList
- */
-export function calculateTotalPriceWithoutTax(ticketTiers: TicketTier[], ticketList: Map<string, NumberOfTicketsForDate[]>): number {
-  let total = 0;
-  ticketTiers.forEach((tier: TicketTier) => {
-    const ticketListNumAndDate = ticketList.get(tier.id);
-    ticketListNumAndDate?.forEach((numAndDate: NumberOfTicketsForDate) => {
-      total += tier.price * (numAndDate.numberOfTickets ?? 0);
-    });
-  });
-  return total;
-}
-
-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 | null): number {
-  if (!price) {
-    return 0;
-  }
-  return price * PRICE_DOLLARS_AND_CENTS_RATIO;
-}
-
-export function calculateBashAppFee(total: number): number {
-  return parseFloat((total * BASH_FEE_PERCENTAGE).toFixed(2));
-}
+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
+ * @param ticketList
+ */
+export function calculateTotalPriceWithoutTax(ticketTiers: TicketTier[], ticketList: Map<string, NumberOfTicketsForDate[]>): number {
+  let total = 0;
+  ticketTiers.forEach((tier: TicketTier) => {
+    const ticketListNumAndDate = ticketList.get(tier.id);
+    ticketListNumAndDate?.forEach((numAndDate: NumberOfTicketsForDate) => {
+      total += tier.price * (numAndDate.numberOfTickets ?? 0);
+    });
+  });
+  return total;
+}
+
+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 | null): number {
+  if (!price) {
+    return 0;
+  }
+  return price * PRICE_DOLLARS_AND_CENTS_RATIO;
+}
+
+export function calculateBashAppFee(total: number): number {
+  return parseFloat((total * BASH_FEE_PERCENTAGE).toFixed(2));
+}

package/src/utils/qrCodeUtils.ts

@@ -1,23 +1,23 @@
-import QRCode from "qrcode";
-import { TICKET_DETAILS } from "../definitions";
-
-export function bashEventPrismaCheckoutQrCodeUrl(bashEventId: string | undefined | null, prismaCheckoutId: string | undefined | null): string {
-  return `${TICKET_DETAILS}/${bashEventId}/${prismaCheckoutId}`;
-}
-
-export function bashEventQrCodeUrl(bashEventId: string | undefined | null, ticketTierId?: string | undefined | null, ticketId?: string | undefined | null): string {
-  const baseUrl = `${TICKET_DETAILS}/${bashEventId}`;
-  if (ticketId) {
-    return `${baseUrl}/ticket/${ticketId}`;
-  }
-  else if (ticketTierId) {
-    return `${baseUrl}/ticket-tier/${ticketTierId}`;
-  }
-  return baseUrl;
-}
-
-export async function createQrCodeImage(qrData: string): Promise<string> {
-  return QRCode.toDataURL(qrData, {
-    errorCorrectionLevel: 'high',
-  });
-}
+import QRCode from "qrcode";
+import { TICKET_DETAILS } from "../definitions";
+
+export function bashEventPrismaCheckoutQrCodeUrl(bashEventId: string | undefined | null, prismaCheckoutId: string | undefined | null): string {
+  return `${TICKET_DETAILS}/${bashEventId}/${prismaCheckoutId}`;
+}
+
+export function bashEventQrCodeUrl(bashEventId: string | undefined | null, ticketTierId?: string | undefined | null, ticketId?: string | undefined | null): string {
+  const baseUrl = `${TICKET_DETAILS}/${bashEventId}`;
+  if (ticketId) {
+    return `${baseUrl}/ticket/${ticketId}`;
+  }
+  else if (ticketTierId) {
+    return `${baseUrl}/ticket-tier/${ticketTierId}`;
+  }
+  return baseUrl;
+}
+
+export async function createQrCodeImage(qrData: string): Promise<string> {
+  return QRCode.toDataURL(qrData, {
+    errorCorrectionLevel: 'high',
+  });
+}