@bash-app/bash-common 29.48.1 → 29.50.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.48.1",
+  "version": "29.50.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -27,7 +27,7 @@
   },
   "peerDependencies": {
     "@prisma/client": "^5.18.0",
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.13",
     "prisma": "^5.18.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,8 @@ 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[]
 }
 
 model Coordinates {
@@ -330,19 +331,6 @@ model ServiceCheckout {
   stripeCheckoutSessionId String?   @unique
 }
 
-model UserSubscription {
-  id      String               @id @default(cuid())
-  ownerId String               @unique
-  owner   User                 @relation(fields: [ownerId], references: [id], onDelete: Cascade)
-  type    UserSubscriptionType
-}
-
-enum UserSubscriptionType {
-  Free
-  Premium
-  VIP
-}
-
 enum BookingStatus {
   Cancelled
   Completed
@@ -846,12 +834,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)
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
@@ -862,12 +850,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[]
@@ -890,20 +878,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[]
@@ -911,10 +899,10 @@ model User {
   serviceCheckouts              ServiceCheckout[]
   bookingForMe                  Booking[]
   userSubscription              UserSubscription?
-  serviceSubcriptions           ServiceSubscription[]
+  // serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
   stripeAccounts                StripeAccount[]
-  ServicePromoCodeRedemption    ServicePromoCodeRedemption[]
+  userPromoCodeRedemption       UserPromoCodeRedemption[]
 }
 
 model Contact {
@@ -972,30 +960,52 @@ enum ServiceCancelationPolicy {
   Standard30Day
 }
 
-model ServiceSubscription {
-  id                   String  @id @default(cuid())
-  ownerId              String
-  owner                User    @relation(fields: [ownerId], references: [id], onDelete: Cascade)
-  slots                Int     @default(0)
-  stripeSubscriptionId String?
+enum UserSubscriptionStatus {
+  Active
+  Trialing
+  Paused
+  Canceled
+  Incomplete
+  IncompleteExpired
+  Unpaid
+  PastDue
+  Suspended
+  Expired
+}
+
+enum UserSubscriptionType {
+  // Free
+  Basic
+  // Premium
+  // VIP
+}
+
+enum ServiceSubscriptionTier {
+  Ally
+  Partner
+  Patreon
 }
 
-model ServiceListingSubscription {
-  id                      String        @id @default(cuid())
-  stripeAccountId         String
-  stripeAccount           StripeAccount @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict, onUpdate: Restrict)
-  stripeCheckoutSessionId String?       @unique
-  stripeSubscriptionId    String?       @unique
+model UserSubscription {
+  id String @id @default(cuid())
+
+  ownerId String @unique
+  owner   User   @relation(fields: [ownerId], references: [id], onDelete: Restrict, onUpdate: Restrict)
+
+  stripeAccountId String        @unique
+  stripeAccount   StripeAccount @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict, onUpdate: Restrict)
 
-  // lastCheckoutSessionCreatedAt DateTime
-  // checkoutInProgress           Boolean  @default(false)
+  stripeCheckoutSessionId String? @unique
+  stripeSubscriptionId    String? @unique
 
-  subscriptionStatus ServiceSubscriptionStatus @default(None)
+  type   UserSubscriptionType?
+  status UserSubscriptionStatus?
 
-  serviceId String  @unique
-  service   Service @relation(fields: [serviceId], references: [id], onDelete: Restrict)
+  //price addons
+  serviceSubscriptionTier ServiceSubscriptionTier?
 
-  @@index([stripeCheckoutSessionId, stripeSubscriptionId])
+  @@index([stripeCheckoutSessionId])
+  @@index([stripeSubscriptionId])
 }
 
 // Common data for all services; 1-1 relation between each individual service model such as Venue
@@ -1060,8 +1070,6 @@ model Service {
   stripeAccountId String?
   stripeAccount   StripeAccount? @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict)
 
-  serviceListingSubscription ServiceListingSubscription?
-
   targetAudienceId String?         @unique
   targetAudience   TargetAudience? @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)
 
@@ -1086,8 +1094,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 {
@@ -1105,8 +1113,8 @@ model StripeAccount {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  service                    Service[]
-  ServiceListingSubscription ServiceListingSubscription[]
+  service          Service[]
+  userSubscription UserSubscription?
 
   @@index([ownerId])
 }
@@ -1239,11 +1247,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)
 
@@ -1265,20 +1276,6 @@ enum VenuePricingPlan {
   Subscription
 }
 
-enum ServiceSubscriptionStatus {
-  None
-  Active
-  Trialing
-  Paused
-  Canceled
-  Incomplete
-  IncompleteExpired
-  Unpaid
-  PastDue
-  Suspended
-  Expired
-}
-
 model Organization {
   id                  String             @id @default(cuid())
   serviceId           String             @unique

package/src/extendedSchemas.ts

@@ -36,12 +36,30 @@ import {
   ServiceSpecialRates,
   ServiceAddon,
   ServicePackage,
-  ServiceListingSubscription,
+  UserSubscription,
   SocialMediaProfile,
   SocialMediaPlatform,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
 
+//------------------------------------------------------user subscriptions------------------------------------------------------
+export const PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT = {
+  type: true,
+  status: true,
+  serviceSubscriptionTier: true,
+  ownerId: true,
+  stripeAccountId: true
+} satisfies Prisma.UserSubscriptionSelect;
+
+export type UserSubscriptionExt = {
+  stripeAccount: StripeAccountExt;
+} & UserSubscription;
+
+export const USER_SUBSCRIPTION_DATA_TO_INCLUDE = {
+  stripeAccount: true
+} satisfies Prisma.UserSubscriptionInclude;
+//-------------------------------------------------------------------------------------------------------------------------------
+
 export const FRONT_END_USER_DATA_TO_SELECT = {
   id: true,
   email: true,
@@ -61,6 +79,9 @@ export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
   zipCode: true,
   country: true,
   phone: true,
+  userSubscription: {
+    select: PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT
+  }
 } satisfies Prisma.UserSelect;
 
 export interface BashEventExt extends BashEvent {
@@ -119,7 +140,6 @@ export interface ServiceExt extends Service {
   creator?: PublicUser | null;
 
   stripeAccount?: PublicStripeAccount | null;
-  serviceListingSubscription?: PublicServiceListingSubscription | null;
 
   // availableDateTimes?: Availability[];
 
@@ -294,13 +314,6 @@ export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
 } satisfies Prisma.ServiceRatesAssociationInclude;
 
 //------------Stripe Accounts--------------
-export const STRIPE_ACCOUNT_DATA_TO_INCLUDE = {
-  logo: true,
-  owner: {
-    select: FRONT_END_USER_DATA_TO_SELECT
-  }
-} satisfies Prisma.StripeAccountInclude;
-
 export const PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT = {
   logo: true,
   logoId: true,
@@ -308,9 +321,15 @@ export const PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT = {
   updatedAt: true
 } satisfies Prisma.StripeAccountSelect;
 
-export const PUBLIC_SERVICE_LISTING_SUBSCRIPTION_DATA_TO_SELECT = {
-  serviceId: true
-} satisfies Prisma.ServiceListingSubscriptionSelect;
+export const STRIPE_ACCOUNT_DATA_TO_INCLUDE = {
+  logo: true,
+  owner: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  },
+  userSubscription: {
+    select: PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT
+  }
+} satisfies Prisma.StripeAccountInclude;
 
 export interface StripeAccountExt extends StripeAccount {
   logo?: Media | null;
@@ -335,9 +354,6 @@ export const SERVICE_DATA_TO_INCLUDE = {
     // ...STRIPE_ACCOUNT_DATA_TO_INCLUDE,
     select: PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT
   },
-  serviceListingSubscription: {
-    select: PUBLIC_SERVICE_LISTING_SUBSCRIPTION_DATA_TO_SELECT
-  },
   // availableDateTimes: true,
   serviceLinks: {
     include: SERVICE_LINK_DATA_TO_INCLUDE
@@ -524,6 +540,7 @@ export interface UserExt extends User {
   services?: Service[] | null;
 
   // Do not include in fetch as there could be thousands of these
+  userSubscription?: UserSubscriptionExt | null;
   associatedBashes?: AssociatedBash[] | null;
   associatedServices?: AssociatedService[] | null;
   socialMediaProfiles?: SocialMediaProfile[] | null;
@@ -549,6 +566,4 @@ export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
 export type PublicUser = Pick<UserExt, keyof typeof FRONT_END_USER_DATA_TO_SELECT>
   & Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;
 
-export type PublicStripeAccount = Pick<StripeAccountExt, keyof typeof PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT>;
-
-export type PublicServiceListingSubscription = Pick<ServiceListingSubscription, keyof typeof PUBLIC_SERVICE_LISTING_SUBSCRIPTION_DATA_TO_SELECT>;
+export type PublicStripeAccount = Pick<StripeAccountExt, keyof typeof PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT>;

package/src/utils/service/serviceUtils.ts

@@ -98,25 +98,4 @@ function generateDescription(refundPolicy: ServiceCancelationRefundPolicy[]): st
 Object.keys(ServiceCancelationPolicyData).filter((policyKey) => policyKey as ServiceCancelationPolicyOption != ServiceCancelationPolicyOption.None).forEach((policyKey) => {
     const policy = ServiceCancelationPolicyData[policyKey as ServiceCancelationPolicyOption];
     policy.description = generateDescription(policy.refundPolicy);
-});
-
-export type ServicePromoCodeType = "PerUser" | "PerService";
-
-export type ServicePromoCodeDuration = {
-    days?: number;
-};
-
-export type ServicePromoCode = {
-    code?: string;
-    maxRedemptions?: number;
-    isTrial?: boolean;
-    discountPercentageFee?: number;
-    discountMonthlyFee?: number;
-    duration: ServicePromoCodeDuration,
-    type: ServicePromoCodeType;
-    automaticallyApplied: boolean;
-};
-
-export type ServicePromoCodeMap = {
-    [key: string]: ServicePromoCode;
-};
+});

package/src/utils/service/venueUtils.ts

@@ -1,5 +1,4 @@
 import { VenuePricingPlan as VenuePricingPlanOption } from "@prisma/client";
-import { ServicePromoCodeMap } from "./serviceUtils";
 
 export type VenuePricingPlanData = {
     name: string,
@@ -28,19 +27,4 @@ export const VenuePricingPlanData: VenuePricingPlanMap = {
         monthlyFee: 100.0,
         flatFee: 0.0
     }
-} as const;
-
-export const VenuePromoCodes: ServicePromoCodeMap = {
-    "Venue0001": {
-        isTrial: true,
-        duration: {
-            days: 90
-        },
-        type: "PerUser",
-        automaticallyApplied: true
-    }
-} as const;
-
-Object.entries(VenuePromoCodes).forEach(promoCode => promoCode[1].code = promoCode[0]);
-
-export const VenueFreeTrialPromoCode = "Venue0001";
+} as const;

package/src/utils/userPromoCodeUtils.ts

@@ -0,0 +1,36 @@
+export type UserPromoCodeType = "PerUser" | "PerService" | "PerBashEvent";
+
+export type UserPromoCodeDuration = {
+    days?: number;
+};
+
+export type UserPromoCode = {
+    code?: string;
+    maxRedemptions?: number;
+    isTrial?: boolean;
+    discountPercentageFee?: number;
+    discountMonthlyFee?: number;
+    duration: UserPromoCodeDuration,
+    type: UserPromoCodeType;
+    automaticallyApplied: boolean;
+    expiresAfter?: number;
+};
+
+export type UserPromoCodeMap = {
+    [key: string]: UserPromoCode;
+};
+
+export const UserPromoCodes: UserPromoCodeMap = {
+    "Service0001": {
+        isTrial: true,
+        duration: {
+            days: 90
+        },
+        type: "PerUser",
+        automaticallyApplied: true,
+    }
+} as const;
+
+Object.entries(UserPromoCodes).forEach(promoCode => promoCode[1].code = promoCode[0]);
+
+export const ServiceFreeTrialPromoCode = "Service0001";

package/src/utils/userSubscriptionUtils.ts

@@ -0,0 +1,80 @@
+import { ServiceSubscriptionTier, ServiceTypes, UserSubscriptionType } from "@prisma/client";
+
+export type UserSubscriptionServiceTierInfo = {
+    name: string;
+    type?: ServiceSubscriptionTier;
+    description: string;
+    price: number;
+};
+
+export type UserSubscriptionServiceTierInfoMap = { [key in ServiceSubscriptionTier]: UserSubscriptionServiceTierInfo };
+
+export type UserSubscriptionInfo = {
+    name: string;
+    type?: UserSubscriptionType;
+    description: string;
+    price: number;
+    // serviceTiers: UserSubscriptionServiceTierInfoMap;
+    // maxServicesToList?: number;
+    // maxServicesByTypeToList?: 
+};
+
+export type UserSubscriptionServiceInfoMap = { [key in UserSubscriptionType]: UserSubscriptionInfo };
+
+export type UserServiceSubscriptionTierToServiceTypes = { [key in ServiceSubscriptionTier]: ServiceTypes[] };
+export type UserServiceSubscriptionTierFromServiceTypes = { [key in ServiceTypes]: ServiceSubscriptionTier };
+
+export const serviceTierToServicesList = {
+    "Ally": ["EventServices", "EntertainmentServices"],
+    "Partner": ["Vendors", "Exhibitors", "Sponsors"],
+    "Patreon": ["Venues", "Organizations"]
+} as UserServiceSubscriptionTierToServiceTypes;
+
+export const serviceTierFromServicesList = Object.entries(serviceTierToServicesList).reduce((sofar, [type, serviceTypes]) => {
+    serviceTypes.forEach((serviceType) => sofar[serviceType] = type as ServiceSubscriptionTier);
+    return sofar;
+}, {} as UserServiceSubscriptionTierFromServiceTypes)
+
+export const UserSubscriptionTypes = {
+    // "Free": {
+    //     name: "Free",
+    //     description: "Free",
+    //     price: 0, 
+    // },
+    "Basic": {
+        name: "Basic",
+        description: "Basic",
+        price: 0, 
+    },
+    // "Premium": {
+    //     name: "Premium",
+    //     description: "Premium",
+    //     price: 200,
+    // },
+    // "VIP": {
+    //     name: "VIP",
+    //     description: "VIP",
+    //     price: 500,
+    // }
+} as UserSubscriptionServiceInfoMap;
+
+export const ServiceSubscriptionTiers = {
+    "Ally": {
+        name: "Ally",
+        description: "Ally",
+        price: 15
+    },
+    "Partner": {
+        name: "Partner",
+        description: "Partner",
+        price: 50.00
+    },
+    "Patreon": {
+        name: "Patreon",
+        description: "Patreon",
+        price: 100.00
+    }
+} as UserSubscriptionServiceTierInfoMap;
+
+Object.entries(UserSubscriptionTypes).forEach(([type, info]) => info.type = type as UserSubscriptionType);
+Object.entries(ServiceSubscriptionTiers).forEach(([type, info]) => info.type = type as ServiceSubscriptionTier);