@bash-app/bash-common 29.18.2 → 29.18.4

package/package.json

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

package/prisma/schema.prisma

@@ -792,7 +792,7 @@ model GoogleReview {
   text        String?
   createdAt   DateTime @default(now())
   serviceId   String
-  service     Service  @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  // service     Service  @relation(fields: [serviceId], references: [id], onDelete: Cascade)
 }
 
 model Session {
@@ -882,6 +882,7 @@ model User {
   documentID                    DocumentID?
   comment                       BashComment[]
   associatedBashes              AssociatedBash[]
+  associatedServices            AssociatedService[]
   invitationsCreatedByMe        Invitation[]          @relation("InvitationsCreatedByMe")
   invitationsSentToMe           Invitation[]          @relation("InvitationsSentToMe")
   notificationsCreatedByMe      BashNotification[]    @relation("NotificationsCreatedByMe")
@@ -929,6 +930,21 @@ model AssociatedBash {
   @@unique([ownerEmail, bashEventId])
 }
 
+model AssociatedService {
+  id          String   @id @default(cuid())
+  serviceId   String
+  service     Service  @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  // referralId String?     @unique
+  // referral   Referral? @relation(fields: [referralId], references: [id])
+  ownerEmail  String?
+  ownerUserId String?
+  owner       User?    @relation(fields: [ownerUserId], references: [id], onDelete: Cascade)
+  isOrganizer Boolean?
+  isFavorite  Boolean?
+
+  @@unique([ownerEmail, serviceId])
+}
+
 //Common data for all services; 1-1 relation between each individual service model such as Venue
 model Service {
   id String @id @default(cuid())
@@ -948,6 +964,8 @@ model Service {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
+  associatedServicesReferencingMe AssociatedService[]
+
   serviceName String?
   tagline     String?
 
@@ -978,7 +996,7 @@ model Service {
   cancellationPolicy   String?
   refundPolicy         String?
   insurancePolicy      String?
-  hoursOfOperation  Json? @default("{}")
+  // hoursOfOperation  Json? @default("{}")
 
   stripeAccountId String?
   stripeAccount   StripeAccount? @relation(fields: [stripeAccountId], references: [id], onDelete: Cascade)
@@ -1002,7 +1020,7 @@ model Service {
   venue                Venue?
   organization         Organization?
 
-  googleReviews GoogleReview[]
+  // googleReviews GoogleReview[]
 }
 
 model StripeAccount {

package/src/definitions.ts

@@ -100,7 +100,7 @@ export const SERVICE_DATA_TO_INCLUDE = {
   serviceLinks: {
     include: SERVICE_LINK_DATA_TO_INCLUDE
   },
-  googleReviews: true,
+  // googleReviews: true,
 } satisfies Prisma.ServiceInclude;
 
 // export type ServiceSpecificName = keyof Pick<

package/src/extendedSchemas.ts

@@ -2,6 +2,7 @@ import {
   AmountOfGuests,
   EventTask,
   AssociatedBash,
+  AssociatedService,
   BashEvent,
   Invitation,
   Ticket,
@@ -175,7 +176,7 @@ export interface ServiceExt extends Service {
   venue?: Venue;
   organization?: Organization;
 
-  googleReviews: GoogleReview[];
+  // googleReviews: GoogleReview[];
 }
 
 export interface EventServiceExt extends EventService {
@@ -257,6 +258,11 @@ export interface AssociatedBashExt extends AssociatedBash {
   invitation: InvitationExt;
 }
 
+export interface AssociatedServiceExt extends AssociatedService {
+  service: ServiceExt;
+  // invitation: InvitationExt;
+}
+
 export const ASSOCIATED_BASH_DATA_TO_INCLUDE = {
   bashEvent: {
     include: BASH_EVENT_DATA_TO_INCLUDE