@bash-app/bash-common 30.15.0 → 30.17.0

package/package.json

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

package/prisma/schema.prisma

@@ -240,6 +240,7 @@ model Invitation {
   acceptedDate      DateTime?
   rejectedDate      DateTime?
   maybeDate         DateTime?
+  isFreeGuest       Boolean            @default(false)
   tickets           Ticket[]           @relation("TicketsForInvitation")
   bashNotifications BashNotification[]
   associatedBash    AssociatedBash?
@@ -312,6 +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
 }
 
 model Coordinates {
@@ -928,12 +930,12 @@ enum SocialMediaPlatform {
 }
 
 model User {
-  id                            String                    @id @default(cuid())
-  email                         String                    @unique
-  createdOn                     DateTime                  @default(now())
-  stripeCustomerId              String?                   @unique
-  stripeAccountId               String?                   @unique
-  isSuperUser                   Boolean                   @default(false)
+  id                            String               @id @default(cuid())
+  email                         String               @unique
+  createdOn                     DateTime             @default(now())
+  stripeCustomerId              String?              @unique
+  stripeAccountId               String?              @unique
+  isSuperUser                   Boolean              @default(false)
   // isSuspended                   Boolean                   @default(false)
   intent                        UserIntent?
   googleCalendarAccess          String?
@@ -946,12 +948,12 @@ model User {
   dob                           DateTime?
   gender                        Gender?
   sex                           Sex?
-  roles                         UserRole[]                @default([User])
-  ownedServices                 Service[]                 @relation("OwnedService")
-  createdServices               Service[]                 @relation("CreatedService")
-  createdEvents                 BashEvent[]               @relation("CreatedEvent")
-  ticketsISent                  Ticket[]                  @relation("TicketsISent")
-  ticketsIOwn                   Ticket[]                  @relation("TicketsIOwn")
+  roles                         UserRole[]           @default([User])
+  ownedServices                 Service[]            @relation("OwnedService")
+  createdServices               Service[]            @relation("CreatedService")
+  createdEvents                 BashEvent[]          @relation("CreatedEvent")
+  ticketsISent                  Ticket[]             @relation("TicketsISent")
+  ticketsIOwn                   Ticket[]             @relation("TicketsIOwn")
   reviews                       Review[]
   sponsorships                  SponsoredEvent[]
   investments                   Investment[]
@@ -974,34 +976,37 @@ model User {
   city                          String?
   state                         String?
   zipCode                       String?
-  country                       String?                   @default("US")
+  country                       String?              @default("US")
   phone                         String?
   socialMediaProfiles           SocialMediaProfile[]
-  documentIDId                  String?                   @unique
+  documentIDId                  String?              @unique
   documentID                    DocumentID?
   comment                       BashComment[]
   associatedBashes              AssociatedBash[]
   associatedServices            AssociatedService[]
-  invitationsCreatedByMe        Invitation[]              @relation("InvitationsCreatedByMe")
-  invitationsSentToMe           Invitation[]              @relation("InvitationsSentToMe")
-  notificationsCreatedByMe      BashNotification[]        @relation("NotificationsCreatedByMe")
-  remindersCreatedByMe          Reminder[]                @relation("RemindersCreatedByMe")
-  remindersAssignedToMe         Reminder[]                @relation("RemindersAssignedToMe")
-  eventTasksAssignedToMe        EventTask[]               @relation("TasksAssignedToMe")
+  invitationsCreatedByMe        Invitation[]         @relation("InvitationsCreatedByMe")
+  invitationsSentToMe           Invitation[]         @relation("InvitationsSentToMe")
+  notificationsCreatedByMe      BashNotification[]   @relation("NotificationsCreatedByMe")
+  remindersCreatedByMe          Reminder[]           @relation("RemindersCreatedByMe")
+  remindersAssignedToMe         Reminder[]           @relation("RemindersAssignedToMe")
+  eventTasksAssignedToMe        EventTask[]          @relation("TasksAssignedToMe")
   checkouts                     Checkout[]
   ticketTiersWaitListsIveJoined TicketTier[]
   contacts                      Contact[]
-  bashEventPromoCodesIUsed      BashEventPromoCode[]
+  contactLists                  ContactList[]        @relation("UserContactLists")
+  contactlist                   ContactList[]
+
+  bashEventPromoCodesIUsed BashEventPromoCode[]
   // bookingForMe                  Booking[]
-  userSubscription              UserSubscription?
+  userSubscription         UserSubscription?
   // serviceSubscriptions           ServiceSubscription[]
-  volunteerService              VolunteerService[]
-  stripeAccounts                StripeAccount[]
-  userPromoCodeRedemption       UserPromoCodeRedemption[]
-  accepted                      Boolean?                  @default(false) // Tracks if the user accepted the invitation
-  boughtTicket                  Boolean?                  @default(false) // Tracks if the user bought a ticket
-  noPay                         Boolean?                  @default(false) // Tracks if the user is marked as "noPay"
-  supportedEvent                Boolean?                  @default(false) // Tracks if the user supported the event
+  volunteerService         VolunteerService[]
+  stripeAccounts           StripeAccount[]
+  userPromoCodeRedemption  UserPromoCodeRedemption[]
+  accepted                 Boolean?                  @default(false) // Tracks if the user accepted the invitation
+  boughtTicket             Boolean?                  @default(false) // Tracks if the user bought a ticket
+  noPay                    Boolean?                  @default(false) // Tracks if the user is marked as "noPay"
+  supportedEvent           Boolean?                  @default(false) // Tracks if the user supported the event
 
   // primaryStripeAccountDBId String?        @unique
   // primaryStripeAccountDB   StripeAccount? @relation("PrimaryStripeAccount", fields: [primaryStripeAccountDBId], references: [id], onDelete: Restrict, onUpdate: Restrict)
@@ -1011,10 +1016,10 @@ model User {
   promoter                 Promoter[]
   promoterStats            PromoterStats?
 
-   blocksCreated            BlockedUser[]            @relation("UserBlocksMade")
-  blocksReceived           BlockedUser[]            @relation("UserBlocksReceived")
-  unblocksCreated          UnblockedUserHistory[]   @relation("UserUnblocksMade")
-  unblocksReceived         UnblockedUserHistory[]   @relation("UserUnblocksReceived")
+  blocksCreated    BlockedUser[]          @relation("UserBlocksMade")
+  blocksReceived   BlockedUser[]          @relation("UserBlocksReceived")
+  unblocksCreated  UnblockedUserHistory[] @relation("UserUnblocksMade")
+  unblocksReceived UnblockedUserHistory[] @relation("UserUnblocksReceived")
 }
 
 model Contact {
@@ -1031,6 +1036,20 @@ model Contact {
   @@index([contactEmail])
 }
 
+model ContactList {
+  id         String   @id @default(cuid())
+  name       String
+  ownerId    String
+  owner      User     @relation("UserContactLists", fields: [ownerId], references: [id], onDelete: Cascade)
+  contactIds String[] // Array of contact IDs
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
+  User       User?    @relation(fields: [userId], references: [id])
+  userId     String?
+
+  @@index([ownerId])
+}
+
 model BlockedUser {
   id        String   @id @default(cuid())
   blockerId String // User who blocked
@@ -1909,6 +1928,9 @@ model ServiceBooking {
   daysTotalATBCents Int //ATB=At Time of Booking
   totalATBCents     Int
 
+    bashEventId String?
+  bashEvent   BashEvent? @relation(fields: [bashEventId], references: [id])
+
   @@index([status])
   @@index([creatorId])
   @@index([forUserId])

package/src/definitions.ts

@@ -256,6 +256,7 @@ export type ApiServiceBookingParams = {
   bookedDays: ApiServiceBookedDayParams[];
   timezone: string;
   attendeeOption: ServiceAttendeeOption;
+  bashEventId?: string; 
 };
 
 export type ApiServiceCanBookParams = {} & ApiServiceBookingParams;

package/src/extendedSchemas.ts

@@ -632,7 +632,7 @@ export const INVITATION_DATA_TO_INCLUDE = {
 } satisfies Prisma.InvitationInclude;
 
 export interface InvitationExtraData extends Invitation {
-  isFreeGuest?: boolean;
+  isFreeGuest: boolean;
   isOrganizer?: boolean;
 }
 

package/src/utils/stripeAccountUtils.ts

@@ -1,13 +1,14 @@
 import { StripeLinkingStatus } from "../definitions";
-import { isProduction } from "./apiUtils";
 
 export const stripeAccountFullyLinked = (
-  linkingStatus: StripeLinkingStatus
+  linkingStatus: StripeLinkingStatus | null | undefined
 ): boolean => {
   return (
+    linkingStatus != null &&
     !linkingStatus.hasOutstandingRequirements &&
     linkingStatus.isOnboarded &&
     linkingStatus.paymentsEnabled &&
-    (!isProduction() || linkingStatus.taxMonitoringEnabled)
+    linkingStatus.taxMonitoringEnabled
+    // (!isProduction() || linkingStatus.taxMonitoringEnabled);
   );
 };