@bash-app/bash-common 30.16.0 → 30.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "30.16.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 {
@@ -1926,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);
   );
 };