@bash-app/bash-common 30.154.0 → 30.157.0

package/src/utils/luxonUtils.ts

@@ -295,7 +295,7 @@ export function dateRangeDurationMatch(
 ) {
   return (
     Math.abs(
-      lhs.end.diff(lhs.start).toMillis() - rhs.end.diff(rhs.end).toMillis()
+      lhs.end.diff(lhs.start).toMillis() - rhs.end.diff(rhs.start).toMillis()
     ) <=
     withinSeconds * 1000
   );
@@ -508,12 +508,6 @@ export function dateTimeGetOverlappingHoursCommonHelper(
   weekHours: LuxonDayOfWeekHours,
   inputInterval: Interval
 ): LuxonDateRange | null {
-  console.log(
-    `dateTimeGetOverlappingHoursCommonHelper weekHours: ${JSON.stringify(
-      weekHours
-    )}, inputInterval: ${JSON.stringify(inputInterval)}`
-  );
-
   let commonInterval: Interval | null = null;
 
   // const inputIntervalNormalized = normalizeLuxonInterval(inputInterval);
@@ -533,12 +527,6 @@ export function dateTimeGetOverlappingHoursCommonHelper(
       inputInterval
     );
 
-    console.log(
-      `dateTimeGetOverlappingHoursCommonHelper dayIdx: ${dayIdx}, dailyIntervals: ${JSON.stringify(
-        dailyIntervals
-      )}`
-    );
-
     if (dailyIntervals.length === 0) {
       // No overlap for this day, so no common interval is possible
       continue;
@@ -606,12 +594,6 @@ export function dateTimeGetOverlappingHoursContinuousHelper(
   weekHours: LuxonDayOfWeekHours,
   inputInterval: Interval
 ): LuxonDateRange[] | null {
-  console.log(
-    `dateTimeGetOverlappingHoursContinuousHelper weekHours: ${JSON.stringify(
-      weekHours
-    )}, inputRange: ${JSON.stringify(inputInterval)}`
-  );
-
   if (!inputInterval.start) {
     return null;
   }
@@ -628,12 +610,6 @@ export function dateTimeGetOverlappingHoursContinuousHelper(
     inputInterval
   );
 
-  console.log(
-    `dateTimeGetOverlappingHoursContinuousHelper startDayIdx: ${startDayIdx}, overlappingIntervals: ${JSON.stringify(
-      overlappingIntervals
-    )}`
-  );
-
   // Convert overlapping intervals back to LuxonDateRange[]
   return overlappingIntervals
     .filter((interval) => interval.start !== null && interval.end !== null)
@@ -718,92 +694,6 @@ export interface TimeSlots {
   end: string[];
 }
 
-// export function generateTimeSlots(
-//   filteredHours: LuxonDateRange[],
-//   bookedRange: LuxonDateRange,
-//   businessHours: LuxonDayOfWeekHours
-// ): TimeSlots {
-//   const timeSlotsStart: string[] = [];
-//   let timeSlotsEnd: string[] = [];
-
-//   let currentTime = bookedRange.start;
-//   const endTime = bookedRange.end;
-
-//   while (currentTime < endTime) {
-//     const currentDayOfWeek = currentTime.weekday as DayOfWeekIdx;
-//     const businessDayHours = businessHours[currentDayOfWeek]?.[0];
-
-//     if (!businessDayHours) {
-//       throw new Error("No business hours found for the current day.");
-//     }
-
-//     const { start: dayStart, end: dayEnd } = businessDayHours;
-
-//     // Ensure the current time is within today's business hours
-//     if (currentTime < dayStart) {
-//       currentTime = dayStart;
-//     }
-
-//     // If adding 30 minutes exceeds today's boundary, jump to the next day's start
-//     if (currentTime.plus({ minutes: 30 }) > dayEnd) {
-//       const nextDayOfWeek = currentTime.plus({ days: 1 })
-//         .weekday as DayOfWeekIdx;
-//       const nextDayHours = businessHours[nextDayOfWeek]?.[0];
-
-//       if (!nextDayHours) {
-//         throw new Error("No business hours for the next day.");
-//       }
-
-//       currentTime = nextDayHours.start;
-//     } else {
-//       timeSlotsStart.push(dateTimeFormatTime(currentTime));
-//       currentTime = currentTime.plus({ minutes: 30 });
-//     }
-//   }
-
-//   // The last slot should match the end time, respecting endDayOfWeek business hours
-//   const endDayOfWeek = bookedRange.end.weekday as DayOfWeekIdx;
-//   const endDayHours = businessHours[endDayOfWeek]?.[0];
-
-//   if (!endDayHours) {
-//     throw new Error("No business hours for the final day.");
-//   }
-
-//   const finalEndTime =
-//     bookedRange.end > endDayHours.end ? endDayHours.end : bookedRange.end;
-//   timeSlotsEnd = [...timeSlotsStart.slice(1), dateTimeFormatTime(finalEndTime)];
-
-//   return {
-//     start: timeSlotsStart,
-//     end: timeSlotsEnd,
-//   } 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[],
   incMin: number = 15

package/src/utils/service/serviceDBUtils.ts

@@ -1,53 +1,14 @@
 import { ServiceExt } from "../../extendedSchemas";
 import { DeepPartial } from "../typeUtils";
-// import {
-//   specialRateConvertToDb,
-//   generalRatesConvertRatesToDB,
-//   specialRateConvertFromDb,
-//   generalRatesConvertRatesFromDB,
-// } from "./serviceRateDBUtils";
 
+/** Converts service data for DB write. Currently a pass-through; rate conversion was removed. */
 export function serviceToDb(
   service: DeepPartial<ServiceExt>
 ): DeepPartial<ServiceExt> {
-  if (service.serviceRatesAssociation) {
-    // service.serviceRatesAssociation.serviceSpecialRates =
-    //   service.serviceRatesAssociation.serviceSpecialRates?.map(
-    //     (
-    //       serviceSpecialRate: Partial<ServiceSpecialRatesExt>
-    //     ): ServiceSpecialRatesExt => {
-    //       return specialRateConvertToDb(
-    //         serviceSpecialRate
-    //       ) as ServiceSpecialRatesExt;
-    //     }
-    //   );
-    // if (service.serviceRatesAssociation.serviceGeneralRates) {
-    //   service.serviceRatesAssociation.serviceGeneralRates =
-    //     generalRatesConvertRatesToDB(
-    //       service.serviceRatesAssociation.serviceGeneralRates
-    //     ) as ServiceRate;
-    // }
-  }
   return service;
 }
 
+/** Converts service data from DB read. Currently a pass-through; rate conversion was removed. */
 export function serviceFromDb(service: ServiceExt): ServiceExt {
-  if (service.serviceRatesAssociation) {
-    // service.serviceRatesAssociation.serviceSpecialRates =
-    //   service.serviceRatesAssociation.serviceSpecialRates?.map(
-    //     (
-    //       serviceSpecialRate: ServiceSpecialRatesExt
-    //     ): ServiceSpecialRatesExt => {
-    //       return specialRateConvertFromDb(serviceSpecialRate);
-    //     }
-    //   );
-    if (service.serviceRatesAssociation.serviceGeneralRates) {
-      // console.log("updating general rates from db");
-      // service.serviceRatesAssociation.serviceGeneralRates =
-      //   generalRatesConvertRatesFromDB(
-      //     service.serviceRatesAssociation.serviceGeneralRates
-      //   );
-    }
-  }
   return service;
 }

package/src/utils/service/serviceRateDBUtils.ts

@@ -1,179 +0,0 @@
-// import { ServiceRate } from "@prisma/client";
-// import { ApiResult } from "../../definitions";
-// import { ServiceSpecialRatesExt } from "../../extendedSchemas";
-// import { convertDollarsToCents, convertCentsToDollars } from "../paymentUtils";
-
-// export function specialRateConvertToDb(
-//   specialRate: Partial<ServiceSpecialRatesExt>
-// ): Partial<ServiceSpecialRatesExt> {
-//   return specialRateConvertRatesToDB(
-//     specialRateConvertDateStringsToDb(structuredClone(specialRate))
-//   );
-// }
-
-// export function specialRateConvertFromDb(
-//   specialRate: ServiceSpecialRatesExt
-// ): ServiceSpecialRatesExt {
-//   // console.log(`specialRateConvertFromDb`);
-//   return specialRateConvertRatesFromDB(
-//     specialRateConvertDateStringsFromDb(specialRate)
-//   );
-// }
-
-// function specialRateConvertDateStringsToDb(
-//   specialRate: Partial<ServiceSpecialRatesExt>
-// ): Partial<ServiceSpecialRatesExt> {
-//   // const oldStart = new Date(specialRate.startDate!);
-//   // const oldEnd = new Date(specialRate.endDate!);
-
-//   // specialRate.startDate = dateTimeLocalToUTCDate(specialRate.startDate!);
-//   // specialRate.endDate = dateTimeLocalToUTCDate(specialRate.endDate!);
-//   // specialRate.startDate = normalizeDate(specialRate.startDate!);
-//   // specialRate.endDate = normalizeDate(specialRate.endDate!);
-
-//   // const localStart = dateTimeLocalFromUTCDate(new Date(specialRate.startDate!));
-//   // const localEnd = dateTimeLocalFromUTCDate(new Date(specialRate.endDate!));
-
-//   // console.log(
-//   //   `specialRateConvertDateStringsToDb oldStart: ${oldStart?.toString()}`
-//   // );
-//   // console.log(
-//   //   `specialRateConvertDateStringsToDb oldEnd: ${oldEnd?.toString()}`
-//   // );
-//   // console.log(
-//   //   `specialRateConvertDateStringsToDb specialRate.startDate: ${specialRate.startDate?.toString()}`
-//   // );
-//   // console.log(
-//   //   `specialRateConvertDateStringsToDb specialRate.endDate: ${specialRate.endDate?.toString()}`
-//   // );
-//   // console.log(
-//   //   `specialRateConvertDateStringsToDb localStart: ${localStart?.toString()}`
-//   // );
-//   // console.log(
-//   //   `specialRateConvertDateStringsToDb localEnd: ${localEnd?.toString()}`
-//   // );
-
-//   // const a = 3 + 4;
-
-//   // specialRate.startDate = specialRate.startDate.toISOString();
-//   // specialRate.endDate = specialRate.endDate.toISOString();
-//   // return specialRate;
-//   return specialRate;
-// }
-
-// function specialRateConvertDateStringsFromDb(
-//   specialRate: ServiceSpecialRatesExt
-// ): ServiceSpecialRatesExt {
-//   // specialRate.startDate = localDateToUTC(new Date(specialRate.startDate));
-//   // specialRate.endDate = localDateToUTC(new Date(specialRate.endDate));
-
-//   //this shouldnt even be necessary as javascript dates are always stored in UTC timezone (they lack timezone information)
-//   // specialRate.startDate = ensureDateTimeIsLocalDateTime(
-//   //   new Date(specialRate.startDate)
-//   // ).toDate();
-//   // specialRate.endDate = ensureDateTimeIsLocalDateTime(
-//   //   new Date(specialRate.endDate)
-//   // ).toDate();
-
-//   specialRate.startDate = new Date(specialRate.startDate);
-//   specialRate.endDate = new Date(specialRate.endDate);
-
-//   // const oldStart = new Date(specialRate.startDate!);
-//   // const oldEnd = new Date(specialRate.endDate!);
-
-//   // specialRate.startDate = dateTimeLocalFromUTCDate(
-//   //   new Date(specialRate.startDate)
-//   // );
-//   // specialRate.endDate = dateTimeLocalFromUTCDate(new Date(specialRate.endDate));
-
-//   // // specialRate.startDate = ensureDateTimeIsLocalDateTime(
-//   // //   new Date(specialRate.startDate)
-//   // // ).toDate();
-//   // // specialRate.endDate = ensureDateTimeIsLocalDateTime(
-//   // //   new Date(specialRate.endDate)
-//   // // ).toDate();
-
-//   // // specialRate.startDate = localDateToUTC(new Date(specialRate.startDate));
-//   // // specialRate.endDate = localDateToUTC(new Date(specialRate.endDate));
-
-//   // const date2 = normalizeDate(specialRate.startDate)!;
-//   // const date3 = normalizeDate(specialRate.endDate)!;
-
-//   // const a = 3 + 4;
-//   return specialRate;
-// }
-
-// function specialRateConvertRatesToDB(
-//   specialRate: Partial<ServiceSpecialRatesExt>
-// ): Partial<ServiceSpecialRatesExt> {
-//   if (specialRate.serviceRate) {
-//     specialRate.serviceRate = generalRatesConvertRatesToDB(
-//       specialRate.serviceRate
-//     ) as ServiceRate;
-//   }
-//   return specialRate;
-// }
-
-// function specialRateConvertRatesFromDB(
-//   specialRate: ServiceSpecialRatesExt
-// ): ServiceSpecialRatesExt {
-//   if (specialRate.serviceRate) {
-//     specialRate.serviceRate = generalRatesConvertRatesFromDB(
-//       specialRate.serviceRate
-//     );
-//   }
-//   return specialRate;
-// }
-
-// export function generalRatesConvertRatesToDB(
-//   generalRate: ServiceRate
-// ): ServiceRate {
-//   return generalRatesConvertRatesToDBHelper(structuredClone(generalRate));
-// }
-
-// export function generalRatesConvertRatesToDBHelper(
-//   generalRate: ServiceRate
-// ): ServiceRate {
-//   //   console.log(
-//   //     `generalRatesConvertRatesToDBHelper A: ${JSON.stringify(generalRate)}`
-//   //   );
-//   if (generalRate?.dailyRate) {
-//     generalRate.dailyRate = convertDollarsToCents(generalRate.dailyRate);
-//   }
-//   if (generalRate?.hourlyRate) {
-//     generalRate.hourlyRate = convertDollarsToCents(generalRate.hourlyRate);
-//   }
-//   if (generalRate?.cleaningFeePerBooking) {
-//     generalRate.cleaningFeePerBooking = convertDollarsToCents(
-//       generalRate.cleaningFeePerBooking
-//     );
-//   }
-//   //   console.log(
-//   //     `generalRatesConvertRatesToDBHelper B: ${JSON.stringify(generalRate)}`
-//   //   );
-//   return generalRate;
-// }
-
-// export function generalRatesConvertRatesFromDB(
-//   generalRate: ServiceRate
-// ): ServiceRate {
-//   //   console.log(
-//   //     `generalRatesConvertRatesFromDB A: ${JSON.stringify(generalRate)}`
-//   //   );
-//   // console.log(`specialRateConvertRatesFromDB`);
-//   if (generalRate?.dailyRate) {
-//     generalRate.dailyRate = convertCentsToDollars(generalRate.dailyRate);
-//   }
-//   if (generalRate?.hourlyRate) {
-//     generalRate.hourlyRate = convertCentsToDollars(generalRate.hourlyRate);
-//   }
-//   if (generalRate?.cleaningFeePerBooking) {
-//     generalRate.cleaningFeePerBooking = convertCentsToDollars(
-//       generalRate.cleaningFeePerBooking
-//     );
-//   }
-//   //   console.log(
-//   //     `generalRatesConvertRatesFromDB B: ${JSON.stringify(generalRate)}`
-//   //   );
-//   return generalRate;
-// }