@bash-app/bash-common 1.13.0 → 1.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -19,9 +19,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.590.0",
     "@aws-sdk/client-textract": "^3.590.0",
-    "@aws-sdk/s3-request-presigner": "^3.590.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "@aws-sdk/s3-request-presigner": "^3.590.0"
   },
   "peerDependencies": {
     "dayjs": "^1.11.10",
@@ -38,6 +36,8 @@
     "prisma": "^5.13.0",
     "shelljs": "^0.8.5",
     "ts-jest": "^29.1.1",
-    "tslib": "^2.6.2"
+    "tslib": "^2.6.2",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.2.2"
   }
 }

package/prisma/schema.prisma

@@ -152,6 +152,21 @@ model Reminder {
   notification   BashNotification @relation(fields: [notificationId], references: [id], onDelete: Cascade)
 }
 
+model BashEventPromoCode {
+  id                       String    @id @default(cuid())
+  bashEventId              String
+  bashEvent                BashEvent @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
+  code                     String
+  currency                 String    @default("USD")
+  discountAmountInCents    Int?
+  discountAmountPercentage Float?
+  usedBy                   User[]
+  validStartDateTime       DateTime  @default(now())
+  validUntilDateTime       DateTime?
+
+  @@unique([bashEventId, code])
+}
+
 model BashNotification {
   id              String      @id @default(cuid())
   creatorId       String
@@ -198,14 +213,14 @@ model Invitation {
 }
 
 model BashEvent {
-  id                             String             @id @default(cuid())
+  id                             String               @id @default(cuid())
   title                          String
   creatorId                      String
-  creator                        User               @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
+  creator                        User                 @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
   description                    String?
-  eventType                      String             @default("Other")
-  startDateTime                  DateTime?          @default(now())
-  endDateTime                    DateTime?          @default(now())
+  eventType                      String               @default("Other")
+  startDateTime                  DateTime?            @default(now())
+  endDateTime                    DateTime?            @default(now())
   ticketTiers                    TicketTier[]
   targetAudience                 TargetAudience?
   amountOfGuests                 AmountOfGuests?
@@ -217,18 +232,18 @@ model BashEvent {
   notAllowed                     String?
   nonProfit                      Boolean?
   nonProfitId                    String?
-  privacy                        Privacy            @default(Public)
+  privacy                        Privacy              @default(Public)
   tickets                        Ticket[]
   reviews                        Review[]
   sponsorships                   SponsoredEvent[]
   investments                    Investment[]
   capacity                       Int?
   location                       String?
-  status                         BashStatus         @default(Draft)
+  status                         BashStatus           @default(Draft)
   tags                           String[]
   coverPhoto                     String?
   media                          Media[]
-  club                           Club?              @relation(fields: [clubId], references: [id], onDelete: SetNull)
+  club                           Club?                @relation(fields: [clubId], references: [id], onDelete: SetNull)
   clubId                         String?
   links                          EventLink[]
   competitions                   Competition[]
@@ -242,6 +257,7 @@ model BashEvent {
   eventTasks                     EventTask[]
   videoLink                      String?
   subtitle                       String?
+  promoCodes                     BashEventPromoCode[]
 }
 
 model Checkout {
@@ -744,6 +760,7 @@ model User {
   ticketTiersWaitListsIveJoined TicketTier[]
   contacts                      Contact[]
   contactsReferencingMe         Contact[]            @relation("ContactsReferencingMe")
+  bashEventPromoCodesIUsed      BashEventPromoCode[]
 }
 
 model Contact {

package/src/extendedSchemas.ts

@@ -8,12 +8,10 @@ import {
   Ticket,
   User,
   TicketTier, Service, Review, Media, BashComment, Recurrence, Contact,
-  BashNotification
+  BashNotification, BashEventPromoCode,
+  Reminder
 } from "@prisma/client";
-import {RecordKey} from "./definitions";
 
-// TODO: Get this to work
-type PrismaInclude<T extends Record<RecordKey, unknown>> = {[key in keyof T]: boolean | {include: T[key]}};
 
 export interface BashEventExt extends BashEvent {
   targetAudience?: TargetAudience;
@@ -23,34 +21,18 @@ export interface BashEventExt extends BashEvent {
   ticketTiers: TicketTierExt[];
   media: Media[];
   eventTasks: EventTask[];
+  promoCodes?: BashEventPromoCode[];
   tickets?: Ticket[]; // Only include tickets that the user has purchased and not all tickets (could be thousands + privacy)
   // Do not include in fetch. Could be hundreds of these
   invitations: InvitationExt[];
 }
 
 export interface BashNotificationsExt extends BashNotification {
-  creator?: {
-    id: string;
-    name: string;
-    image?: string;
-  };
-  bashEvent?: {
-    id: string;
-    name: string;
-    coverPhoto?: string;
-  };
-  eventTask?: {
-    id: string;
-    title: string;
-  };
-  invitation?: {
-    id: string;
-    eventName: string;
-  };
-  reminders?: Array<{
-    id: string;
-    reminderText: string;
-  }>;
+  creator?: User;
+  bashEvent?: BashEvent;
+  eventTask?: EventTask;
+  invitation?: Invitation;
+  reminders?: Reminder[];
 }
 
 export const BASH_EVENT_DATA_TO_INCLUDE = {
@@ -60,7 +42,8 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
   ticketTiers: true,
   creator: true,
   eventTasks: true,
-  media: true
+  media: true,
+  promoCodes: true,
 }
 
 export const BASH_EVENT_DATA_TO_CLONE = [
@@ -70,6 +53,7 @@ export const BASH_EVENT_DATA_TO_CLONE = [
   'media',
   'recurrence',
   'invitations',
+  'promoCodes',
 ] as const;
 
 type RemoveCommonProperties<T, U> = keyof (Omit<T, keyof U> & Omit<U, keyof T>);