@bash-app/bash-common 30.2.0 → 30.4.0

package/src/extendedSchemas.ts

@@ -21,7 +21,6 @@ import {
   ServiceLink,
   Link,
   Venue,
-  // Availability,
   TargetAudience,
   Vendor,
   EventService,
@@ -33,12 +32,7 @@ import {
   Prisma,
   ServiceRange,
   StripeAccount,
-  VisibilityPreference,
-  BashEventType,
   Coordinates,
-  // Rate,
-  GoogleReview,
-  ServiceTypes,
   ServiceRatesAssociation,
   ServiceRate,
   ServiceDailyRates,
@@ -54,6 +48,8 @@ import {
   ServiceBookingPackage,
   ServiceBookingCheckout,
   ServiceBooking,
+  ServiceBookingPriceBreakdown,
+  ServiceBookingFee,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE } from "./definitions";
 import { serviceKeysArray } from "./utils/service/serviceUtils";
@@ -198,6 +194,23 @@ export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<
 >[] = ["creator", "eventTasks", "tickets", "targetAudience", "amountOfGuests"];
 
 //---------------Services------------------
+export const PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT = {
+  logo: true,
+  logoId: true,
+  createdAt: true,
+  updatedAt: true,
+} satisfies Prisma.StripeAccountSelect;
+
+export const STRIPE_ACCOUNT_DATA_TO_INCLUDE = {
+  logo: true,
+  owner: {
+    select: FRONT_END_USER_DATA_TO_SELECT,
+  },
+  userSubscription: {
+    select: PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT,
+  },
+} satisfies Prisma.StripeAccountInclude;
+
 export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
   serviceAddons: true,
 } satisfies Prisma.ServicePackageInclude;
@@ -225,6 +238,79 @@ export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
   media: true,
 } satisfies Prisma.ServiceRatesAssociationInclude;
 
+export const SERVICE_DATA_TO_INCLUDE = {
+  creator: {
+    select: FRONT_END_USER_DATA_TO_SELECT,
+  },
+  owner: {
+    select: FRONT_END_USER_DATA_TO_SELECT,
+  },
+  targetAudience: true,
+  media: true,
+  stripeAccount: {
+    // ...STRIPE_ACCOUNT_DATA_TO_INCLUDE,
+    select: PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT,
+  },
+  serviceLinks: {
+    include: SERVICE_LINK_DATA_TO_INCLUDE,
+  },
+  serviceRatesAssociation: {
+    include: SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE,
+  },
+  // bookings: {
+  //   include: SERVICE_BOOKING_PRIVATE_DATA_TO_INCLUDE, //make sure only to include owned bookedDays
+  // },
+  bashEvent: {
+    include: BASH_EVENT_DATA_TO_INCLUDE,
+  },
+  // bookedCheckouts: {
+  //   include: SERVICE_BOOKING_CHECKOUT_DATA_TO_INCLUDE, //make sure only to include owned checkouts
+  // },
+} satisfies Prisma.ServiceInclude;
+
+//full service data to include, includes specific service data
+export const SERVICE_FULL_DATA_TO_INCLUDE = {
+  ...SERVICE_DATA_TO_INCLUDE,
+  ...createAllTrueObject(serviceKeysArray),
+} satisfies Prisma.ServiceInclude;
+
+export const SERVICE_FULL_DATA_TO_CLONE = [
+  "media",
+  "targetAudience",
+  "serviceLinks",
+  // ...Object.values(specificServiceMap)
+] as const;
+
+type ServiceExtMinusDataToCloneType = Omit<
+  ServiceExt,
+  UnionFromArray<typeof SERVICE_FULL_DATA_TO_CLONE>
+>;
+export const SERVICE_FULL_DATA_TO_REMOVE: RemoveCommonProperties<
+  Service,
+  ServiceExtMinusDataToCloneType
+>[] = [
+  "creator",
+  "owner",
+  // "bookings"
+] as const;
+
+export interface StripeAccountExt extends StripeAccount {
+  logo?: Media | null;
+}
+
+export const VENUE_DATA_TO_CLONE = [] as const;
+
+type VenueExtMinusDataToCloneType = Omit<
+  Venue,
+  UnionFromArray<typeof VENUE_DATA_TO_CLONE>
+>;
+export const VENUE_DATA_TO_REMOVE: RemoveCommonProperties<
+  Venue,
+  VenueExtMinusDataToCloneType
+>[] = [
+  // 'bashEvents',
+] as const;
+
 export interface ServiceRateExt extends ServiceRate {
   serviceSpecialRates?: ServiceSpecialRates;
   serviceDailyRates?: ServiceDailyRates;
@@ -260,28 +346,35 @@ export interface ServiceBookingAddOnExt extends ServiceBookingAddOn {
 export interface ServiceBookingPackageExt extends ServiceBookingPackage {
   package: ServicePackageExt;
 }
+export interface ServiceBookingPriceBreakdownExt
+  extends ServiceBookingPriceBreakdown {}
+
+export interface ServiceBookingFeeExt extends ServiceBookingFee {}
 export interface ServiceBookingDayExt extends ServiceBookingDay {
   // service: ServiceExt; //we don't need service here
   addOns: ServiceBookingAddOnExt[];
   packages: ServiceBookingPackageExt[];
+  priceBreakdown: ServiceBookingPriceBreakdownExt[];
+  fees: ServiceBookingFeeExt[];
 }
 
 export interface ServiceBookingExt extends ServiceBooking {
-  // service: ServiceExt; //we don't need service here
   bookedDays: ServiceBookingDayExt[];
-  checkout?: ServiceBookingCheckout | null;
+  additionalFees: ServiceBookingFeeExt[];
+
   creator: PublicUser;
   forUser: PublicUser;
-}
+  service: ServiceExt;
 
-export type ServiceBookingPublicExt = Omit<ServiceBookingExt, "checkout">;
+  checkout?: ServiceBookingCheckout | null;
+}
 
 export interface ServiceBookingCheckoutExt extends ServiceBookingCheckout {
-  // service: ServiceExt; //we don't need service here
   creator: PublicUser;
-  // bookingData: ServiceBookingExt;
 }
 
+export type ServiceBookingPublicExt = Omit<ServiceBookingExt, "checkout">;
+
 export const SERVICE_BOOKING_ADDON_DATA_TO_INCLUDE = {
   addOn: true,
 } satisfies Prisma.ServiceBookingAddOnInclude;
@@ -299,6 +392,8 @@ export const SERVICE_BOOKING_DAY_DATA_TO_INCLUDE = {
   packages: {
     include: SERVICE_BOOKING_PACKAGE_DATA_TO_INCLUDE,
   },
+  priceBreakdown: true,
+  fees: true,
 } satisfies Prisma.ServiceBookingDayInclude;
 
 export const SERVICE_BOOKING_CHECKOUT_DATA_TO_INCLUDE = {
@@ -313,10 +408,12 @@ export const SERVICE_BOOKING_CHECKOUT_DATA_TO_INCLUDE = {
 export const FRONT_END_SERVICE_BOOKING_CHECKOUT_DATA_SELECT = {
   id: true,
   creatorId: true,
-  creator: true,
+  creator: {
+    select: FRONT_END_USER_DATA_TO_SELECT,
+  },
   checkoutDateTime: true,
-  totalAmount: true,
-  depositAmount: true,
+  totalAmountCents: true,
+  depositAmountCents: true,
   paidOn: true,
   refundedOn: true,
 } satisfies Prisma.ServiceBookingCheckoutSelect;
@@ -325,13 +422,20 @@ export const SERVICE_BOOKING_PUBLIC_DATA_TO_INCLUDE = {
   bookedDays: {
     include: SERVICE_BOOKING_DAY_DATA_TO_INCLUDE,
   },
+  service: {
+    include: {
+      ...SERVICE_DATA_TO_INCLUDE,
+      bashEvent: undefined, // Remove circular reference
+    },
+  },
+  additionalFees: true,
 } satisfies Prisma.ServiceBookingInclude;
 
 export const SERVICE_BOOKING_PRIVATE_DATA_TO_INCLUDE = {
   ...SERVICE_BOOKING_PUBLIC_DATA_TO_INCLUDE,
   checkout: {
-    // select: FRONT_END_SERVICE_BOOKING_CHECKOUT_DATA_SELECT,
-    include: SERVICE_BOOKING_CHECKOUT_DATA_TO_INCLUDE,
+    select: FRONT_END_SERVICE_BOOKING_CHECKOUT_DATA_SELECT,
+    // include: SERVICE_BOOKING_CHECKOUT_DATA_TO_INCLUDE,
   },
   creator: {
     select: FRONT_END_USER_DATA_TO_SELECT,
@@ -373,7 +477,7 @@ export interface ServiceExt extends Service {
   // googleReviews: GoogleReview[];
 
   // bookedCheckouts: ServiceBookingCheckoutExt[]; //not necessary to include
-  bookings?: ServiceBookingExt[];
+  // bookings?: ServiceBookingExt[];
 }
 export interface EventServiceExt extends EventService {
   service: ServiceExt;
@@ -427,92 +531,6 @@ export interface ServiceLinkExt extends ServiceLink {
   link: Link;
 }
 
-//------------Stripe Accounts--------------
-export const PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT = {
-  logo: true,
-  logoId: true,
-  createdAt: true,
-  updatedAt: true,
-} satisfies Prisma.StripeAccountSelect;
-
-export const STRIPE_ACCOUNT_DATA_TO_INCLUDE = {
-  logo: true,
-  owner: {
-    select: FRONT_END_USER_DATA_TO_SELECT,
-  },
-  userSubscription: {
-    select: PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT,
-  },
-} satisfies Prisma.StripeAccountInclude;
-
-export interface StripeAccountExt extends StripeAccount {
-  logo?: Media | null;
-}
-
-export const SERVICE_DATA_TO_INCLUDE = {
-  creator: {
-    select: FRONT_END_USER_DATA_TO_SELECT,
-  },
-  owner: {
-    select: FRONT_END_USER_DATA_TO_SELECT,
-  },
-  targetAudience: true,
-  media: true,
-  stripeAccount: {
-    // ...STRIPE_ACCOUNT_DATA_TO_INCLUDE,
-    select: PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT,
-  },
-  serviceLinks: {
-    include: SERVICE_LINK_DATA_TO_INCLUDE,
-  },
-  serviceRatesAssociation: {
-    include: SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE,
-  },
-  // bookings: {
-  //   include: SERVICE_BOOKING_PRIVATE_DATA_TO_INCLUDE, //make sure only to include owned bookedDays
-  // },
-  bashEvent: {
-    include: BASH_EVENT_DATA_TO_INCLUDE,
-  },
-  // bookedCheckouts: {
-  //   include: SERVICE_BOOKING_CHECKOUT_DATA_TO_INCLUDE, //make sure only to include owned checkouts
-  // },
-} satisfies Prisma.ServiceInclude;
-
-//full service data to include, includes specific service data
-export const SERVICE_FULL_DATA_TO_INCLUDE = {
-  ...SERVICE_DATA_TO_INCLUDE,
-  ...createAllTrueObject(serviceKeysArray),
-} satisfies Prisma.ServiceInclude;
-
-export const SERVICE_FULL_DATA_TO_CLONE = [
-  "media",
-  "targetAudience",
-  "serviceLinks",
-  // ...Object.values(specificServiceMap)
-] as const;
-
-type ServiceExtMinusDataToCloneType = Omit<
-  ServiceExt,
-  UnionFromArray<typeof SERVICE_FULL_DATA_TO_CLONE>
->;
-export const SERVICE_FULL_DATA_TO_REMOVE: RemoveCommonProperties<
-  Service,
-  ServiceExtMinusDataToCloneType
->[] = ["creator", "owner", "bookings"] as const;
-
-export const VENUE_DATA_TO_CLONE = [] as const;
-
-type VenueExtMinusDataToCloneType = Omit<
-  Venue,
-  UnionFromArray<typeof VENUE_DATA_TO_CLONE>
->;
-export const VENUE_DATA_TO_REMOVE: RemoveCommonProperties<
-  Venue,
-  VenueExtMinusDataToCloneType
->[] = [
-  // 'bashEvents',
-] as const;
 //-----------------------------------------
 
 export interface BashNotificationExt extends BashNotification {

package/src/index.ts

@@ -11,17 +11,18 @@ export * from "./utils/sortUtils";
 export * from "./utils/apiUtils";
 export * from "./utils/urlUtils";
 export * from "./utils/stringUtils";
+export * from "./utils/arrayUtils";
 export * from "./utils/promoCodesUtils";
 export * from "./utils/userPromoCodeUtils";
 export * from "./utils/userSubscriptionUtils";
 export * from "./utils/service/serviceUtils";
 export * from "./utils/service/venueUtils";
 export * from "./utils/service/attendeeOptionUtils";
-export * from "./utils/service/serviceRateDBUtils";
+// export * from "./utils/service/serviceRateDBUtils";
 export * from "./utils/service/serviceDBUtils";
 export * from "./utils/service/serviceRateUtils";
-export * from "./utils/service/serviceBookingUtils";
-export * from "./utils/service/serviceBookingApiUtils";
+export * from "./utils/service/frontendServiceBookingUtils";
+export * from "./utils/service/apiServiceBookingApiUtils";
 export * from "./utils/service/serviceBookingStatusUtils";
 export * from "./utils/stripeAccountUtils";
 export * from "./utils/entityUtils";

package/src/utils/arrayUtils.ts

@@ -0,0 +1,8 @@
+export async function asyncFilter<T>(
+  arr: T[],
+  predicate: (t: T) => Promise<boolean>
+) {
+  const results = await Promise.all(arr.map(predicate));
+
+  return arr.filter((_v, index) => results[index]);
+}

package/src/utils/luxonUtils.ts

@@ -151,7 +151,7 @@ export function dateTimeFromComponents(
   return res;
 }
 
-export function dateTimeGetDateTimeTIme(dateTime: DateTime) {
+export function dateTimeGetDateTimeTime(dateTime: DateTime) {
   return DateTime.fromObject(
     {
       // day: dayOfWeekIdxToDay[dateTime.weekday as DayOfWeekIdx],
@@ -186,13 +186,17 @@ export function dateTimeSetDate(
 
 export function dateRangeGetDateTimeTIme(dateRange: LuxonDateRange) {
   return {
-    start: dateTimeGetDateTimeTIme(dateRange.start),
-    end: dateTimeGetDateTimeTIme(dateRange.end),
+    start: dateTimeGetDateTimeTime(dateRange.start),
+    end: dateTimeGetDateTimeTime(dateRange.end),
   };
 }
 
-export function dateTimeFormatTime(dateTime: DateTime) {
-  return dateTime.toFormat(LUXON_TIME_FORMAT_AM_PM);
+export function dateTimeFormat(dateTime?: DateTime | null) {
+  return dateTime?.toFormat(LUXON_DATETIME_FORMAT_STANDARD) ?? "";
+}
+
+export function dateTimeFormatTime(dateTime?: DateTime | null) {
+  return dateTime?.toFormat(LUXON_TIME_FORMAT_AM_PM) ?? "";
 }
 
 export function dateTimeWithinRange(
@@ -264,14 +268,36 @@ export function dateTimeFormatDateRange(
   endDateTimeArg: DateTime | null
 ): string {
   if (startDateTimeArg?.day === endDateTimeArg?.day) {
-    return `${startDateTimeArg?.toFormat(
-      LUXON_DATETIME_FORMAT_STANDARD
-    )} to ${endDateTimeArg?.toFormat(LUXON_TIME_FORMAT_AM_PM)}`;
+    return `${dateTimeFormat(startDateTimeArg)} to ${dateTimeFormatTime(
+      endDateTimeArg
+    )}`;
+  }
+
+  return `${dateTimeFormat(startDateTimeArg)} to ${dateTimeFormat(
+    endDateTimeArg
+  )}`;
+}
+
+export interface DateTimeFormatDateRangeListResult {
+  start: string;
+  end: string;
+}
+
+export function dateTimeFormatDateRangeList(
+  startDateTimeArg: DateTime | null,
+  endDateTimeArg: DateTime | null
+): DateTimeFormatDateRangeListResult {
+  if (startDateTimeArg?.day === endDateTimeArg?.day) {
+    return {
+      start: dateTimeFormat(startDateTimeArg),
+      end: dateTimeFormatTime(endDateTimeArg),
+    };
   }
 
-  return `${startDateTimeArg?.toFormat(
-    LUXON_DATETIME_FORMAT_STANDARD
-  )} to ${endDateTimeArg?.toFormat(LUXON_DATETIME_FORMAT_STANDARD)}`;
+  return {
+    start: dateTimeFormat(startDateTimeArg),
+    end: dateTimeFormat(endDateTimeArg),
+  };
 }
 
 export interface LuxonDateRange {
@@ -674,6 +700,31 @@ export interface TimeSlots {
 //   } as TimeSlots;
 // }
 
+// export function generateTimeSlots(filteredHours: LuxonDateRange[]): TimeSlots {
+//   const timeSlotsStart: string[] = [];
+//   let timeSlotsEnd: string[] = [];
+
+//   filteredHours.forEach(({ start, end }) => {
+//     let currentTime = start;
+
+//     while (currentTime < end) {
+//       timeSlotsStart.push(dateTimeFormatTime(currentTime)); // Add the time in "HH:mm" format
+//       currentTime = currentTime.plus({ minutes: 30 }); // Increment by 30 minutes
+//     }
+
+//     const finalTime =
+//       currentTime.hour == 0 && currentTime.minute == 0
+//         ? currentTime.set({ hour: 23, minute: 59 })
+//         : currentTime;
+//     timeSlotsEnd = [...timeSlotsStart, dateTimeFormatTime(finalTime)];
+//   });
+
+//   return {
+//     start: timeSlotsStart,
+//     end: timeSlotsEnd,
+//   } as TimeSlots;
+// }
+
 export function generateTimeSlots(filteredHours: LuxonDateRange[]): TimeSlots {
   const timeSlotsStart: string[] = [];
   let timeSlotsEnd: string[] = [];
@@ -681,16 +732,26 @@ export function generateTimeSlots(filteredHours: LuxonDateRange[]): TimeSlots {
   filteredHours.forEach(({ start, end }) => {
     let currentTime = start;
 
-    while (currentTime < end) {
+    const startEnd = start.set({ hour: 23, minute: 59 });
+    const endEnd = end.set({ hour: 23, minute: 59 });
+
+    while (currentTime < startEnd) {
       timeSlotsStart.push(dateTimeFormatTime(currentTime)); // Add the time in "HH:mm" format
       currentTime = currentTime.plus({ minutes: 30 }); // Increment by 30 minutes
     }
 
+    currentTime = end;
+    while (currentTime < endEnd) {
+      timeSlotsEnd.push(dateTimeFormatTime(currentTime)); // Add the time in "HH:mm" format
+      currentTime = currentTime.plus({ minutes: 30 }); // Increment by 30 minutes
+    }
+
     const finalTime =
       currentTime.hour == 0 && currentTime.minute == 0
         ? currentTime.set({ hour: 23, minute: 59 })
         : currentTime;
-    timeSlotsEnd = [...timeSlotsStart.slice(1), dateTimeFormatTime(finalTime)];
+
+    timeSlotsEnd = [...timeSlotsEnd, dateTimeFormatTime(finalTime)];
   });
 
   return {
@@ -900,7 +961,9 @@ export function dateTimeToString(dateTime: DateTime): string | null {
   return dateTime.toISO();
 }
 
-export function dateRangesFormat(dateTimes: LuxonDateRange[]): string {
-  const result = dateTimes.join(", ");
+export function dateRangesFormat(dateRanges: LuxonDateRange[]): string {
+  const result = dateRanges
+    .map((dateRange) => dateTimeFormatDateRange(dateRange.start, dateRange.end))
+    .join(", ");
   return result;
 }