@bash-app/bash-common 30.50.0 → 30.51.0

package/package.json

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

package/prisma/schema.prisma

@@ -195,40 +195,78 @@ model PromoterClick {
   clickedAt        DateTime @default(now())
 }
 
+enum NotificationType {
+  General
+  Follow
+  TaskAssigned
+  TaskUnassigned
+  TaskRequest
+  TaskCompleted
+  BashApprovalRequest
+  BashApproved
+  BashRejected
+  BashTrending
+  BashOrganizerNewBash
+  BashCheckIn
+  BashAutoCheckIn
+  Invitation
+  ServiceBookingRequest
+  ServiceBookingApproved
+  ServiceBookingDeclined
+  ServiceBookingCancelled
+  ServiceBookingConfirmed
+}
+
+enum NotificationPriority {
+  High
+  Medium
+  Low
+}
+
+enum NotificationActionType {
+  Accept
+  Approve
+  Reject
+  View
+  Complete
+  Cancel
+  Other
+}
+
 model Notification {
-  id               String          @id @default(cuid())
+  id               String           @id @default(cuid())
   creatorId        String
-  creator          User            @relation("NotificationsCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
+  creator          User             @relation("NotificationsCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
   email            String
   userId           String? // Direct reference to recipient user  
-  user             User?           @relation("NotificationsReceivedByMe", fields: [userId], references: [id], onDelete: Cascade)
-  createdDateTime  DateTime        @default(now())
+  user             User?            @relation("NotificationsReceivedByMe", fields: [userId], references: [id], onDelete: Cascade)
+  createdDateTime  DateTime         @default(now())
   message          String
   image            String?
   readDateTime     DateTime?
-  type             String // Notification type: "FOLLOW", "TASK", "EVENT", etc.
+  type             NotificationType // Notification type: "FOLLOW", "TASK", "EVENT", etc.
   taskId           String?
-  eventTask        EventTask?      @relation(fields: [taskId], references: [id], onDelete: Cascade)
+  eventTask        EventTask?       @relation(fields: [taskId], references: [id], onDelete: Cascade)
   invitationId     String?
-  invitation       Invitation?     @relation(fields: [invitationId], references: [id], onDelete: Cascade)
+  invitation       Invitation?      @relation(fields: [invitationId], references: [id], onDelete: Cascade)
   bashEventId      String?
-  bashEvent        BashEvent?      @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  bashEvent        BashEvent?       @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
   serviceId        String?
-  service          Service?        @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  service          Service?         @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   serviceBookingId String?
-  serviceBooking   ServiceBooking? @relation(fields: [serviceBookingId], references: [id], onDelete: Cascade)
+  serviceBooking   ServiceBooking?  @relation(fields: [serviceBookingId], references: [id], onDelete: Cascade)
   reminders        Reminder[]
   redirectUrl      String?
 
   // Additional specific fields for different notification types
   actionTaken Boolean? // For notifications that may require action
-  actionType  String? // Type of action taken (ACCEPT, REJECT, etc.)
-  priority    String? // Priority level (HIGH, MEDIUM, LOW)
+  actionType  NotificationActionType?
+  priority    NotificationPriority?
   expiresAt   DateTime? // For time-sensitive notifications
 
-  @@unique([creatorId, email, bashEventId, taskId])
-  @@unique([creatorId, email, invitationId])
-  @@unique([creatorId, email, serviceBookingId])
+  // @@unique([creatorId, email, bashEventId, taskId, type])
+  @@unique([creatorId, email, invitationId, type])
+  @@unique([creatorId, email, serviceBookingId, type])
   @@index([creatorId])
   @@index([userId])
   @@index([type]) // Add index for efficient filtering by notification type
@@ -1137,18 +1175,18 @@ model UserPreferences {
   user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   // Notification Preferences
-  emailNotifications           Boolean @default(true)
+  emailNotifications          Boolean @default(true)
   pushNotifications           Boolean @default(true)
-  marketingEmails             Boolean @default(true)    // Added from our UI
-  eventUpdates                Boolean @default(true)    // Added from our UI
-  serviceBookingNotifications Boolean @default(true)    // Added from our UI
-  reviewReminders             Boolean @default(true)    // Added from our UI
-  newFollowerNotifications    Boolean @default(true)    // Added from our UI
-  trendingBashesNotify        Boolean @default(true)    // Updated default to true
-  organizerUpdatesNotify      Boolean @default(true)    // Updated default to true
-  recurringReminders          Boolean @default(true)    // NEW - multiple reminders as event approaches
-  eventSuggestions            Boolean @default(true)    // NEW - event planning tips and suggestions
-  serviceSuggestions          Boolean @default(true)    // NEW - vendor/service recommendations
+  marketingEmails             Boolean @default(true) // Added from our UI
+  eventUpdates                Boolean @default(true) // Added from our UI
+  serviceBookingNotifications Boolean @default(true) // Added from our UI
+  reviewReminders             Boolean @default(true) // Added from our UI
+  newFollowerNotifications    Boolean @default(true) // Added from our UI
+  trendingBashesNotify        Boolean @default(true) // Updated default to true
+  organizerUpdatesNotify      Boolean @default(true) // Updated default to true
+  recurringReminders          Boolean @default(true) // NEW - multiple reminders as event approaches
+  eventSuggestions            Boolean @default(true) // NEW - event planning tips and suggestions
+  serviceSuggestions          Boolean @default(true) // NEW - vendor/service recommendations
   eventReminderNotify         Boolean @default(true)
   newMessageNotify            Boolean @default(true)
   invitationNotify            Boolean @default(true)
@@ -1156,35 +1194,35 @@ model UserPreferences {
   servicePromotionsNotify     Boolean @default(true)
 
   // Privacy Settings
-  profileVisibility       String   @default("public")    // Updated to lowercase, matches our UI
-  eventHistoryVisibility  Boolean  @default(true)        // Added from our UI
-  servicesVisibility      Boolean  @default(true)        // Added from our UI
-  searchVisibility        Boolean  @default(true)        // Added from our UI
-  hideFollowLists         Boolean  @default(false)       // NEW - hide follower/following lists
-  attendancePrivacy       String   @default("public")    // Updated to lowercase, matches our UI
-  hideEventPrices         Boolean  @default(false)       // NEW - hide prices until day of event
-  showOnlineStatus        Boolean  @default(true)
-  allowDirectMessages     Boolean  @default(true)
-  blockSearchEngineIndex  Boolean  @default(false)
+  profileVisibility      String  @default("public") // Updated to lowercase, matches our UI
+  eventHistoryVisibility Boolean @default(true) // Added from our UI
+  servicesVisibility     Boolean @default(true) // Added from our UI
+  searchVisibility       Boolean @default(true) // Added from our UI
+  hideFollowLists        Boolean @default(false) // NEW - hide follower/following lists
+  attendancePrivacy      String  @default("public") // Updated to lowercase, matches our UI
+  hideEventPrices        Boolean @default(false) // NEW - hide prices until day of event
+  showOnlineStatus       Boolean @default(true)
+  allowDirectMessages    Boolean @default(true)
+  blockSearchEngineIndex Boolean @default(false)
 
   // Contact Management (NEW SECTION)
-  autoAddEventAttendees   Boolean @default(true)        // NEW - auto-add event attendees to contacts
-  trackFirstEventAttended Boolean @default(true)        // NEW - remember which bash connected you
-  autoAddServiceClients   Boolean @default(true)        // NEW - auto-add service clients to contacts
+  autoAddEventAttendees   Boolean @default(true) // NEW - auto-add event attendees to contacts
+  trackFirstEventAttended Boolean @default(true) // NEW - remember which bash connected you
+  autoAddServiceClients   Boolean @default(true) // NEW - auto-add service clients to contacts
 
   // UI/UX Preferences
-  theme               String  @default("system")        // Updated to lowercase, matches our UI
-  language            String  @default("en")            // Simplified from en-US
-  timeZone            String  @default("America/New_York")
+  theme    String @default("system") // Updated to lowercase, matches our UI
+  language String @default("en") // Simplified from en-US
+  timeZone String @default("America/New_York")
 
   // Event Preferences
-  eventReminderTiming String @default("1day")          // NEW - 1hour, 1day, 1week (replaces defaultEventReminder)
-  locationRadius      Int    @default(50)               // NEW - miles for event suggestions
-  calendarStartDay    Int    @default(0)               // 0=Sunday, 1=Monday
-  defaultCalendarView String @default("MONTH")         // DAY, WEEK, MONTH, AGENDA
+  eventReminderTiming String @default("1day") // NEW - 1hour, 1day, 1week (replaces defaultEventReminder)
+  locationRadius      Int    @default(50) // NEW - miles for event suggestions
+  calendarStartDay    Int    @default(0) // 0=Sunday, 1=Monday
+  defaultCalendarView String @default("MONTH") // DAY, WEEK, MONTH, AGENDA
 
   // Security & Consent Preferences
-  biometricAuthEnabled Boolean @default(false)         // NEW - Face ID/Touch ID/Fingerprint
+  biometricAuthEnabled Boolean @default(false) // NEW - Face ID/Touch ID/Fingerprint
   dataUsageConsent     Boolean @default(true)
   analyticsConsent     Boolean @default(true)
 
@@ -1197,28 +1235,28 @@ model UserPreferences {
   updatedAt DateTime @updatedAt
 
   // Less Relevant Fields (moved to bottom)
-  smsNotifications        Boolean @default(false)      // We're not using SMS
-  friendRequestNotify     Boolean @default(true)       // We use followers, not friends
-  allowTagging           Boolean @default(true)
-  showActivityStatus     Boolean @default(true)
+  smsNotifications       Boolean  @default(false) // We're not using SMS
+  friendRequestNotify    Boolean  @default(true) // We use followers, not friends
+  allowTagging           Boolean  @default(true)
+  showActivityStatus     Boolean  @default(true)
   hiddenBashIds          String[] @default([])
-  hideActivitySection    Boolean @default(false)
-  allowLocationSharing   Boolean @default(false)
-  defaultLandingPage     String  @default("dashboard")
-  contentDensity         String  @default("COMFORTABLE") // COMPACT, COMFORTABLE, SPACIOUS
-  fontScale              String  @default("MEDIUM")     // SMALL, MEDIUM, LARGE
-  animationsEnabled      Boolean @default(true)
-  useHighContrastMode    Boolean @default(false)
+  hideActivitySection    Boolean  @default(false)
+  allowLocationSharing   Boolean  @default(false)
+  defaultLandingPage     String   @default("dashboard")
+  contentDensity         String   @default("COMFORTABLE") // COMPACT, COMFORTABLE, SPACIOUS
+  fontScale              String   @default("MEDIUM") // SMALL, MEDIUM, LARGE
+  animationsEnabled      Boolean  @default(true)
+  useHighContrastMode    Boolean  @default(false)
   contentFilters         String[] @default([])
   topicInterests         String[] @default([])
   hideSeenContent        Boolean  @default(false)
   autoplayVideos         Boolean  @default(true)
-  contentSortPreference  String   @default("RECENT")    // RECENT, POPULAR, RELEVANT
+  contentSortPreference  String   @default("RECENT") // RECENT, POPULAR, RELEVANT
   contentLanguages       String[] @default(["en"])
   showSensitiveContent   Boolean  @default(false)
-  defaultEventReminder   Int      @default(60)          // Minutes before event (replaced by eventReminderTiming)
-  communicationFrequency String   @default("NORMAL")    // LOW, NORMAL, HIGH
-  preferredContactMethod String   @default("EMAIL")     // EMAIL, PUSH, SMS
+  defaultEventReminder   Int      @default(60) // Minutes before event (replaced by eventReminderTiming)
+  communicationFrequency String   @default("NORMAL") // LOW, NORMAL, HIGH
+  preferredContactMethod String   @default("EMAIL") // EMAIL, PUSH, SMS
 
   @@map("user_preferences")
 }
@@ -1570,41 +1608,40 @@ model VolunteerService {
 }
 
 model EventService {
-  id                  String               @id @default(cuid())
+  id String @id @default(cuid())
 
   // General classification
-  eventServiceType         EventServiceType    // e.g. DecorAndDesign
-  eventServiceSubType             String?        // e.g. "BalloonArt"
+  eventServiceType    EventServiceType // e.g. DecorAndDesign
+  eventServiceSubType String? // e.g. "BalloonArt"
   formatOptions       ServiceFormatOption[] // Related formats for this subtype
 
   // Custom input support
-  isCustom            Boolean              @default(false)
-  customNote          String?
+  isCustom   Boolean @default(false)
+  customNote String?
 
   // Optional linked models
-  serviceRangeId      String?
-  serviceRange        ServiceRange?        @relation(fields: [serviceRangeId], references: [id])
-  crowdSizeId         String?              @unique
-  crowdSize           AmountOfGuests?      @relation(fields: [crowdSizeId], references: [id], onDelete: Cascade)
-  service             Service?             
-  serviceId           String?
+  serviceRangeId String?
+  serviceRange   ServiceRange?   @relation(fields: [serviceRangeId], references: [id])
+  crowdSizeId    String?         @unique
+  crowdSize      AmountOfGuests? @relation(fields: [crowdSizeId], references: [id], onDelete: Cascade)
+  service        Service?
+  serviceId      String?
 
   // Other descriptors
   yearsOfExperience   YearsOfExperience
   goodsOrServices     String[]
   menuItems           String?
   venueTypes          String[]
-  secondaryVenueTypes String[]             @default([])
+  secondaryVenueTypes String[]          @default([])
 }
 
 model ServiceFormatOption {
-  id              String        @id @default(cuid())
-  eventServiceId  String
-  eventService    EventService  @relation(fields: [eventServiceId], references: [id], onDelete: Cascade)
-  format          String        // e.g. "BalloonGarlands", "BuffetStyle", "WeddingFlorals"
+  id             String       @id @default(cuid())
+  eventServiceId String
+  eventService   EventService @relation(fields: [eventServiceId], references: [id], onDelete: Cascade)
+  format         String // e.g. "BalloonGarlands", "BuffetStyle", "WeddingFlorals"
 }
 
-
 model EntertainmentService {
   id                          String                     @id @default(cuid())
   serviceRangeId              String?
@@ -1689,7 +1726,6 @@ enum VendorBidStatus {
   Paid
 }
 
-
 model Exhibitor {
   id                  String            @id @default(cuid())
   serviceRangeId      String?
@@ -1784,19 +1820,19 @@ model Organization {
 }
 
 enum EventServiceType {
- Financing
- EventPlanningAndManagement
- FoodAndBeverage
- Cleaning
- DecorAndDesign
- RentalEquipment
- MediaProductionAndCreative
- AudioVisualSupport
- HostingSupport
- PromotionAndMarketing
- Staffing
- Transportation
- Other
+  Financing
+  EventPlanningAndManagement
+  FoodAndBeverage
+  Cleaning
+  DecorAndDesign
+  RentalEquipment
+  MediaProductionAndCreative
+  AudioVisualSupport
+  HostingSupport
+  PromotionAndMarketing
+  Staffing
+  Transportation
+  Other
 }
 
 enum FinancingSubType {
@@ -3232,7 +3268,7 @@ model ServiceBooking {
   bashEventId String?
   bashEvent   BashEvent? @relation(fields: [bashEventId], references: [id])
 
-   // Vendor-specific booking fields
+  // Vendor-specific booking fields
   isVendorBid          Boolean @default(false)
   vendorBidAmountCents Int? // Custom bid amount for vendor bookings
   vendorEventDetails   String? // Additional event details for vendor

package/src/extendedSchemas.ts

@@ -59,10 +59,7 @@ import {
   VolunteerService,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE } from "./definitions";
-import {
-  RemoveCommonProperties,
-  UnionFromArray
-} from "./utils/typeUtils";
+import { RemoveCommonProperties, UnionFromArray } from "./utils/typeUtils";
 
 export interface ApiResponse<T> {
   data: T;
@@ -595,7 +592,7 @@ export type ServiceExtNoIds = Exclude<
 export interface EventServiceExt extends EventService {
   crowdSize?: AmountOfGuests;
   serviceRange?: ServiceRange;
-  formatOptions?: ServiceFormatOption[]
+  formatOptions?: ServiceFormatOption[];
 }
 
 export interface EntertainmentServiceExt extends EntertainmentService {
@@ -643,7 +640,6 @@ export interface NotificationExt extends Notification {
   bashEvent?: BashEvent;
   creator?: PublicUser;
   eventTask?: EventTask;
-  userAction?: string;
   service?: ServiceExt;
   serviceBooking?: ServiceBookingExt;
   invitation?: Invitation;
@@ -797,7 +793,7 @@ export interface UserExt extends User {
   preferences?: UserPreferences | null;
   stats?: UserStats | null;
   demerits?: Demerit[] | null;
-  
+
   // Do not include in fetch as there could be thousands of these
   userSubscription?: UserSubscriptionExt | null;
   associatedBashes?: AssociatedBash[] | null;

package/src/utils/luxonUtils.ts

@@ -276,10 +276,10 @@ export function utcOffsetMinutesToTimezone(utcOffsetMinutes: number) {
   return offsetString;
 }
 
-export function getLocalTimezone() {
-  const localDateTime = DateTime.local();
-  return utcOffsetMinutesToTimezone(localDateTime.offset);
-}
+// export function getLocalTimezone() {
+//   const localDateTime = DateTime.local();
+//   return utcOffsetMinutesToTimezone(localDateTime.offset);
+// }
 
 export function dateTimeFormatDateRange(
   startDateTimeArg: DateTime | null,

package/src/utils/service/serviceBookingStatusUtils.ts

@@ -42,6 +42,12 @@ export function serviceBookingIsPending(booking: ServiceBookingExt): boolean {
   return booking.status === "Pending";
 }
 
+export function serviceBookingHasApprovalDecision(
+  booking: ServiceBookingExt
+): boolean {
+  return serviceBookingIsDeclined(booking) || serviceBookingIsApproved(booking);
+}
+
 export function serviceBookingCanBePaid(
   booking: ServiceBookingExt
 ): ValidationResult {
@@ -125,24 +131,6 @@ export function serviceBookingCanHaveApprovalDecision(
   return { valid: true };
 }
 
-export function serviceBookingHasApprovalDecision(
-  booking: ServiceBookingExt
-): ValidationResult {
-  if (!serviceBookingIsRequest(booking)) {
-    return {
-      valid: false,
-      errorMessage: "Only booking requests can have a decision.",
-    };
-  }
-  if (serviceBookingIsPending(booking)) {
-    return {
-      valid: false,
-      errorMessage: "This request has not been approved yet.",
-    };
-  }
-  return { valid: true };
-}
-
 export function serviceBookingCanBeCanceled(
   service: ServiceExt,
   booking: ServiceBookingExt