@bash-app/bash-common 18.3.0 → 18.3.2

package/package.json

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

package/prisma/schema.prisma

@@ -884,7 +884,7 @@ model EventService {
   status               ServiceStatus        @default(Draft)
   yearsOfExperience    YearsOfExperience
   description          String?
-  crowdSize            AmountOfGuests?      @relation(fields: [amountOfGuestsId], references: [id])
+  crowdSize            AmountOfGuests?      @relation(fields: [crowdSizeId], references: [id])
   additionalInfo       String?
   goodsOrServices      String[]
   menuItems            String?
@@ -902,7 +902,7 @@ model EventService {
   links                ServiceLink[]
   targetAudience       TargetAudience?      @relation(fields: [targetAudienceId], references: [id])
   targetAudienceId     String?
-  amountOfGuestsId     String?
+  crowdSizeId     String?
   User                 User?                @relation(fields: [userId], references: [id])
   userId               String?
 }
@@ -928,7 +928,7 @@ model EntertainmentService {
   status                      ServiceStatus              @default(Draft)
   yearsOfExperience           YearsOfExperience
   description                 String?
-  crowdSize                   AmountOfGuests?            @relation(fields: [amountOfGuestsId], references: [id])
+  crowdSize                   AmountOfGuests?            @relation(fields: [crowdSizeId], references: [id])
   additionalInfo              String?
   goodsOrServices             String[]
   venueTypes                  String[]
@@ -945,7 +945,7 @@ model EntertainmentService {
   links                       ServiceLink[]
   targetAudience              TargetAudience?            @relation(fields: [targetAudienceId], references: [id])
   targetAudienceId            String?
-  amountOfGuestsId            String?
+  crowdSizeId            String?
   User                        User?                      @relation(fields: [userId], references: [id])
   userId                      String?
 }
@@ -968,7 +968,7 @@ model Vendor {
   status               ServiceStatus        @default(Draft)
   yearsOfExperience    YearsOfExperience
   description          String?
-  crowdSize            AmountOfGuests?      @relation(fields: [amountOfGuestsId], references: [id])
+  crowdSize            AmountOfGuests?      @relation(fields: [crowdSizeId], references: [id])
   additionalInfo       String?
   goodsOrServices      String[]
   menuItems            String?
@@ -988,7 +988,7 @@ model Vendor {
   targetAudienceId     String?
   User                 User?                @relation(fields: [userId], references: [id])
   userId               String?
-  amountOfGuestsId     String?
+  crowdSizeId     String?
 }
 
 model Exhibitor {
@@ -1008,7 +1008,7 @@ model Exhibitor {
   visibility           VisibilityPreference @default(Public)
   yearsOfExperience    YearsOfExperience
   description          String?
-  crowdSize            AmountOfGuests?      @relation(fields: [amountOfGuestsId], references: [id])
+  crowdSize            AmountOfGuests?      @relation(fields: [crowdSizeId], references: [id])
   additionalInfo       String?
   goodsOrServices      String[]
   venueTypes           String[]
@@ -1028,7 +1028,7 @@ model Exhibitor {
   targetAudienceId     String?
   User                 User?                @relation(fields: [userId], references: [id])
   userId               String?
-  amountOfGuestsId     String?
+  crowdSizeId     String?
 }
 
 model Sponsor {
@@ -1049,7 +1049,7 @@ model Sponsor {
   status               ServiceStatus        @default(Draft)
   yearsOfExperience    YearsOfExperience
   description          String?
-  crowdSize            AmountOfGuests?      @relation(fields: [amountOfGuestsId], references: [id])
+  crowdSize            AmountOfGuests?      @relation(fields: [crowdSizeId], references: [id])
   additionalInfo       String?
   goodsOrServices      String[]
   menuItems            String?
@@ -1067,7 +1067,7 @@ model Sponsor {
   links                ServiceLink[]
   targetAudience       TargetAudience?      @relation(fields: [targetAudienceId], references: [id])
   targetAudienceId     String?
-  amountOfGuestsId     String?
+  crowdSizeId     String?
   User                 User?                @relation(fields: [userId], references: [id])
   userId               String?
 }
@@ -1134,7 +1134,7 @@ model Organization {
   visibility           VisibilityPreference @default(Public)
   status               ServiceStatus        @default(Draft)
   description          String?
-  crowdSize            AmountOfGuests?      @relation(fields: [amountOfGuestsId], references: [id])
+  crowdSize            AmountOfGuests?      @relation(fields: [crowdSizeId], references: [id])
   additionalInfo       String?
   goodsOrServices      String[]
   venueTypes           String[]
@@ -1151,7 +1151,7 @@ model Organization {
   links                ServiceLink[]
   targetAudience       TargetAudience?      @relation(fields: [targetAudienceId], references: [id])
   targetAudienceId     String?
-  amountOfGuestsId     String?
+  crowdSizeId     String?
   User                 User?                @relation(fields: [userId], references: [id])
   userId               String?
 }

package/src/extendedSchemas.ts

@@ -15,6 +15,7 @@ import {
   TargetAudience,
   ServiceStatus,
   Vendor,
+  EventService,
 } from "@prisma/client";
 import { AttendeeOfBashEvent } from "./definitions";
 
@@ -124,11 +125,21 @@ export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEv
   'tickets'
 ];
 
+export interface EventServiceExt extends EventService {
+  service: Service;
+  availableDateTimes: Availability[];
+  targetAudience: TargetAudience;
+  links: ServiceLinkExt[];
+  capacity?: AmountOfGuests;
+  media?: Media[];
+  status: ServiceStatus;
+}
+
 export interface VendorExt extends Vendor {
   service: Service;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
-  vendorLinks: ServiceLinkExt[];
+  links: ServiceLinkExt[];
   capacity?: AmountOfGuests;
   media?: Media[];
   status: ServiceStatus;
@@ -138,7 +149,7 @@ export interface VenueExt extends Venue {
   service: Service;
   availableDateTimes: Availability[];
   targetAudience: TargetAudience;
-  venueLinks: ServiceLinkExt[];
+  links: ServiceLinkExt[];
   capacity?: AmountOfGuests;
   media?: Media[];
   status: ServiceStatus;
@@ -148,7 +159,7 @@ export const VENUE_DATA_TO_INCLUDE = {
   service: true,
   availableDateTimes: true,
   targetAudience: true,
-  venueLinks: true,
+  links: true,
   capacity: true,
   media: true,
 }