@bash-app/bash-common 29.58.0 → 29.60.0

package/package.json

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

package/prisma/schema.prisma

@@ -750,18 +750,19 @@ enum PrizeType {
 
 model Review {
   id          String        @id @default(cuid())
-  rating      Int
-  creatorId   String
+  rating      Int           // Star rating, required
+  creatorId   String        // ID of the user who created the review
   creator     User          @relation(fields: [creatorId], references: [id], onDelete: Cascade)
-  bashEventId String
+  bashEventId String        // ID of the bash event being reviewed
   bashEvent   BashEvent     @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  comments    BashComment[]
-  createdAt   DateTime      @default(now()) // Add this for timestamps
-  updatedAt   DateTime      @updatedAt
+  comments    BashComment[] // Optional comments tied to the review
+  createdAt   DateTime      @default(now()) // Timestamp for when the review was created
+  updatedAt   DateTime      @updatedAt      // Auto-updated timestamp for edits
 
-  @@unique([creatorId, bashEventId])
+  @@unique([creatorId, bashEventId]) // Prevent duplicate reviews for the same bash by a user
 }
 
+
 model GoogleReview {
   id          String   @id @default(cuid())
   author_name String?
@@ -880,8 +881,6 @@ model User {
   competitions                  Competition[]
   competitionSponsorships       CompetitionSponsor[]
   competitionPrizes             Prize[]
-  userRatingGiven               UserRatingGiven[]
-  userRating                    UserRating[]
   hostRating                    Float?
   totalRatings                  Int?
   magicLink                     String?
@@ -1607,23 +1606,6 @@ model UserLink {
   userId String
 }
 
-model UserRating {
-  id                String          @id @default(cuid())
-  rating            Int
-  comment           String?
-  givenBy           UserRatingGiven @relation(fields: [userRatingGivenId], references: [id], onDelete: Cascade)
-  userRatingGivenId String
-  givenTo           User            @relation(fields: [userId], references: [id], onDelete: Cascade)
-  userId            String
-}
-
-model UserRatingGiven {
-  id         String       @id @default(cuid())
-  user       User         @relation(fields: [userId], references: [id], onDelete: Cascade)
-  userId     String
-  UserRating UserRating[]
-}
-
 enum UserStatus {
   Active
   Inactive

package/src/extendedSchemas.ts

@@ -50,7 +50,6 @@ import {
   SocialMediaProfile,
   SocialMediaPlatform,
   ServiceSubscriptionCounts,
-  UserRating,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
 
@@ -100,7 +99,6 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
   documentIDId: true,
   // documentID: true,
   reviews: true,
-  userRating: true,
   contacts: true,
   accepted: true,       
   boughtTicket: true,  
@@ -126,7 +124,7 @@ export interface BashEventExt extends BashEvent {
   amountOfGuests?: AmountOfGuests;
   recurrence?: Recurrence;
   creator?: PublicUser;
-  ticketTiers: TicketTierExt[];
+  ticketTiers?: TicketTierExt[];
   media: Media[];
   eventTasks: EventTask[];
   tickets?: Ticket[]; // Only include tickets that the user has purchased and not all tickets (could be thousands + privacy)
@@ -530,7 +528,7 @@ export interface InvitationExtraData extends Invitation {
 }
 
 export interface AssociatedBashExt extends AssociatedBash {
-  bashEvent: Partial<BashEventExt>;
+  bashEvent: BashEventExt;
   invitation?: Partial<InvitationExt>;
 }
 
@@ -611,7 +609,6 @@ export interface UserExt extends User {
   createdServices?: ServiceExt[];
   password?: string;
   otp?: string;
-  userRating?: UserRating[];
 }
 
 export const USER_DATA_SELECT_REVIEWS_COMMENTS = {

package/src/utils/promoCodesUtils.ts

@@ -7,7 +7,7 @@ export function findPromoCodeFromBashEvent(bashEvent: BashEventExt | undefined |
   if (!promoCodeId) {
     return;
   }
-  if (bashEvent?.ticketTiers.length) {
+  if (bashEvent?.ticketTiers?.length) {
     for (const tier of bashEvent?.ticketTiers) {
       const foundPromoCode = tier.promoCodes.find((promoCode) => promoCode.id === promoCodeId);
       if (foundPromoCode) {
@@ -23,7 +23,7 @@ export function getPromoCodesFromBashEvent(bashEvent: BashEventExt | undefined |
 }
 
 export function updatePromoCodesOnBashEventTicketTiers(bashEvent: BashEventExt, promoCodes: BashEventPromoCode[]): void {
-  bashEvent.ticketTiers.forEach((tier) => {
+  bashEvent.ticketTiers?.forEach((tier) => {
     tier.promoCodes = promoCodes.filter((pc) => tier.id === pc.ticketTierId);
   });
 }