@bash-app/bash-common 29.35.3 → 29.36.0

package/package.json

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

package/prisma/schema.prisma

@@ -816,50 +816,13 @@ enum SponsorType {
   CompetitionPrizeProvider
 }
 
-model SocialMediaProfile {
-  id         String               @id @default(uuid())
-  platform   SocialMediaPlatform
-  url        String
-  visibility VisibilityPreference @default(Private)
-  user       User                 @relation(fields: [userId], references: [id])
-  userId     String
-
-  @@unique([userId, platform])
-}
-
-enum SocialMediaPlatform {
-  Facebook
-  Instagram
-  LinkedIn
-  TikTok
-  X
-  YouTube
-  Snapchat
-  Pinterest
-  Reddit
-  WhatsApp
-  Messenger
-  Telegram
-  Discord
-  Clubhouse
-  Twitch
-  Medium
-  BeReal
-  Mastodon
-  Tumblr
-  Threads
-  WeChat
-  Vk
-  Line
-}
-
 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?
@@ -870,12 +833,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[]
@@ -898,20 +861,19 @@ 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[]
@@ -922,6 +884,7 @@ model User {
   serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
   stripeAccounts                StripeAccount[]
+  ServicePromoCodeRedemption    ServicePromoCodeRedemption[]
 }
 
 model Contact {
@@ -1063,7 +1026,8 @@ model Service {
 
   // googleReviews GoogleReview[]
 
-  bashEvent BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
+  bashEvent                  BashEvent[] // because a service needs to be associated with a bash to post to the bashfeed
+  servicePromoCodeRedemption ServicePromoCodeRedemption[]
 }
 
 model StripeAccount {
@@ -1072,7 +1036,8 @@ model StripeAccount {
   ownerId String
   owner   User   @relation(fields: [ownerId], references: [id], onDelete: Restrict)
 
-  stripeAccountId String
+  stripeAccountId  String  @unique
+  stripeCustomerId String? @unique
 
   logoId String?
   logo   Media?  @relation(fields: [logoId], references: [id], onDelete: SetNull)
@@ -1213,6 +1178,21 @@ model Venue {
   bashEvents BashEvent[]
 }
 
+model ServicePromoCodeRedemption {
+  id        String   @id @default(cuid())
+  serviceId String?
+  service   Service? @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+
+  userId String?
+  user   User?   @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  code            String
+  stripeCouponId  String
+  redemptionCount Int
+
+  lastRedeemedOn DateTime
+}
+
 // model VenuePricing {
 //   id                  String            @id @default(cuid())
 //   venuePricingPlan VenuePricingPlan

package/src/definitions.ts

@@ -283,6 +283,14 @@ export interface StripeCreateBashEventDonationCheckoutSessionArgs {
   donationAmount: number;
 }
 
+export interface StripeCreateServiceSubscriptionCheckoutSessionArgs {
+  serviceId: string;
+  currency: string;
+  paymentMethodType: string;
+  promoCode?: string;
+}
+
+
 export type StripeSessionRedirect = {
   stripeAccountIdDB: string;
   redirectUrl: string;

package/src/extendedSchemas.ts

@@ -36,7 +36,6 @@ import {
   ServiceSpecialRates,
   ServiceAddon,
   ServicePackage,
-  SocialMediaProfile,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray, VENUE_DATA_TO_INCLUDE } from "./definitions";
 
@@ -511,7 +510,6 @@ export interface UserExt extends User {
   ticketsIOwn?: TicketExt[] | null;
   ownedServices?: ServiceExt[];
   createdServices?: ServiceExt[];
-  socialMediaProfiles?: SocialMediaProfile[] | null;
 }
 
 export const USER_DATA_SELECT_REVIEWS_COMMENTS = {

package/src/utils/service/serviceUtils.ts

@@ -98,4 +98,22 @@ 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 ServicePromoCode = {
+    code?: string;
+    maxRedemptions?: number;
+    isTrial?: boolean;
+    discountPercentageFee?: number;
+    discountMonthlyFee?: number;
+    duration: {
+        days?: number;
+    },
+    type: ServicePromoCodeType;
+};
+
+export type ServicePromoCodeMap = {
+    [key: string]: ServicePromoCode;
+};

package/src/utils/service/venueUtils.ts

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