@bash-app/bash-common 29.18.4 → 29.18.5

package/package.json

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

package/src/definitions.ts

@@ -12,7 +12,7 @@ import {
   User,
   YearsOfExperience
 } from "@prisma/client";
-import { ServiceExt, CheckoutExt, PublicUser, VolunteerServiceExt} from "./extendedSchemas";
+import { ServiceExt, CheckoutExt, PublicUser, VolunteerServiceExt, SERVICE_DATA_TO_INCLUDE} from "./extendedSchemas";
 
 export const PASSWORD_MIN_LENGTH = 10 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{${PASSWORD_MIN_LENGTH},}$`);
@@ -77,6 +77,7 @@ export const DEFAULT_PRISMA_TTL_SECONDS = 60 as const;
 export const PRISMA_MEDIA_TTL_SECONDS = 60 * 5; // 5 hours
 export const PRISMA_USER_TTL_SECONDS = 60 * 7; // 7 hours
 export const PRISMA_BASH_EVENT_TTL_SECONDS = 60 as const;
+export const PRISMA_SERVICE_TTL_SECONDS = 60 as const;
 
 export const MIN_PASSWORD_LENGTH = 10 as const;
 
@@ -92,16 +93,16 @@ export const SERVICE_LINK_DATA_TO_INCLUDE = {
   link: true,
 } satisfies Prisma.ServiceLinkInclude;
 
-export const SERVICE_DATA_TO_INCLUDE = {
-  stripeAccount: true,
-  availableDateTimes: true,
-  targetAudience: true,
-  media: true,
-  serviceLinks: {
-    include: SERVICE_LINK_DATA_TO_INCLUDE
-  },
-  // googleReviews: true,
-} satisfies Prisma.ServiceInclude;
+// export const SERVICE_DATA_TO_INCLUDE = {
+//   stripeAccount: true,
+//   availableDateTimes: true,
+//   targetAudience: true,
+//   media: true,
+//   serviceLinks: {
+//     include: SERVICE_LINK_DATA_TO_INCLUDE
+//   },
+//   // googleReviews: true,
+// } satisfies Prisma.ServiceInclude;
 
 // export type ServiceSpecificName = keyof Pick<
 //   ServiceExt,

package/src/extendedSchemas.ts

@@ -29,7 +29,7 @@ import {
   Rate,
   GoogleReview,
 } from "@prisma/client";
-import { UnionFromArray } from "./definitions";
+import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
 
 export const FRONT_END_USER_DATA_TO_SELECT = {
   id: true,
@@ -100,6 +100,25 @@ export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEv
   'amountOfGuests',
 ];
 
+export const SERVICE_DATA_TO_INCLUDE = {
+  creator: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  },
+  targetAudience: true,
+  // amountOfGuests: true,
+  // recurrence: true,
+  // ticketTiers: {
+  //   include: TICKET_TIER_DATA_TO_INCLUDE
+  // },
+  // eventTasks: true,
+  media: true,
+  stripeAccount: true,
+  availableDateTimes: true,
+  serviceLinks: {
+    include: SERVICE_LINK_DATA_TO_INCLUDE
+  },
+} satisfies Prisma.ServiceInclude;
+
 export interface BashNotificationExt extends BashNotification {
   creator?: PublicUser;
   bashEvent?: BashEvent;
@@ -272,6 +291,15 @@ export const ASSOCIATED_BASH_DATA_TO_INCLUDE = {
   }
 } satisfies Prisma.AssociatedBashInclude;
 
+export const ASSOCIATED_SERVICE_DATA_TO_INCLUDE = {
+  service: {
+    include: SERVICE_DATA_TO_INCLUDE
+  },
+  // invitation: {
+  //   include: INVITATION_DATA_TO_INCLUDE
+  // }
+} satisfies Prisma.AssociatedServiceInclude;
+
 export interface TicketTierExt extends TicketTier {
   bashEvent: BashEvent;
   tickets: TicketExt[];