@bash-app/bash-common 29.18.8 → 29.18.10

package/package.json

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

package/prisma/schema.prisma

@@ -187,60 +187,60 @@ model Invitation {
 }
 
 model BashEvent {
-  id                             String             @id @default(cuid())
-  title                          String
-  creatorId                      String
-  creator                        User               @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
-  description                    String?
-  eventType                      String             @default("Other")
-  startDateTime                  DateTime?          @default(now())
-  endDateTime                    DateTime?          @default(now())
-  ticketTiers                    TicketTier[]
-  targetAudienceId               String?            @unique
-  targetAudience                 TargetAudience?    @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)
-  amountOfGuestsId               String?            @unique
-  amountOfGuests                 AmountOfGuests?    @relation(fields: [amountOfGuestsId], references: [id], onDelete: Cascade)
-  recurrence                     Recurrence?
-  vibe                           String?
-  occasion                       String?
-  dress                          String?
-  allowed                        String?
-  notAllowed                     String?
-  nonProfit                      Boolean?
-  nonProfitId                    String?
-  privacy                        Privacy            @default(Public)
-  tickets                        Ticket[]
-  reviews                        Review[]
-  sponsorships                   SponsoredEvent[]
-  investments                    Investment[]
-  capacity                       Int?
-  location                       String?
-  status                         BashStatus         @default(Draft)
-  tags                           String[]
-  coverPhoto                     String?
-  media                          Media[]
-  club                           Club?              @relation(fields: [clubId], references: [id], onDelete: SetNull)
-  clubId                         String?
-  links                          EventLink[]
-  competitions                   Competition[]
-  invitations                    Invitation[]
-  dateTimePublished              DateTime?
-  comments                       BashComment[]
-  includedItems                  String[]
-  associatedBashesReferencingMe  AssociatedBash[] //maybe rename later to AssociatedWithABash
+  id                              String             @id @default(cuid())
+  title                           String
+  creatorId                       String
+  creator                         User               @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
+  description                     String?
+  eventType                       String             @default("Other")
+  startDateTime                   DateTime?          @default(now())
+  endDateTime                     DateTime?          @default(now())
+  ticketTiers                     TicketTier[]
+  targetAudienceId                String?            @unique
+  targetAudience                  TargetAudience?    @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)
+  amountOfGuestsId                String?            @unique
+  amountOfGuests                  AmountOfGuests?    @relation(fields: [amountOfGuestsId], references: [id], onDelete: Cascade)
+  recurrence                      Recurrence?
+  vibe                            String?
+  occasion                        String?
+  dress                           String?
+  allowed                         String?
+  notAllowed                      String?
+  nonProfit                       Boolean?
+  nonProfitId                     String?
+  privacy                         Privacy            @default(Public)
+  tickets                         Ticket[]
+  reviews                         Review[]
+  sponsorships                    SponsoredEvent[]
+  investments                     Investment[]
+  capacity                        Int?
+  location                        String?
+  status                          BashStatus         @default(Draft)
+  tags                            String[]
+  coverPhoto                      String?
+  media                           Media[]
+  club                            Club?              @relation(fields: [clubId], references: [id], onDelete: SetNull)
+  clubId                          String?
+  links                           EventLink[]
+  competitions                    Competition[]
+  invitations                     Invitation[]
+  dateTimePublished               DateTime?
+  comments                        BashComment[]
+  includedItems                   String[]
+  associatedBashesReferencingMe   AssociatedBash[] //maybe rename later to AssociatedWithABash
   associatedServicesReferencingMe Service[] //maybe rename later to AssociatedWithAService
-  bashNotificationsReferencingMe BashNotification[]
-  checkouts                      Checkout[]
-  eventTasks                     EventTask[]
-  videoLink                      String?
-  subtitle                       String?
-  isFeatured                     Boolean?
-  isTrending                     Boolean?
-  coordinates                    Coordinates[] // A BashEvent can have multiple sets of coordinates
+  bashNotificationsReferencingMe  BashNotification[]
+  checkouts                       Checkout[]
+  eventTasks                      EventTask[]
+  videoLink                       String?
+  subtitle                        String?
+  isFeatured                      Boolean?
+  isTrending                      Boolean?
+  coordinates                     Coordinates[] // A BashEvent can have multiple sets of coordinates
   // stripeAccount                  StripeAccount[]
-  rate                           Rate[]
-  venueId                        String? // Nullable, meaning it's optional
-  venue                          Venue?             @relation(fields: [venueId], references: [id])
+  rate                            Rate[]
+  venueId                         String? // Nullable, meaning it's optional
+  venue                           Venue?             @relation(fields: [venueId], references: [id])
 }
 
 model Coordinates {
@@ -928,10 +928,9 @@ model AssociatedBash {
   owner        User?       @relation(fields: [ownerUserId], references: [id], onDelete: Cascade)
   isOrganizer  Boolean?
   isFavorite   Boolean?
-  service Service[]
+  service      Service[]
 
   @@unique([ownerEmail, bashEventId])
-  
 }
 
 //anyone that is invited to be an organizer of a service profile or is the creator/owner...for having others edit or post about a service in the bashfeed (but the service must be associated with a bash to post)
@@ -969,7 +968,7 @@ model Service {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  associatedBashesReferencingMe AssociatedBash[]
+  associatedBashesReferencingMe   AssociatedBash[]
   associatedServicesReferencingMe AssociatedService[]
 
   serviceName String?

package/src/definitions.ts

@@ -12,7 +12,7 @@ import {
   User,
   YearsOfExperience
 } from "@prisma/client";
-import { ServiceExt, CheckoutExt, PublicUser, VolunteerServiceExt} from "./extendedSchemas";
+import { ServiceExt, CheckoutExt, PublicUser, VolunteerServiceExt, BashEventExt} from "./extendedSchemas";
 
 export const PASSWORD_MIN_LENGTH = 10 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{${PASSWORD_MIN_LENGTH},}$`);
@@ -285,18 +285,35 @@ export interface StripeCreateBashEventDonationCheckoutSessionArgs {
   donationAmount: number;
 }
 
-export interface StripeSessionRedirect {
+export type StripeSessionRedirect = {
   redirectUrl: string;
 }
 
-export interface ServiceStripeSessionRedirect {
+export type ServiceStripeSessionRedirect = {
   service: ServiceExt;
-  redirectUrl: string;
-}
+} & StripeSessionRedirect;
 
-export interface BashEventStripeSessionRedirect {
-  service: ServiceExt;
-  redirectUrl: string;
+export type BashEventStripeSessionRedirect = {
+  bashEvent: BashEventExt;
+} & StripeSessionRedirect;
+
+export type StripeLinkingStatus = "Complete" | "Incomplete";
+
+export interface StripeBusinessDataOwned {
+  logo?: string;
+  businessName?: string;
+  businessNameDBA?: string;
+  email: string;
+  phone: string;
+  website: string;
+  address: string;
+  accountType: string;
+  bankAccount: string;
+  paymentsEnabled: boolean;
+  createdDate: Date;
+  updatedDate: Date;
+  linkingStatus: StripeLinkingStatus; //enum
+  taxMonitoringEnabled: boolean;
 }
 
 export interface StripeConfirmPayment {