@bash-app/bash-common 29.65.0 → 29.67.0

package/package.json

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

package/prisma/schema.prisma

@@ -191,7 +191,8 @@ model BashEvent {
   title                           String
   creatorId                       String
   creator                         User                      @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
-  isApproved                      Boolean?
+  createdAt                       DateTime                  @default(now())
+  isApproved                      Boolean?                  @default(false)
   description                     String?
   eventType                       String                    @default("Other")
   startDateTime                   DateTime?                 @default(now())
@@ -244,7 +245,6 @@ model BashEvent {
   venue                           Venue?                    @relation(fields: [venueId], references: [id])
   userPromoCodeRedemption         UserPromoCodeRedemption[]
   averageRating                   Float?                    @default(0)
-  createdAt                       DateTime                  @default(now()) // Timestamp for when the review was created
 }
 
 model Coordinates {
@@ -612,11 +612,17 @@ enum Education {
   NoPreference
 }
 
+enum UserIntent {
+  EventSeeker
+  EventOrganizer
+  VenueOwner
+}
+
 enum BashStatus {
   Draft
+  Pending
   PreSale
   Published
-  Pending
   Finished
 }
 
@@ -856,6 +862,7 @@ model User {
   stripeAccountId               String?                   @unique
   isSuperUser                   Boolean                   @default(false)
   // isSuspended                   Boolean                   @default(false)
+  intent  UserIntent?
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
@@ -1517,8 +1524,8 @@ model ServiceRate {
 // if isAvailable is false it is closed
 model ServiceSpecialRates {
   id        String   @id @default(cuid())
-  startDate DateTime @db.Date
-  endDate   DateTime @db.Date
+  startDate DateTime //needs to be DateTime and not just Date because of timezone conversions
+  endDate   DateTime
 
   serviceRateId String?
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
@@ -1535,10 +1542,11 @@ model ServiceSpecialRates {
 // can have special rates on different days of the year (single or range)
 // free trial period with promo code (1 or 2 months of listing for free)
 model ServiceDailyRates {
-  id        String    @id @default(cuid())
-  dayOfWeek DayOfWeek
-  startTime DateTime  @db.Time
-  endTime   DateTime  @db.Time
+  id             String    @id @default(cuid())
+  startDayOfWeek DayOfWeek
+  startTime      DateTime  @db.Time
+  endDayOfWeek   DayOfWeek
+  endTime        DateTime  @db.Time
 
   serviceRateId String?
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)

package/src/definitions.ts

@@ -21,7 +21,6 @@ import {
   BashEventExt,
 } from "./extendedSchemas";
 import { ServiceSubscriptionTier } from "./utils/userSubscriptionUtils";
-import Stripe from "stripe";
 
 export const PASSWORD_MIN_LENGTH = 8 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(
@@ -303,6 +302,7 @@ export interface ApiResult<T, P extends ErrorDataType = ErrorDataType> {
   error?: string;
   errorType?: ApiErrorType;
   errorData?: P;
+  rawResponse?: any;
 }
 
 export enum ApiErrorType {
@@ -490,6 +490,7 @@ export interface IMediaUploadArgs {
   mimetype: string;
   idOfLinkedPrismaEntry: string;
   assetKey: string;
+  fileBuffer?: Buffer;
 }
 
 export interface IPreSignedUrlArgs {
@@ -536,6 +537,8 @@ export const DressTagsToString: { [key in BashEventDressTags]: string } = {
 //   [ServicesTags.AwardRecipient]: "Award recipient"
 // }
 
+export type DayOfWeekIdx = 1 | 2 | 3 | 4 | 5 | 6 | 7;
+
 export const DayOfWeekToString: { [key in DayOfWeek]: string } = {
   [DayOfWeek.Sunday]: "S",
   [DayOfWeek.Monday]: "M",
@@ -546,6 +549,16 @@ export const DayOfWeekToString: { [key in DayOfWeek]: string } = {
   [DayOfWeek.Saturday]: "S",
 };
 
+export const DayOfWeekToIdx: { [key in DayOfWeek]: DayOfWeekIdx } = {
+  [DayOfWeek.Sunday]: 1,
+  [DayOfWeek.Monday]: 2,
+  [DayOfWeek.Tuesday]: 3,
+  [DayOfWeek.Wednesday]: 4,
+  [DayOfWeek.Thursday]: 5,
+  [DayOfWeek.Friday]: 6,
+  [DayOfWeek.Saturday]: 7,
+};
+
 export const YearsOfExperienceToString: { [key in YearsOfExperience]: string } =
   {
     [YearsOfExperience.LessThanOneYear]: "Less than one year",

package/src/extendedSchemas.ts

@@ -43,13 +43,13 @@ import {
   ServiceRatesAssociation,
   ServiceRate,
   ServiceDailyRates,
-  ServiceSpecialRates,
   ServiceAddon,
   ServicePackage,
   UserSubscription,
   SocialMediaProfile,
   SocialMediaPlatform,
   ServiceSubscriptionCounts,
+  ServiceSpecialRates,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
 
@@ -100,10 +100,10 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
   // documentID: true,
   reviews: true,
   contacts: true,
-  accepted: true,       
-  boughtTicket: true,  
-  noPay: true,          
-  supportedEvent: true, 
+  accepted: true,
+  boughtTicket: true,
+  noPay: true,
+  supportedEvent: true,
 } satisfies Prisma.UserSelect;
 
 export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
@@ -508,7 +508,7 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
 export interface InvitationExt extends Invitation {
   creator: PublicUser; // Include full details of the creator
   sentTo?: PublicUser; // Full details of the user the invitation was sent to
-  associatedBash?: Partial<AssociatedBashExt> | null
+  associatedBash?: Partial<AssociatedBashExt> | null;
   tickets: Ticket[]; // Tickets associated with the invitation
 }
 

package/src/index.ts

@@ -17,3 +17,4 @@ export * from "./utils/service/serviceUtils";
 export * from "./utils/service/venueUtils";
 export * from "./utils/stripeAccountUtils";
 export * from "./utils/entityUtils";
+// export * from "./utils/luxonUtils";

package/src/utils/dateTimeUtils.ts

@@ -1,17 +1,16 @@
-import {DateType, DateValueType} from "react-tailwindcss-datepicker";
-import dayjs, {Dayjs} from "dayjs";
+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";
+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 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";
@@ -19,27 +18,62 @@ export const TIME_FORMAT_AM_PM = "h:mm A";
 export interface ITime {
   hours: number;
   minutes: number;
-  ampm: 'AM' | 'PM';
+  ampm: "AM" | "PM";
 }
 
-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)}`;
+export function formatDateRangeBasic(
+  startDateTimeArg: Date | null,
+  endDateTimeArg: Date | null
+): string {
+  const startDateTime = dayjs(startDateTimeArg).tz(dayjs.tz.guess());
+  const endDateTime = dayjs(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)}`;
+  return `${startDateTime.format(
+    DATETIME_FORMAT_STANDARD
+  )} to ${endDateTime.format(DATETIME_FORMAT_STANDARD)}`;
 }
 
-export function ensureIsDateTime(possiblyADate: DateTimeArgType): Date | undefined {
+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;
+  return typeof possiblyADate === "string"
+    ? new Date(possiblyADate)
+    : possiblyADate;
 }
 
-export function normalizeDate(validDate: Date | string | undefined | null): Date | undefined {
+//convert to utc and round minutes
+export function normalizeDate(
+  validDate: Date | string | undefined | null
+): Date | undefined {
   if (!validDate) return undefined;
 
   const date = new Date(validDate);
@@ -52,14 +86,17 @@ export function normalizeDate(validDate: Date | string | undefined | null): Date
   // Normalize to UTC and start of minute
   return dayjs(date).utc().startOf("minute").toDate();
 }
-export function normalizeDates(dates: (Date | string | undefined | null)[]): Date[] {
+export function normalizeDates(
+  dates: (Date | string | undefined | null)[]
+): Date[] {
   return dates
     .map((date) => normalizeDate(date)) // Normalize each date
     .filter((date): date is Date => !!date); // Filter out invalid dates
 }
 
-
-export function formatDateTimeToISODateTimeString(date: DateTimeArgType): string | undefined {
+export function formatDateTimeToISODateTimeString(
+  date: DateTimeArgType
+): string | undefined {
   if (!date) {
     return undefined;
   }
@@ -67,25 +104,31 @@ export function formatDateTimeToISODateTimeString(date: DateTimeArgType): string
   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();
+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;
+  return (
+    compareDateTime(date, startDate) >= 0 && compareDateTime(date, endDate) < 0
+  );
 }
 
-export function findLatestDateTime(date1Arg: DateTimeArgType, date2Arg: DateTimeArgType): Date | undefined {
+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') {
+  if (typeof date === "string") {
     return new Date(date);
-  }
-  else {
+  } else {
     return date ?? undefined;
   }
 }
@@ -94,8 +137,10 @@ export function isDateTimeLaterThanNow(date: DateTimeArgType): boolean {
   return compareDateTime(date, new Date()) > 0;
 }
 
-export function areDateTimesEqual(date1: DateTimeArgType,
-                                  date2: DateTimeArgType): boolean {
+export function areDateTimesEqual(
+  date1: DateTimeArgType,
+  date2: DateTimeArgType
+): boolean {
   return compareDateTime(date1, date2) === 0;
 }
 
@@ -104,8 +149,10 @@ export function areDateTimesEqual(date1: DateTimeArgType,
  * @param date1
  * @param date2
  */
-export function compareDateTime(date1: DateTimeArgType,
-                                date2: DateTimeArgType): number {
+export function compareDateTime(
+  date1: DateTimeArgType,
+  date2: DateTimeArgType
+): number {
   if (!date1 && !date2) {
     return 0;
   }
@@ -115,10 +162,10 @@ export function compareDateTime(date1: DateTimeArgType,
   if (!date2) {
     return 1;
   }
-  if (typeof date1 === 'string') {
+  if (typeof date1 === "string") {
     date1 = new Date(date1);
   }
-  if (typeof date2 === 'string') {
+  if (typeof date2 === "string") {
     date2 = new Date(date2);
   }
 
@@ -130,8 +177,7 @@ export function compareDateTime(date1: DateTimeArgType,
   }
   if (date1Time === date2Time) {
     return 0;
-  }
-  else {
+  } else {
     return -1;
   }
 }
@@ -141,8 +187,13 @@ export function setDateButPreserveTime(
   dateWithTheTimeYouWantToKeep: DateType | undefined
 ): Date {
   if (!dateArg || !dateWithTheTimeYouWantToKeep) {
-    console.error("Invalid arguments:", { dateArg, dateWithTheTimeYouWantToKeep });
-    throw new Error("Both dateArg and dateWithTheTimeYouWantToKeep are required.");
+    console.error("Invalid arguments:", {
+      dateArg,
+      dateWithTheTimeYouWantToKeep,
+    });
+    throw new Error(
+      "Both dateArg and dateWithTheTimeYouWantToKeep are required."
+    );
   }
 
   // Get local timezone
@@ -150,7 +201,9 @@ export function setDateButPreserveTime(
 
   // Format date and time parts
   const datePart = dayjs(dateArg).tz(localTimeZone).format("YYYY-MM-DD"); // Local date
-  const timePart = dayjs(dateWithTheTimeYouWantToKeep).tz(localTimeZone).format("HH:mm"); // Local time
+  const timePart = dayjs(dateWithTheTimeYouWantToKeep)
+    .tz(localTimeZone)
+    .format("HH:mm"); // Local time
 
   // Combine into an ISO string
   const combinedDateTimeString = `${datePart}T${timePart}`;
@@ -162,7 +215,9 @@ export function setDateButPreserveTime(
   });
 
   // Convert to UTC
-  const combinedDateTime = dayjs.tz(combinedDateTimeString, localTimeZone).toDate();
+  const combinedDateTime = dayjs
+    .tz(combinedDateTimeString, localTimeZone)
+    .toDate();
   if (isNaN(combinedDateTime.getTime())) {
     console.error("Invalid combined datetime:", combinedDateTimeString);
     throw new Error("Invalid date or time format.");
@@ -172,8 +227,10 @@ export function setDateButPreserveTime(
   return combinedDateTime;
 }
 
-
-export function setTimeOnDate(date: DateType | Date | undefined, parsedTime: ITime | null): Date {
+export function setTimeOnDate(
+  date: DateType | Date | undefined,
+  parsedTime: ITime | null
+): Date {
   const isValidDate = dayjs(date).isValid();
   const dateTime = new Date(isValidDate && date ? date : Date.now());
   if (parsedTime) {
@@ -185,23 +242,28 @@ export function setTimeOnDate(date: DateType | Date | undefined, parsedTime: ITi
   return dateTime;
 }
 
-export function ensureDateTimeIsLocalDateTime(dateArg: DateType | Dayjs | undefined): Dayjs {
+export function ensureDateTimeIsLocalDateTime(
+  dateArg: DateType | Dayjs | undefined
+): Dayjs {
   if (dayjs(dateArg).isUTC()) {
     const dateLocalTimeZone = dayjs(dateArg);
     return dateLocalTimeZone;
-  }
-  else {
+  } else {
     return dayjs(dateArg ?? Date.now());
   }
 }
 
-export function formatDateTimeToTimeString(date: Date | string | undefined | null): string {
+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 formatDateTimeToTimeString24hr(date: Date | string | undefined | null): string {
+export function formatDateTimeToTimeString24hr(
+  date: Date | string | undefined | null
+): string {
   date = new Date(date ?? Date.now());
   const result = dayjs(date).format("h:mm");
   return result;
@@ -215,24 +277,22 @@ export function parseTimeString(timeStr: string): ITime | null {
     const minutes = parseInt(match[2], 10);
     const ampm = match[3].toUpperCase();
 
-    if ((hours >= 0 && hours <= 12) && (minutes >= 0 && minutes <= 59) && (ampm === 'AM' || ampm === 'PM')) {
+    if (
+      hours >= 0 &&
+      hours <= 12 &&
+      minutes >= 0 &&
+      minutes <= 59 &&
+      (ampm === "AM" || ampm === "PM")
+    ) {
       return {
-        hours: ampm === 'PM' && hours < 12 ? hours + 12 : hours,
+        hours: ampm === "PM" && hours < 12 ? hours + 12 : hours,
         minutes,
-        ampm };
+        ampm,
+      };
     }
   }
   return null;
 }
-
-export function localDateToUTC(date: Date): Date {
-  const newDate = new Date(date.getUTCFullYear(), date.getUTCMonth(),
-              date.getUTCDate(), date.getUTCHours(),
-              date.getUTCMinutes(), date.getUTCSeconds());
-
-  return newDate;
+export function timestampMinutesFromNow(minutes: number): number {
+  return Math.floor(new Date().getTime() / 1000 + minutes * 60);
 }
-
-export function timestampMinutseFromNow(minutes: number): number {
-  return Math.floor((new Date().getTime() / 1000) + (minutes * 60));
-}

package/src/utils/luxonUtils.ts

@@ -1,86 +0,0 @@
-// import { DayOfWeek } from "@prisma/client";
-// import { DateTime, Interval } from "luxon";
-// import { DayOfWeekIdx, DayOfWeekToIdx } from "../definitions";
-
-// export function dayOfWeekToIdx(dayOfWeek: DayOfWeek | DayOfWeekIdx): number {
-//   if (typeof dayOfWeek === "number") {
-//     return dayOfWeek;
-//   } else if (typeof dayOfWeek === "string") {
-//     return DayOfWeekToIdx[dayOfWeek];
-//   } else {
-//     throw new Error(`dayOfWeekToIdx: unhandled case`);
-//   }
-// }
-
-// export function dateTimeFromDayTime(
-//   dayOfWeek: DayOfWeek | DayOfWeekIdx,
-//   hour: number = 0,
-//   minute: number = 0
-// ): DateTime {
-//   //use date where first day of month is a known sunday
-//   return DateTime.fromObject({
-//     year: 2020,
-//     month: 1,
-//     day: dayOfWeekToIdx(dayOfWeek),
-//     hour: hour,
-//     minute: minute,
-//   });
-// }
-
-// export type DateTimeTime = Pick<DateTime, "hour" | "minute">;
-// export type DateTimeDate = Pick<DateTime, "year" | "month" | "day">;
-
-// export function dateTimeToTimeComponents(dateTime: DateTime): DateTimeTime {
-//   return {
-//     hour: dateTime.hour,
-//     minute: dateTime.minute,
-//   };
-// }
-
-// export function dateTimeToDateComponents(dateTime: DateTime): DateTimeDate {
-//   return {
-//     year: dateTime.year,
-//     month: dateTime.month,
-//     day: dateTime.day,
-//   };
-// }
-
-// export function objectHasDate(obj: object) {
-//   return "year" in obj;
-// }
-
-// export function objectHasTime(obj: object) {
-//   return "hour" in obj;
-// }
-
-// export function dateTimeSetTime(
-//   dateTime: DateTime,
-//   time: DateTimeTime | DateTime = { hour: 0, minute: 0 }
-// ): DateTime {
-//   const timeComp = objectHasTime(time)
-//     ? dateTimeToTimeComponents(time as DateTime)
-//     : time;
-//   return dateTime.set(timeComp);
-// }
-
-// export function dateTimeSetDate(
-//   dateTime: DateTime,
-//   date: DateTimeDate | DateTime = { year: 2020, month: 1, day: 1 }
-// ): DateTime {
-//   const dateComp = objectHasDate(date)
-//     ? dateTimeToTimeComponents(date as DateTime)
-//     : date;
-//   return dateTime.set(dateComp);
-// }
-
-// export function dateTimeLocalFromUTCDate(date: Date) {
-//   return DateTime.fromJSDate(date).toLocal();
-// }
-
-// export function dateTimeLocalToUTCDate(dateTime: DateTime) {
-//   return dateTime.toUTC().toJSDate();
-// }
-
-// export function dateTimeFormatTime(dateTime: DateTime) {
-//   return dateTime.toFormat("HH:MM");
-// }