@bash-app/bash-common 29.49.0 → 29.51.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.49.0",
+  "version": "29.51.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -26,9 +26,9 @@
     "qrcode": "^1.5.3"
   },
   "peerDependencies": {
-    "@prisma/client": "^5.18.0",
+    "@prisma/client": "^6.1.0",
     "dayjs": "^1.11.13",
-    "prisma": "^5.18.0",
+    "prisma": "^6.1.0",
     "react-tailwindcss-datepicker": "^1.6.6",
     "tsx": "^4.10.3"
   },

package/prisma/schema.prisma

@@ -187,20 +187,20 @@ model Invitation {
 }
 
 model BashEvent {
-  id                              String             @id @default(cuid())
+  id                              String                    @id @default(cuid())
   title                           String
   creatorId                       String
-  creator                         User               @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
+  creator                         User                      @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
   isApproved                      Boolean?
   description                     String?
-  eventType                       String             @default("Other")
-  startDateTime                   DateTime?          @default(now())
-  endDateTime                     DateTime?          @default(now())
+  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)
+  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?
@@ -209,18 +209,18 @@ model BashEvent {
   notAllowed                      String?
   nonProfit                       Boolean?
   nonProfitId                     String?
-  privacy                         Privacy            @default(Public)
+  privacy                         Privacy                   @default(Public)
   tickets                         Ticket[]
   reviews                         Review[]
   sponsorships                    SponsoredEvent[]
   investments                     Investment[]
   capacity                        Int?
   location                        String?
-  status                          BashStatus         @default(Draft)
+  status                          BashStatus                @default(Draft)
   tags                            String[]
   coverPhoto                      String?
   media                           Media[]
-  club                            Club?              @relation(fields: [clubId], references: [id], onDelete: SetNull)
+  club                            Club?                     @relation(fields: [clubId], references: [id], onDelete: SetNull)
   clubId                          String?
   links                           EventLink[]
   competitions                    Competition[]
@@ -241,7 +241,9 @@ model BashEvent {
   // stripeAccount                  StripeAccount[]
   // rate                            Rate[]
   venueId                         String? // Nullable, meaning it's optional
-  venue                           Venue?             @relation(fields: [venueId], references: [id])
+  venue                           Venue?                    @relation(fields: [venueId], references: [id])
+  userPromoCodeRedemption         UserPromoCodeRedemption[]
+  averageRating                   Float?                    @default(0)
 }
 
 model Coordinates {
@@ -627,6 +629,12 @@ enum ServiceCondition {
   Deactivated
 }
 
+enum ServiceSubscriptionStatus {
+  None
+  Trialing
+  Normal
+}
+
 enum VolunteerServiceStatus {
   Draft
   Pending
@@ -748,6 +756,10 @@ model Review {
   bashEventId String
   bashEvent   BashEvent     @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
   comments    BashComment[]
+  createdAt   DateTime      @default(now()) // Add this for timestamps
+  updatedAt   DateTime      @updatedAt
+
+  @@unique([creatorId, bashEventId])
 }
 
 model GoogleReview {
@@ -833,12 +845,13 @@ 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)
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
@@ -849,12 +862,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[]
@@ -869,6 +882,8 @@ model User {
   competitionPrizes             Prize[]
   userRatingGiven               UserRatingGiven[]
   userRating                    UserRating[]
+  hostRating                    Float?
+  totalRatings                  Int?
   magicLink                     String?
   magicLinkExpiration           DateTime?
   magicLinkUsed                 DateTime?
@@ -877,20 +892,20 @@ 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[]
@@ -901,7 +916,10 @@ model User {
   // serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
   stripeAccounts                StripeAccount[]
-  servicePromoCodeRedemption    ServicePromoCodeRedemption[]
+  userPromoCodeRedemption       UserPromoCodeRedemption[]
+
+  // primaryStripeAccountDBId String?        @unique
+  // primaryStripeAccountDB   StripeAccount? @relation("PrimaryStripeAccount", fields: [primaryStripeAccountDBId], references: [id], onDelete: Restrict, onUpdate: Restrict)
 }
 
 model Contact {
@@ -973,16 +991,26 @@ enum UserSubscriptionStatus {
 }
 
 enum UserSubscriptionType {
-  Free
+  // Free
   Basic
-  Premium
-  VIP
+  // Premium
+  // VIP
 }
 
-enum ServiceSubscriptionTier {
-  Basic
-  Premium
-  VIP
+// enum ServiceSubscriptionTier {
+//   Ally
+//   Partner
+//   Patreon
+// }
+
+model ServiceSubscriptionCounts {
+  id String @id @default(cuid())
+
+  allyCount         Int               @default(0)
+  partnerCount      Int               @default(0)
+  patronCount       Int               @default(0)
+  subscriptionCount UserSubscription? @relation("subscriptionCount")
+  listedCount       UserSubscription? @relation("listedCount")
 }
 
 model UserSubscription {
@@ -994,15 +1022,29 @@ model UserSubscription {
   stripeAccountId String        @unique
   stripeAccount   StripeAccount @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict, onUpdate: Restrict)
 
-  stripeCheckoutSessionId String? @unique
   stripeSubscriptionId    String? @unique
+  stripeCheckoutSessionId String? @unique //used to set default payment method if one does not already exist on the customer
 
   type   UserSubscriptionType?
   status UserSubscriptionStatus?
 
   //price addons
-  serviceSubscriptionTier ServiceSubscriptionTier?
+  // serviceSubscriptionTier ServiceSubscriptionTier?
+  subscriptionCountId String                    @unique
+  subscriptionCount   ServiceSubscriptionCounts @relation("subscriptionCount", fields: [subscriptionCountId], references: [id], onDelete: Cascade)
+
+  listedCountId String                    @unique
+  listedCount   ServiceSubscriptionCounts @relation("listedCount", fields: [listedCountId], references: [id], onDelete: Cascade)
 
+  // allySubscriptionCount    Int @default(0)
+  // partnerSubscriptionCount Int @default(0)
+  // patreonSubscriptionCount Int @default(0)
+
+  // allyServicesListed    Int @default(0)
+  // partnerServicesListed Int @default(0)
+  // patreonServicesListed Int @default(0)
+
+  @@index([ownerId])
   @@index([stripeCheckoutSessionId])
   @@index([stripeSubscriptionId])
 }
@@ -1011,9 +1053,10 @@ model UserSubscription {
 model Service {
   id String @id @default(cuid())
 
-  serviceType      ServiceTypes?
-  serviceStatus    ServiceStatus    @default(Draft)
-  serviceCondition ServiceCondition @default(Pending)
+  serviceType        ServiceTypes?
+  serviceStatus      ServiceStatus             @default(Draft)
+  serviceCondition   ServiceCondition          @default(Pending)
+  subscriptionStatus ServiceSubscriptionStatus @default(None)
 
   isApproved Boolean @default(false)
 
@@ -1093,8 +1136,8 @@ model Service {
 
   // googleReviews GoogleReview[]
 
-  bashEvent                  BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
-  servicePromoCodeRedemption ServicePromoCodeRedemption[]
+  bashEvent               BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
+  userPromoCodeRedemption UserPromoCodeRedemption[]
 }
 
 model StripeAccount {
@@ -1246,11 +1289,14 @@ model Venue {
   bashEvents BashEvent[]
 }
 
-model ServicePromoCodeRedemption {
+model UserPromoCodeRedemption {
   id        String   @id @default(cuid())
   serviceId String?
   service   Service? @relation(fields: [serviceId], references: [id], onDelete: Cascade)
 
+  bashEventId String?
+  bashEvent   BashEvent? @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+
   userId String?
   user   User?   @relation(fields: [userId], references: [id], onDelete: Cascade)
 

package/scripts/symlinks.sh

@@ -0,0 +1,31 @@
+# run this script after any schema change to make sure the typescript defintions are updated or
+#... or if npm i is run on any of the repos, as it may overwrite the symlink
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+PATH_TO_PARENT_DIR="../.."
+NODE_MODULES_PATH="node_modules/@bash-app"
+FRONT_END_TARGET="$SCRIPT_DIR/$PATH_TO_PARENT_DIR/bash-app"
+API_TARGET="$SCRIPT_DIR/$PATH_TO_PARENT_DIR/api"
+
+TARGETS=(
+  $FRONT_END_TARGET
+  $API_TARGET
+)
+
+BASH_COMMON_TARGET="$SCRIPT_DIR/$PATH_TO_PARENT_DIR/bash-common"
+
+echo "FRONT_END_TARGET: $FRONT_END_TARGET"
+echo "API_TARGET: $API_TARGET"
+echo "BASH_COMMON_TARGET: $BASH_COMMON_TARGET"
+printf "\n\n"
+
+cd $BASH_COMMON_TARGET && npx prisma generate
+
+for TARGET in "${TARGETS[@]}"; do
+  rm -rf "$TARGET/$NODE_MODULES_PATH"
+  mkdir -p "$TARGET/$NODE_MODULES_PATH"
+  
+  ln -s "$BASH_COMMON_TARGET" "$TARGET/$NODE_MODULES_PATH"
+  cd $TARGET && cp -rf "./$NODE_MODULES_PATH/bash-common/prisma" . && npm run generate
+done