@bash-app/bash-common 29.18.7 → 29.18.9

package/package.json

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

package/prisma/schema.prisma

@@ -227,7 +227,8 @@ model BashEvent {
   dateTimePublished              DateTime?
   comments                       BashComment[]
   includedItems                  String[]
-  associatedBashesReferencingMe  AssociatedBash[]
+  associatedBashesReferencingMe  AssociatedBash[] //maybe rename later to AssociatedWithABash
+  associatedServicesReferencingMe Service[] //maybe rename later to AssociatedWithAService
   bashNotificationsReferencingMe BashNotification[]
   checkouts                      Checkout[]
   eventTasks                     EventTask[]
@@ -915,6 +916,7 @@ model Contact {
   @@index([contactEmail])
 }
 
+//anyone that is invited to the bash, is an organizer of a bash, and or the creator/owner of the bash...for having others (including services) edit or post about a bash in the bashfeed
 model AssociatedBash {
   id           String      @id @default(cuid())
   bashEventId  String
@@ -926,10 +928,13 @@ model AssociatedBash {
   owner        User?       @relation(fields: [ownerUserId], references: [id], onDelete: Cascade)
   isOrganizer  Boolean?
   isFavorite   Boolean?
+  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)
 model AssociatedService {
   id          String   @id @default(cuid())
   serviceId   String
@@ -964,6 +969,7 @@ model Service {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
+  associatedBashesReferencingMe AssociatedBash[]
   associatedServicesReferencingMe AssociatedService[]
 
   serviceName String?
@@ -1021,6 +1027,8 @@ model Service {
   organization         Organization?
 
   // googleReviews GoogleReview[]
+
+  bashEvent BashEvent[] //because a service needs to be associated with a bash to post to the bashfeed
 }
 
 model StripeAccount {
@@ -1240,11 +1248,14 @@ model ServiceRange {
   Sponsor               Sponsor[]
 }
 
+//different days of the week have different rates
+//can block of certain dates of the year and days of the week as being closed
+//can have special rates on different days of the year (single or range)
 model Availability {
   id                 String            @id @default(cuid())
-  startDateTime      String
-  endDateTime        String
-  venueId            String?
+  dayOfWeek          Int
+  startDateTime      DateTime          @db.Time
+  endDateTime        DateTime          @db.Time
   serviceId          String?
   service            Service?          @relation("AvailableDateTimes", fields: [serviceId], references: [id])
   volunteerServiceId String?

package/src/definitions.ts

@@ -12,7 +12,7 @@ import {
   User,
   YearsOfExperience
 } from "@prisma/client";
-import { ServiceExt, CheckoutExt, PublicUser, VolunteerServiceExt, SERVICE_DATA_TO_INCLUDE} 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,10 +285,37 @@ export interface StripeCreateBashEventDonationCheckoutSessionArgs {
   donationAmount: number;
 }
 
-export interface StripeSessionRedirect {
+export type StripeSessionRedirect = {
   redirectUrl: string;
 }
 
+export type ServiceStripeSessionRedirect = {
+  service: ServiceExt;
+} & StripeSessionRedirect;
+
+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 {
   checkoutSessionId: string;
 }