@bash-app/bash-common 30.18.0 → 30.20.0

package/package.json

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

package/prisma/schema.prisma

@@ -313,7 +313,7 @@ model BashEvent {
   venue                           Venue?                    @relation(fields: [venueId], references: [id])
   userPromoCodeRedemption         UserPromoCodeRedemption[]
   averageRating                   Float?                    @default(0)
-  serviceBookings ServiceBooking[] // Add this field to create the reverse relation
+  serviceBookings                 ServiceBooking[] // Add this field to create the reverse relation
 }
 
 model Coordinates {
@@ -689,6 +689,7 @@ enum UserIntent {
   EventSeeker
   EventOrganizer
   VenueOwner
+  Lonely
 }
 
 enum BashStatus {
@@ -1245,7 +1246,9 @@ model Service {
   cancellationPolicy   ServiceCancellationPolicy? @default(None)
   // refundPolicy         String?
   // insurancePolicy      String?
-  // hoursOfOperation  Json? @default("{}")
+  availableHours     String?
+  allowsInstantBooking  Boolean @default(false)
+  instantBookingLeadTimeHours Int @default(0)
 
   displayGoogleReviewsOnDetailPage Boolean @default(true)
   displayBashReviewsOnDetailPage   Boolean @default(true)
@@ -1928,7 +1931,7 @@ model ServiceBooking {
   daysTotalATBCents Int //ATB=At Time of Booking
   totalATBCents     Int
 
-    bashEventId String?
+  bashEventId String?
   bashEvent   BashEvent? @relation(fields: [bashEventId], references: [id])
 
   @@index([status])

package/src/utils/luxonUtils.ts

@@ -12,9 +12,10 @@ const PARSE_TIME_REG = /^(\d{1,2}):(\d{2}) ?([APM]{0,2})$/i;
 
 // export const LUXON_DATETIME_FORMAT_STANDARD = "MM/dd/yyyy - hh:mm a";
 export const LUXON_DATETIME_FORMAT_STANDARD = "D t";
-export const LUXON_DATETIME_FORMAT_ISO_LIKE = "yyyy-MM-dd hh:mm"; //"D t";
+export const LUXON_DATETIME_FORMAT_ISO_LIKE = "D t"; //"D t";
 // export const LUXON_DATE_FORMAT_STANDARD = "yyyy/MM/dd";
 // export const LUXON_DATE_FORMAT_ISO = "yyyy/MM/dd";
+export const LUXON_DATETIME_FORMAT_DATE = "D"; //"D t";
 export const LUXON_TIME_FORMAT_AM_PM = "h:mm a";
 
 export const MINUTES_PER_DAY = 1440;
@@ -199,6 +200,10 @@ export function dateTimeFormatTime(dateTime?: DateTime | null) {
   return dateTime?.toFormat(LUXON_TIME_FORMAT_AM_PM) ?? "";
 }
 
+export function dateTimeFormatDate(dateTime?: DateTime | null) {
+  return dateTime?.toFormat(LUXON_DATETIME_FORMAT_DATE) ?? "";
+}
+
 export function dateTimeWithinRange(
   dateTime: DateTime,
   dateRange: LuxonDateRange
@@ -278,6 +283,21 @@ export function dateTimeFormatDateRange(
   )}`;
 }
 
+export function dateTimeFormatDateRangeDate(
+  startDateTimeArg: DateTime | null,
+  endDateTimeArg: DateTime | null
+): string {
+  if (startDateTimeArg?.day === endDateTimeArg?.day) {
+    return `${dateTimeFormatDate(startDateTimeArg)} to ${dateTimeFormatDate(
+      endDateTimeArg
+    )}`;
+  }
+
+  return `${dateTimeFormatDate(startDateTimeArg)} to ${dateTimeFormatDate(
+    endDateTimeArg
+  )}`;
+}
+
 export interface DateTimeFormatDateRangeListResult {
   start: string;
   end: string;

package/src/utils/service/regexUtils.ts

@@ -9,3 +9,13 @@ export function isPositiveFloat(str: string): boolean {
 export function isPrice(str: string): boolean {
   return /^\d*\.?\d{0,2}$/.test(str);
 }
+
+export function isUrlInputtingProtocol(str: string): boolean {
+  return /^(?:(?:|h|ht|htt|http|https)|(?:http|https):(?:\/{0,2})?)$/.test(str);
+}
+
+export function isUrl(str: string): boolean {
+  return /(?:^https?:\/\/[^\s\/$?#;&=@:]*$)|(?:^https?:\/{0,2}$)|(?:^[^\s\/$?#;&=@:]*$)/.test(
+    str
+  );
+}

package/src/utils/service/serviceRateUtils.ts

@@ -1,31 +1,25 @@
 import {
-  Service,
   ServiceRate,
   ServiceRatePricingType,
   ServiceRateType,
 } from "@prisma/client";
+import { DateTime } from "luxon";
 import {
   ServiceDailyRatesExt,
-  ServiceRateExt,
   ServiceRatesAssociationExt,
   ServiceSpecialRatesExt,
 } from "../../extendedSchemas";
 import {
   LuxonDateRange,
-  dateTimeFromDate,
-  dateRangeWithinDateRange,
-  dateRangeDurationMatch,
-  dateTimeRangeToInterval,
   dateRangeNormalizeToMWY,
+  dateTimeFromDate,
   dateTimeRangeIntersection,
-  dateTimeRangeHours,
 } from "../luxonUtils";
-import { DateTime } from "luxon";
+import { ServiceBookingPriceBreakdownBaseT } from "./serviceBookingTypes";
 import {
   ServiceDailyRatesExtT,
   ServiceSpecialRatesExtT,
 } from "./serviceRateTypes";
-import { ServiceBookingPriceBreakdownBaseT } from "./serviceBookingTypes";
 
 export const SERVICE_DAILY_RATE_HOURS_MIN = 8;
 
@@ -302,23 +296,23 @@ export function serviceRatesAssociationGetBlockedDates(
 
 export function serviceRatesAssociationGetSpecialRates(
   serviceRatesAssociation: ServiceRatesAssociationExt | null | undefined,
-  timezone: string | undefined | null
+  timezone: string | undefined | null,
+  filterPastDates: boolean = false
 ) {
   return (
     serviceRatesAssociation?.serviceSpecialRates
       ?.filter((rate) => rate.isAvailable)
       .map((rate) => {
-        const rateRange = {
-          start: dateTimeFromDate(
-            rate.startDate,
-            undefined,
-            timezone ?? undefined
-          ),
-          end: dateTimeFromDate(rate.endDate, undefined, timezone ?? undefined),
-        } as LuxonDateRange;
-
-        return rateRange;
-        // return dateRangeNormalizeToMWY(rateRange, referenceRange);
-      }) ?? []
+        return serviceRateToLuxonRate(
+          rate,
+          timezone
+        ) as ServiceSpecialRatesExtT;
+      })
+      .filter(
+        (rate: ServiceSpecialRatesExtT) =>
+          !filterPastDates ||
+          (rate.dateTimeRange.start >= DateTime.now() &&
+            rate.dateTimeRange.end >= DateTime.now())
+      ) ?? []
   );
 }