@bash-app/bash-common 29.37.0 → 29.37.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.37.0",
+  "version": "29.37.1",
   "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,11 @@ model ServiceSubscription {
 }
 
 model ServiceListingSubscription {
-  id                   String   @id @default(cuid())
+  id                   String  @id @default(cuid())
   stripeSubscriptionId String?
-  service              Service?
+
+  serviceId String?  @unique
+  service   Service? @relation(fields: [serviceId], references: [id], onDelete: Restrict)
 }
 
 // Common data for all services; 1-1 relation between each individual service model such as Venue
@@ -1008,8 +1010,7 @@ model Service {
   stripeAccountId String?
   stripeAccount   StripeAccount? @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict)
 
-  serviceListingSubscriptionId String?                     @unique
-  serviceListingSubscription   ServiceListingSubscription? @relation(fields: [serviceListingSubscriptionId], references: [id])
+  serviceListingSubscription ServiceListingSubscription?
 
   targetAudienceId String?         @unique
   targetAudience   TargetAudience? @relation(fields: [targetAudienceId], references: [id], onDelete: Cascade)

package/src/extendedSchemas.ts

@@ -36,6 +36,7 @@ import {
   ServiceSpecialRates,
   ServiceAddon,
   ServicePackage,
+  ServiceListingSubscription,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray, VENUE_DATA_TO_INCLUDE } from "./definitions";
 
@@ -113,7 +114,8 @@ export interface ServiceExt extends Service {
   owner?: PublicUser | null;
   creator?: PublicUser | null;
 
-  stripeAccount?: StripeAccount | null;
+  stripeAccount?: PublicStripeAccount | null;
+  serviceListingSubscription?: PublicServiceListingSubscription | null;
 
   // availableDateTimes?: Availability[];
 
@@ -287,6 +289,29 @@ export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
   media: true
 } 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,
+  createdAt: true,
+  updatedAt: true
+} satisfies Prisma.StripeAccountSelect;
+
+export const PUBLIC_SERVICE_LISTING_SUBSCRIPTION_DATA_TO_SELECT = {
+  serviceId: true
+} satisfies Prisma.ServiceListingSubscriptionSelect;
+
+export interface StripeAccountExt extends StripeAccount {
+  logo?: Media | null;
+}
+
 export const SERVICE_DATA_TO_INCLUDE = {
   creator: {
     select: FRONT_END_USER_DATA_TO_SELECT
@@ -302,7 +327,13 @@ export const SERVICE_DATA_TO_INCLUDE = {
   // },
   // eventTasks: true,
   media: true,
-  stripeAccount: true,
+  stripeAccount: {
+    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
@@ -397,14 +428,6 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
 } satisfies Prisma.EventTaskInclude;
 
 
-//------------Stripe Accounts--------------
-export const STRIPE_ACCOUNT_DATA_TO_INCLUDE = {
-  logo: true
-} satisfies Prisma.StripeAccountInclude;
-
-export interface StripeAccountExt extends StripeAccount {
-  logo?: Media | null;
-}
 export interface InvitationExt extends Invitation {
   creator: PublicUser;
   sentTo: PublicUser;
@@ -523,3 +546,7 @@ 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>;