@bash-app/bash-common 30.40.0 → 30.42.0

package/package.json

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

package/prisma/schema.prisma

@@ -94,18 +94,18 @@ model CompetitionSponsor {
 }
 
 model EventTask {
-  id                             String             @id @default(cuid())
-  creatorId                      String
-  creator                        User               @relation(fields: [creatorId], references: [id], onDelete: Cascade)
-  bashEventId                    String
-  bashEvent                      BashEvent          @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  title                          String
-  description                    String?
-  assignedToId                   String?
-  assignedTo                     User?              @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
-  status                         TaskStatus?
-  bashNotificationsReferencingMe BashNotification[]
-  createdAt                      DateTime?          @default(now())
+  id                         String         @id @default(cuid())
+  creatorId                  String
+  creator                    User           @relation(fields: [creatorId], references: [id], onDelete: Cascade)
+  bashEventId                String
+  bashEvent                  BashEvent      @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  title                      String
+  description                String?
+  assignedToId               String?
+  assignedTo                 User?          @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
+  status                     TaskStatus?
+  notificationsReferencingMe Notification[]
+  createdAt                  DateTime?      @default(now())
 }
 
 enum TaskStatus {
@@ -118,14 +118,14 @@ enum TaskStatus {
 }
 
 model Reminder {
-  id             String           @id @default(cuid())
+  id             String       @id @default(cuid())
   creatorId      String
-  creator        User             @relation("RemindersCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
+  creator        User         @relation("RemindersCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
   remindWhoId    String?
-  remindWho      User?            @relation("RemindersAssignedToMe", fields: [remindWhoId], references: [id], onDelete: Cascade)
+  remindWho      User?        @relation("RemindersAssignedToMe", fields: [remindWhoId], references: [id], onDelete: Cascade)
   remindDateTime DateTime
   notificationId String
-  notification   BashNotification @relation(fields: [notificationId], references: [id], onDelete: Cascade)
+  notification   Notification @relation(fields: [notificationId], references: [id], onDelete: Cascade)
 }
 
 model BashEventPromoCode {
@@ -195,15 +195,18 @@ model PromoterClick {
   clickedAt        DateTime @default(now())
 }
 
-model BashNotification {
+model Notification {
   id               String          @id @default(cuid())
   creatorId        String
   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())
   message          String
   image            String?
   readDateTime     DateTime?
+  type             String // Notification type: "FOLLOW", "TASK", "EVENT", etc.
   taskId           String?
   eventTask        EventTask?      @relation(fields: [taskId], references: [id], onDelete: Cascade)
   invitationId     String?
@@ -217,33 +220,41 @@ model BashNotification {
   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)
+  expiresAt   DateTime? // For time-sensitive notifications
+
   @@unique([creatorId, email, bashEventId, taskId])
   @@unique([creatorId, email, invitationId])
   @@unique([creatorId, email, serviceBookingId])
   @@index([creatorId])
+  @@index([userId])
+  @@index([type]) // Add index for efficient filtering by notification type
 }
 
 model Invitation {
-  id                String             @id @default(cuid())
-  creatorId         String
-  creator           User               @relation("InvitationsCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
-  email             String
-  sentToId          String?
-  sentTo            User?              @relation("InvitationsSentToMe", fields: [sentToId], references: [id], onDelete: Cascade)
-  bashEventId       String?
-  bashEvent         BashEvent?         @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  image             String?
-  phone             String?
-  name              String?
-  message           String?
-  inviteDate        DateTime?          @default(now())
-  acceptedDate      DateTime?
-  rejectedDate      DateTime?
-  maybeDate         DateTime?
-  isFreeGuest       Boolean            @default(false)
-  tickets           Ticket[]           @relation("TicketsForInvitation")
-  bashNotifications BashNotification[]
-  associatedBash    AssociatedBash?
+  id             String          @id @default(cuid())
+  creatorId      String
+  creator        User            @relation("InvitationsCreatedByMe", fields: [creatorId], references: [id], onDelete: Cascade)
+  email          String
+  sentToId       String?
+  sentTo         User?           @relation("InvitationsSentToMe", fields: [sentToId], references: [id], onDelete: Cascade)
+  bashEventId    String?
+  bashEvent      BashEvent?      @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  image          String?
+  phone          String?
+  name           String?
+  message        String?
+  inviteDate     DateTime?       @default(now())
+  acceptedDate   DateTime?
+  rejectedDate   DateTime?
+  maybeDate      DateTime?
+  isFreeGuest    Boolean         @default(false)
+  tickets        Ticket[]        @relation("TicketsForInvitation")
+  notifications  Notification[]
+  associatedBash AssociatedBash?
 
   @@index([email])
 }
@@ -302,7 +313,7 @@ model BashEvent {
   includedItems                   String[]
   associatedBashesReferencingMe   AssociatedBash[] // maybe rename later to AssociatedWithABash
   associatedServicesReferencingMe Service[] // maybe rename later to AssociatedWithAService
-  bashNotificationsReferencingMe  BashNotification[]
+  notificationsReferencingMe      Notification[]
   checkouts                       Checkout[]
   eventTasks                      EventTask[]
   videoLink                       String?
@@ -1047,7 +1058,7 @@ model User {
   associatedServices            AssociatedService[]
   invitationsCreatedByMe        Invitation[]         @relation("InvitationsCreatedByMe")
   invitationsSentToMe           Invitation[]         @relation("InvitationsSentToMe")
-  notificationsCreatedByMe      BashNotification[]   @relation("NotificationsCreatedByMe")
+  notificationsCreatedByMe      Notification[]       @relation("NotificationsCreatedByMe")
   remindersCreatedByMe          Reminder[]           @relation("RemindersCreatedByMe")
   remindersAssignedToMe         Reminder[]           @relation("RemindersAssignedToMe")
   eventTasksAssignedToMe        EventTask[]          @relation("TasksAssignedToMe")
@@ -1094,6 +1105,10 @@ model User {
   demerits         Demerit[]    @relation("UserDemerits")
   issuedDemerits   Demerit[]    @relation("IssuedDemerits")
   expungedDemerits Demerit[]    @relation("ExpungedDemerits")
+
+  notification Notification[]  @relation("NotificationsReceivedByMe")
+  followers    UserFollowing[] @relation("Following")
+  following    UserFollowing[] @relation("Follower")
 }
 
 model UserPreferences {
@@ -1164,6 +1179,20 @@ model UserPreferences {
   updatedAt DateTime @updatedAt
 }
 
+model UserFollowing {
+  id           String    @id @default(cuid())
+  userId       String
+  followingId  String
+  isFollowing  Boolean   @default(true)
+  followedAt   DateTime?
+  unfollowedAt DateTime?
+
+  user      User @relation("Follower", fields: [userId], references: [id], onDelete: Cascade)
+  following User @relation("Following", fields: [followingId], references: [id], onDelete: Cascade)
+
+  @@unique([userId, followingId])
+}
+
 model Contact {
   id                       String    @id @default(cuid())
   contactOwnerId           String
@@ -1393,6 +1422,9 @@ model Service {
   displayGoogleReviewsOnDetailPage Boolean @default(true)
   displayBashReviewsOnDetailPage   Boolean @default(true)
 
+  serviceRating Float? @default(0)
+  totalRatings  Int?   @default(0)
+
   stripeAccountId String?
   stripeAccount   StripeAccount? @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict)
 
@@ -1431,7 +1463,7 @@ model Service {
   bashEvent               BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
   userPromoCodeRedemption UserPromoCodeRedemption[]
   bookings                ServiceBooking[]
-  bashNotification        BashNotification[]
+  notification            Notification[]
 }
 
 model StripeAccount {
@@ -1573,6 +1605,7 @@ model Venue {
   secondaryVenueTypes  String[]          @default([])
   pitch                String?
   capacity             Int?
+  squareFootage        Int?
   anticipatedAttendees Int?
   trademark            Boolean?
   manager              Boolean?
@@ -2064,8 +2097,8 @@ model ServiceBooking {
   isFreeGuest       Boolean @default(false)
   allowPromiseToPay Boolean @default(false)
 
-  checkout         ServiceBookingCheckout?
-  bashNotification BashNotification[]
+  checkout     ServiceBookingCheckout?
+  notification Notification[]
 
   additionalFees ServiceBookingFee[]
 
@@ -2230,6 +2263,7 @@ model UserStats {
   totalEarnings       Float @default(0)
   servicesBookedCount Int   @default(0)
   followersCount      Int   @default(0)
+  followingCount      Int   @default(0)
 
   // Rankings
   hostRank     Int? // Rank based on number of events hosted

package/src/extendedSchemas.ts

@@ -5,7 +5,6 @@ import {
   BashComment,
   BashEvent,
   BashEventPromoCode,
-  BashNotification,
   Checkout,
   Contact,
   Coordinates,
@@ -17,6 +16,7 @@ import {
   Invitation,
   Link,
   Media,
+  Notification,
   Organization,
   Prisma,
   Recurrence,
@@ -63,6 +63,11 @@ import {
   UnionFromArray
 } from "./utils/typeUtils";
 
+export interface ApiResponse<T> {
+  data: T;
+  error?: string;
+}
+
 //------------------------------------------------------user subscriptions------------------------------------------------------
 export const PUBLIC_USER_SUBSCRIPTION_DATA_TO_SELECT = {
   type: true,
@@ -93,6 +98,7 @@ export type UserSubscriptionExt = {
 
 export const FRONT_END_USER_DATA_TO_SELECT = {
   id: true,
+  username: true,
   email: true,
   givenName: true,
   familyName: true,
@@ -630,7 +636,7 @@ export interface ServiceLinkExt extends ServiceLink {
 
 //-----------------------------------------
 
-export interface BashNotificationExt extends BashNotification {
+export interface NotificationExt extends Notification {
   bashEvent?: BashEvent;
   creator?: PublicUser;
   eventTask?: EventTask;
@@ -676,7 +682,7 @@ export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
   serviceBooking: {
     include: SERVICE_BOOKING_PUBLIC_DATA_TO_INCLUDE,
   },
-} satisfies Prisma.BashNotificationInclude;
+} satisfies Prisma.NotificationInclude;
 
 export interface EventTaskExt extends EventTask {
   creator: PublicUser;

package/src/utils/addressUtils.ts

@@ -1,4 +1,4 @@
-import {IAddress} from "../definitions";
+import { IAddress } from "../definitions";
 
 const ADDRESS_DELIM = '|';
 
@@ -32,21 +32,50 @@ export function databaseAddressStringToAddressValues(addressString: string | und
 
 export function databaseAddressStringToOneLineString(addressString: string | undefined | null): string {
   if (addressString) {
+    // Special handling for place-only addresses
+    if (!addressString.includes(ADDRESS_DELIM)) {
+      return addressString.trim();
+    }
+    
     const address = databaseAddressStringToAddressValues(addressString);
+    
+    // If only place exists, just return it
+    if (address.place && 
+        (!address.street || address.street === 'undefined') && 
+        (!address.city || address.city === 'undefined') && 
+        (!address.state || address.state === 'undefined')) {
+      return address.place.trim();
+    }
+    
     let addressArr = address.place ? [address.place] : [];
-    addressArr = [...addressArr, address.street, address.city, address.state];
-    const addressStr = addressArr.filter((str) => !!str).join(', ');
-    return `${addressStr} ${address.zipCode}`;
+    
+    // Add non-empty and non-undefined parts
+    if (address.street && address.street !== 'undefined') addressArr.push(address.street);
+    if (address.city && address.city !== 'undefined') addressArr.push(address.city);
+    if (address.state && address.state !== 'undefined') addressArr.push(address.state);
+    
+    const addressStr = addressArr.filter(str => !!str && str !== 'undefined').join(', ');
+    
+    // Only add zip code if it exists and isn't 'undefined'
+    return address.zipCode && address.zipCode !== 'undefined' 
+      ? `${addressStr} ${address.zipCode}`
+      : addressStr;
   }
   return '';
 }
 
 export function databaseAddressStringToDisplayString(addressString: string | undefined | null): string {
   if (addressString) {
+    // Special handling for place-only addresses (no delimiters)
+    if (!addressString.includes(ADDRESS_DELIM)) {
+      return addressString.trim();
+    }
+    
     const oneLineString = databaseAddressStringToOneLineString(addressString);
     const formatted = oneLineString.replace(/([A-Z])(?=[A-Z][a-z])/g, "$1 ") // Add space between a single uppercase letter and a capitalized word
                  .replace(/(\d)(?=[A-Z])/g, "$1 ") // Add space between numbers and letters
-                 .replace(/,/g, ", "); // Add space after commas
+                 .replace(/,/g, ", ") // Add space after commas
+                 .replace(/undefined/g, ""); // Remove any "undefined" strings
     return formatted;
   }
   return '';