@bash-app/bash-common 29.49.0 → 29.50.0

package/package.json

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

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 {
@@ -833,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?
@@ -849,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[]
@@ -877,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[]
@@ -901,7 +902,7 @@ model User {
   // serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
   stripeAccounts                StripeAccount[]
-  servicePromoCodeRedemption    ServicePromoCodeRedemption[]
+  userPromoCodeRedemption       UserPromoCodeRedemption[]
 }
 
 model Contact {
@@ -973,16 +974,16 @@ enum UserSubscriptionStatus {
 }
 
 enum UserSubscriptionType {
-  Free
+  // Free
   Basic
-  Premium
-  VIP
+  // Premium
+  // VIP
 }
 
 enum ServiceSubscriptionTier {
-  Basic
-  Premium
-  VIP
+  Ally
+  Partner
+  Patreon
 }
 
 model UserSubscription {
@@ -1093,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 {
@@ -1246,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)
 

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);