@bash-app/bash-common 29.48.0 → 29.49.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.48.0",
+  "version": "29.49.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

@@ -330,19 +330,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
@@ -911,10 +898,10 @@ model User {
   serviceCheckouts              ServiceCheckout[]
   bookingForMe                  Booking[]
   userSubscription              UserSubscription?
-  serviceSubcriptions           ServiceSubscription[]
+  // serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
   stripeAccounts                StripeAccount[]
-  ServicePromoCodeRedemption    ServicePromoCodeRedemption[]
+  servicePromoCodeRedemption    ServicePromoCodeRedemption[]
 }
 
 model Contact {
@@ -972,30 +959,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
 }
 
-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
+enum UserSubscriptionType {
+  Free
+  Basic
+  Premium
+  VIP
+}
 
-  // lastCheckoutSessionCreatedAt DateTime
-  // checkoutInProgress           Boolean  @default(false)
+enum ServiceSubscriptionTier {
+  Basic
+  Premium
+  VIP
+}
+
+model UserSubscription {
+  id String @id @default(cuid())
 
-  subscriptionStatus ServiceSubscriptionStatus @default(None)
+  ownerId String @unique
+  owner   User   @relation(fields: [ownerId], references: [id], onDelete: Restrict, onUpdate: Restrict)
 
-  serviceId String  @unique
-  service   Service @relation(fields: [serviceId], references: [id], onDelete: Restrict)
+  stripeAccountId String        @unique
+  stripeAccount   StripeAccount @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict, onUpdate: Restrict)
 
-  @@index([stripeCheckoutSessionId, stripeSubscriptionId])
+  stripeCheckoutSessionId String? @unique
+  stripeSubscriptionId    String? @unique
+
+  type   UserSubscriptionType?
+  status UserSubscriptionStatus?
+
+  //price addons
+  serviceSubscriptionTier ServiceSubscriptionTier?
+
+  @@index([stripeCheckoutSessionId])
+  @@index([stripeSubscriptionId])
 }
 
 // Common data for all services; 1-1 relation between each individual service model such as Venue
@@ -1060,8 +1069,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)
 
@@ -1105,8 +1112,8 @@ model StripeAccount {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  service                    Service[]
-  ServiceListingSubscription ServiceListingSubscription[]
+  service          Service[]
+  userSubscription UserSubscription?
 
   @@index([ownerId])
 }
@@ -1265,20 +1272,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/dateTimeUtils.ts

@@ -232,3 +232,7 @@ export function localDateToUTC(date: Date): Date {
 
   return newDate;
 }
+
+export function timestampMinutseFromNow(minutes: number): number {
+  return Math.floor((new Date().getTime() / 1000) + (minutes * 60));
+}