@bash-app/bash-common 29.40.3 → 29.40.5

package/package.json

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

package/prisma/schema.prisma

@@ -808,43 +808,6 @@ 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
@@ -892,8 +855,7 @@ model User {
   zipCode                       String?
   country                       String?                      @default("US")
   phone                         String?
-  socialMediaProfiles SocialMediaProfile[]
-  documentIDId                  String?               @unique
+  documentIDId                  String?                      @unique
   documentID                    DocumentID?
   comment                       BashComment[]
   associatedBashes              AssociatedBash[]
@@ -981,12 +943,18 @@ model ServiceSubscription {
 }
 
 model ServiceListingSubscription {
-  id                      String  @id @default(cuid())
-  stripeCheckoutSessionId String? @unique
-  stripeSubscriptionId    String? @unique
+  id                      String        @id @default(cuid())
+  stripeAccountId         String
+  stripeAccount           StripeAccount @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict, onUpdate: Restrict)
+  stripeCheckoutSessionId String?       @unique
+  stripeSubscriptionId    String?       @unique
 
-  serviceId String?  @unique
-  service   Service? @relation(fields: [serviceId], references: [id], onDelete: Restrict)
+  subscriptionStatus ServiceSubscriptionStatus @default(None)
+
+  serviceId String  @unique
+  service   Service @relation(fields: [serviceId], references: [id], onDelete: Restrict)
+
+  @@index([stripeCheckoutSessionId, stripeSubscriptionId])
 }
 
 // Common data for all services; 1-1 relation between each individual service model such as Venue
@@ -1094,7 +1062,8 @@ model StripeAccount {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  service Service[]
+  service                    Service[]
+  ServiceListingSubscription ServiceListingSubscription[]
 
   @@index([ownerId])
 }
@@ -1220,9 +1189,9 @@ model Venue {
   vibe                 String?
   dress                String?
 
-  pricingPlan           VenuePricingPlan?
-  subscriptionStatus    SubscriptionStatus?
-  subscriptionStartDate DateTime?
+  pricingPlan VenuePricingPlan?
+  // subscriptionStatus    SubscriptionStatus?
+  // subscriptionStartDate DateTime?
 
   bashEvents BashEvent[]
 }
@@ -1253,7 +1222,8 @@ enum VenuePricingPlan {
   Subscription
 }
 
-enum SubscriptionStatus {
+enum ServiceSubscriptionStatus {
+  None
   Active
   Canceled
   Suspended

package/src/definitions.ts

@@ -288,6 +288,8 @@ export interface StripeCreateServiceSubscriptionCheckoutSessionArgs {
   currency: string;
   paymentMethodType: string;
   promoCode?: string;
+  successUrl: string;
+  cancelUrl: string;
 }
 
 
@@ -592,11 +594,3 @@ export interface IAddress {
   zipCode: string;
   country: string;
 }
-
-
-export interface SocialMediaProfile {
-  id: string;
-  platform: string; // Enum type if available
-  url: string;
-  userId: string;
-}

package/src/extendedSchemas.ts

@@ -37,7 +37,6 @@ import {
   ServiceAddon,
   ServicePackage,
   ServiceListingSubscription,
-  SocialMediaProfile,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray, VENUE_DATA_TO_INCLUDE } from "./definitions";
 
@@ -521,8 +520,6 @@ export const CONTACT_DATA_TO_INCLUDE = {
 export interface UserExtraData extends User {
   password?: string;
   otp?: string;
-  socialMediaProfiles?: SocialMediaProfile[];
-
 }
 
 export interface UserExt extends User {

package/src/utils/service/serviceUtils.ts

@@ -20,7 +20,7 @@ export const ServiceCancelationPolicyData: ServiceCancelationPolicyMap = {
     [ServiceCancelationPolicyOption.None]: {
         name: "None",
         refundPolicy: [],
-        description: "No cancelation policy."
+        description: "No cancellation policy."
     },
     [ServiceCancelationPolicyOption.VeryFlexible]: {
         name: "Very Flexible",
@@ -102,15 +102,17 @@ Object.keys(ServiceCancelationPolicyData).filter((policyKey) => policyKey as Ser
 
 export type ServicePromoCodeType = "PerUser" | "PerService";
 
+export type ServicePromoCodeDuration = {
+    days?: number;
+};
+
 export type ServicePromoCode = {
     code?: string;
     maxRedemptions?: number;
     isTrial?: boolean;
     discountPercentageFee?: number;
     discountMonthlyFee?: number;
-    duration: {
-        days?: number;
-    },
+    duration: ServicePromoCodeDuration,
     type: ServicePromoCodeType;
     automaticallyApplied: boolean;
 };