@bash-app/bash-common 23.0.0 → 23.1.1

package/package.json

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

package/prisma/schema.prisma

@@ -935,6 +935,7 @@ model VolunteerService {
   serviceRange   ServiceRange?   @relation(fields: [serviceRangeId], references: [id])
   media          Media[]         @relation("VolunteerServiceMedia")
   links          Link[]          @relation("VolunteerServiceLinks")
+  availableDateTimes   Availability[]        @relation("AvailableDateTimes")
 }
 
 model EventService {
@@ -1312,6 +1313,8 @@ model Availability {
   sponsor                Sponsor?              @relation("AvailableDateTimes", fields: [sponsorId], references: [id])
   organizationId         String?
   organization           Organization?         @relation("AvailableDateTimes", fields: [organizationId], references: [id])
+ volunteerServiceId     String?
+  volunteerService       VolunteerService?     @relation("AvailableDateTimes", fields: [volunteerServiceId], references: [id])
 }
 
 enum VisibilityPreference {

package/src/extendedSchemas.ts

@@ -209,6 +209,19 @@ export const VENUE_DATA_TO_INCLUDE = {
   amountOfGuests: true,
 } satisfies Prisma.VenueInclude;
 
+export const VOLUNTEER_DATA_TO_INCLUDE = {
+  business: true,
+  links: {
+    include: {
+      serviceLinks: true,
+    },
+  },
+  media: true,
+  serviceRange: true,
+} satisfies Prisma.VolunteerServiceInclude;
+
+
+
 export interface OrganizationExt extends Organization {
   business: Business;
   availableDateTimes: Availability[];
@@ -220,9 +233,10 @@ export interface OrganizationExt extends Organization {
 }
 
 export interface VolunteerServiceExt extends VolunteerService {
-  serviceRange?: ServiceRange;
+  serviceRange?: ServiceRange | null;
   media?: Media[];
   links?: Link[];
+  availableDateTimes?: Availability[];
 }
 
 
@@ -244,21 +258,24 @@ export interface BusinessExt extends Business {
 
 export const BUSINESS_DATA_TO_INCLUDE = {
   owner: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
   media: true,
-  volunteerService: true,
+  volunteerService: {
+    include: VOLUNTEER_DATA_TO_INCLUDE,
+  },
   targetAudience: true,
   serviceLinks: {
-    include: SERVICE_LINK_DATA_TO_INCLUDE
+    include: SERVICE_LINK_DATA_TO_INCLUDE,
   },
   venues: {
-    include: VENUE_DATA_TO_INCLUDE
+    include: VENUE_DATA_TO_INCLUDE,
   },
   vendors: {
-    include: VENDOR_DATA_TO_INCLUDE
-  }
-} satisfies Prisma.BusinessInclude
+    include: VENDOR_DATA_TO_INCLUDE,
+  },
+} satisfies Prisma.BusinessInclude;
+
 
 export interface ServiceLinkExt extends ServiceLink {
   link: Link;