@bash-app/bash-common 29.22.2 → 29.22.3

package/package.json

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

package/src/extendedSchemas.ts

@@ -108,6 +108,32 @@ export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEv
   'amountOfGuests',
 ];
 
+export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
+  serviceAddons: true
+} satisfies Prisma.ServicePackageInclude;
+
+export const SERVICE_DAILYRATES_DATA_TO_INCLUDE = {
+  serviceRate: true
+} satisfies Prisma.ServiceDailyRatesInclude;
+
+export const SERVICE_SPECIALRATES_DATA_TO_INCLUDE = {
+  serviceRate: true
+} satisfies Prisma.ServiceSpecialRatesInclude;
+
+export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
+  serviceGeneralRates: true,
+  serviceDailyRates: {
+    include: SERVICE_DAILYRATES_DATA_TO_INCLUDE
+  },
+  serviceSpecialRates: {
+    include: SERVICE_SPECIALRATES_DATA_TO_INCLUDE
+  },
+  addons: true,
+  packages:  {
+    include: SERVICE_PACKAGE_DATA_TO_INCLUDE
+  },
+} satisfies Prisma.ServiceRatesAssociationInclude;
+
 export const SERVICE_DATA_TO_INCLUDE = {
   creator: {
     select: FRONT_END_USER_DATA_TO_SELECT
@@ -128,7 +154,9 @@ export const SERVICE_DATA_TO_INCLUDE = {
   serviceLinks: {
     include: SERVICE_LINK_DATA_TO_INCLUDE
   },
-  serviceRatesAssociation: true
+  serviceRatesAssociation: {
+    include: SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE
+  }
 } satisfies Prisma.ServiceInclude;
 
 // Create the final object dynamically
@@ -177,32 +205,6 @@ export const SERVICE_FULL_DATA_TO_INCLUDE = {
   ...createAllTrueObject(serviceKeysArray)
 } satisfies Prisma.ServiceInclude;
 
-export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
-  serviceAddons: true
-} satisfies Prisma.ServicePackageInclude;
-
-export const SERVICE_DAILYRATES_DATA_TO_INCLUDE = {
-  serviceRate: true
-} satisfies Prisma.ServiceDailyRatesInclude;
-
-export const SERVICE_SPECIALRATES_DATA_TO_INCLUDE = {
-  serviceRate: true
-} satisfies Prisma.ServiceSpecialRatesInclude;
-
-export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
-  serviceGeneralRates: true,
-  serviceDailyRates: {
-    include: SERVICE_DAILYRATES_DATA_TO_INCLUDE
-  },
-  serviceSpecialRates: {
-    include: SERVICE_SPECIALRATES_DATA_TO_INCLUDE
-  },
-  addons: true,
-  packages:  {
-    include: SERVICE_PACKAGE_DATA_TO_INCLUDE
-  },
-} satisfies Prisma.ServiceRatesAssociationInclude;
-
 export interface BashNotificationExt extends BashNotification {
   creator?: PublicUser;
   bashEvent?: BashEvent;