@bash-app/bash-common 29.19.24 → 29.19.26

package/package.json

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

package/src/extendedSchemas.ts

@@ -35,6 +35,7 @@ import {
   ServiceDailyRates,
   ServiceSpecialRates,
   ServiceAddon,
+  ServicePackage,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
 
@@ -176,7 +177,7 @@ export const SERVICE_FULL_DATA_TO_INCLUDE = {
   ...createAllTrueObject(serviceKeysArray)
 } satisfies Prisma.ServiceInclude;
 
-export const SERVICE_PACKAGE_TO_INCLUDE = {
+export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
   serviceAddons: true
 } satisfies Prisma.ServicePackageInclude;
 
@@ -193,7 +194,9 @@ export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
   serviceDailyRates: true,
   serviceSpecialRates: true,
   addons: true,
-  packages: true
+  packages:  {
+    include: SERVICE_PACKAGE_DATA_TO_INCLUDE
+  },
 } satisfies Prisma.ServiceRatesAssociationInclude;
 
 export interface BashNotificationExt extends BashNotification {
@@ -276,14 +279,14 @@ export interface ServiceExt extends Service {
 
   // googleReviews: GoogleReview[];
 }
-export interface ServicePackageExt extends ServiceDailyRates {
+export interface ServicePackageExt extends ServicePackage {
   serviceAddons: ServiceAddon[]
 }
 
 export interface ServiceDailyRatesExt extends ServiceDailyRates {
   serviceRate?: ServiceRate;
 }
-export interface ServiceSpecialRatesExt extends ServiceRatesAssociation {
+export interface ServiceSpecialRatesExt extends ServiceSpecialRates {
   serviceRate?: ServiceRate;
 }