@bash-app/bash-common 29.38.0 → 29.40.0

package/package.json

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

package/prisma/schema.prisma

@@ -943,9 +943,13 @@ 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
+
+  subscriptionStatus ServiceSubscriptionStatus @default(None)
 
   serviceId String?  @unique
   service   Service? @relation(fields: [serviceId], references: [id], onDelete: Restrict)
@@ -1056,7 +1060,8 @@ model StripeAccount {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  service Service[]
+  service                    Service[]
+  ServiceListingSubscription ServiceListingSubscription[]
 
   @@index([ownerId])
 }
@@ -1182,9 +1187,9 @@ model Venue {
   vibe                 String?
   dress                String?
 
-  pricingPlan           VenuePricingPlan?
-  subscriptionStatus    SubscriptionStatus?
-  subscriptionStartDate DateTime?
+  pricingPlan VenuePricingPlan?
+  // subscriptionStatus    SubscriptionStatus?
+  // subscriptionStartDate DateTime?
 
   bashEvents BashEvent[]
 }
@@ -1215,7 +1220,8 @@ enum VenuePricingPlan {
   Subscription
 }
 
-enum SubscriptionStatus {
+enum ServiceSubscriptionStatus {
+  None
   Active
   Canceled
   Suspended

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