@bash-app/bash-common 23.2.0 → 23.4.0

package/package.json

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

package/prisma/schema.prisma

@@ -673,16 +673,15 @@ enum InvestmentType {
 }
 
 model Link {
-  id           String        @id @default(cuid())
-  url          String
-  type         String?
-  icon         String?
-  eventLinks   EventLink[]
-  userLinks    UserLink[]
-  serviceLinks ServiceLink[]
-   volunteerServiceId  String?
-  volunteerService    VolunteerService? @relation("VolunteerServiceLinks", fields: [volunteerServiceId], references: [id])
-
+  id                 String            @id @default(cuid())
+  url                String
+  type               String?
+  icon               String?
+  eventLinks         EventLink[]
+  userLinks          UserLink[]
+  serviceLinks       ServiceLink[]
+  volunteerServiceId String?
+  volunteerService   VolunteerService? @relation("VolunteerServiceLinks", fields: [volunteerServiceId], references: [id])
 }
 
 model Media {
@@ -706,9 +705,8 @@ model Media {
   sponsorId                    String?
   organization                 Organization?         @relation(fields: [organizationId], references: [id])
   organizationId               String?
-  volunteerServiceId  String?
-  volunteerService    VolunteerService? @relation("VolunteerServiceMedia", fields: [volunteerServiceId], references: [id])
-
+  volunteerServiceId           String?
+  volunteerService             VolunteerService?     @relation("VolunteerServiceMedia", fields: [volunteerServiceId], references: [id])
 }
 
 enum MediaType {
@@ -928,15 +926,18 @@ model Business {
 }
 
 model VolunteerService {
-  id         String   @id @default(cuid())
-  businessId String   @unique
-  business   Business @relation(fields: [businessId], references: [id])
-    serviceRangeId String?
-  serviceRange   ServiceRange?   @relation(fields: [serviceRangeId], references: [id])
-  media          Media[]         @relation("VolunteerServiceMedia")
-  links          Link[]          @relation("VolunteerServiceLinks")
-  availableDateTimes   Availability[]        @relation("AvailableDateTimes")
-  fullName  String?
+  id                 String         @id @default(cuid())
+  businessId         String         @unique
+  business           Business       @relation(fields: [businessId], references: [id])
+  serviceRangeId     String?
+  serviceRange       ServiceRange?  @relation(fields: [serviceRangeId], references: [id])
+  media              Media[]        @relation("VolunteerServiceMedia")
+  links              Link[]         @relation("VolunteerServiceLinks")
+  availableDateTimes Availability[] @relation("AvailableDateTimes")
+  fullName           String?
+  address            String?
+  email              String?
+  phone              String?
 }
 
 model EventService {
@@ -1289,11 +1290,11 @@ enum YearsOfExperience {
 }
 
 model ServiceRange {
-  id  String @id @default(cuid())
-  min Int    @default(0)
-  max Int    @default(50)
-  volunteerServices   VolunteerService[]
-  venue Venue?
+  id                String             @id @default(cuid())
+  min               Int                @default(0)
+  max               Int                @default(50)
+  volunteerServices VolunteerService[]
+  venue             Venue?
 }
 
 model Availability {
@@ -1314,7 +1315,7 @@ model Availability {
   sponsor                Sponsor?              @relation("AvailableDateTimes", fields: [sponsorId], references: [id])
   organizationId         String?
   organization           Organization?         @relation("AvailableDateTimes", fields: [organizationId], references: [id])
- volunteerServiceId     String?
+  volunteerServiceId     String?
   volunteerService       VolunteerService?     @relation("AvailableDateTimes", fields: [volunteerServiceId], references: [id])
 }
 
@@ -1409,3 +1410,14 @@ model ServiceLink {
 
   @@index([businessId])
 }
+
+enum ServiceTypes {
+  Volunteer
+  EventService
+  EntertainmentService
+  Vendor
+  Exhibitor
+  Sponsor
+  Venue
+  Organization
+}

package/src/extendedSchemas.ts

@@ -238,6 +238,9 @@ export interface VolunteerServiceExt extends VolunteerService {
   links?: Link[];
   availableDateTimes?: Availability[];
   fullName: string | null;
+  address:          string | null;
+  email:          string | null;
+  phone:          string | null; 
 }