@bash-app/bash-common 29.51.0 → 29.53.0

package/package.json

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

package/prisma/schema.prisma

@@ -917,6 +917,10 @@ model User {
   volunteerService              VolunteerService[]
   stripeAccounts                StripeAccount[]
   userPromoCodeRedemption       UserPromoCodeRedemption[]
+  accepted                      Boolean?                  @default(false) // Tracks if the user accepted the invitation
+  boughtTicket                  Boolean?                  @default(false) // Tracks if the user bought a ticket
+  noPay                         Boolean?                  @default(false) // Tracks if the user is marked as "noPay"
+  supportedEvent                Boolean?                  @default(false) // Tracks if the user supported the event
 
   // primaryStripeAccountDBId String?        @unique
   // primaryStripeAccountDB   StripeAccount? @relation("PrimaryStripeAccount", fields: [primaryStripeAccountDBId], references: [id], onDelete: Restrict, onUpdate: Restrict)

package/src/definitions.ts

@@ -627,17 +627,32 @@ export type AllKeysUnionOfDescendants<T> = T extends object
 
 export type AllKeysOfDescendants<T> = AllKeysUnionOfDescendants<T>[];
 
-type AllKeysUnion<T> = T extends object
+type Decrement<N extends number> = N extends 5
+  ? 4
+  : N extends 4
+  ? 3
+  : N extends 3
+  ? 2
+  : N extends 2
+  ? 1
+  : N extends 1
+  ? 0
+  : never;
+
+type AllKeysUnion<T, Depth extends number = 5> = Depth extends 0
+  ? never
+  : T extends object
   ? T[keyof T] extends infer K
     ? K extends string | number | symbol
       ? {
           [K in keyof T]-?: T[K] extends any[]
-            ? GetTypeOfArray<T[K]> extends Record<RecordKey, any>
+            ? GetTypeOfArray<T[K]> extends Record<string, any>
               ?
                   | `${K & string}`
                   | `${K &
                       string}${typeof URL_INCLUDE_PRISMA_DATA_KEYS_DELIM}${AllKeysUnion<
-                      GetTypeOfArray<T[K]>
+                      GetTypeOfArray<T[K]>,
+                      Decrement<Depth>
                     > &
                       string}`
               : never
@@ -647,7 +662,8 @@ type AllKeysUnion<T> = T extends object
                 | `${K & string}`
                 | `${K &
                     string}${typeof URL_INCLUDE_PRISMA_DATA_KEYS_DELIM}${AllKeysUnion<
-                    T[K]
+                    T[K],
+                    Decrement<Depth>
                   > &
                     string}`;
         }[keyof T]
@@ -657,6 +673,7 @@ type AllKeysUnion<T> = T extends object
 
 export type AllKeys<T> = AllKeysUnion<T>[];
 
+
 export interface IAddress {
   place?: string;
   googlePlaceId?: string;

package/src/extendedSchemas.ts

@@ -102,6 +102,10 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
   reviews: true,
   userRating: true,
   contacts: true,
+  accepted: true,       // Newly added field
+  boughtTicket: true,   // Newly added field
+  noPay: true,          // Newly added field
+  supportedEvent: true, // Newly added field
 } satisfies Prisma.UserSelect;
 
 export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
@@ -124,10 +128,10 @@ export interface BashEventExt extends BashEvent {
   creator?: PublicUser;
   ticketTiers: TicketTierExt[];
   media: Media[];
-  eventTasks?: EventTask[];
+  eventTasks: EventTask[];
   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[];
+  invitations: Partial<InvitationExt>[];
   coordinates?: Coordinates[];
 }
 
@@ -155,7 +159,6 @@ export const TICKET_TIER_DATA_TO_INCLUDE = {
   promoCodes: true,
 } satisfies Prisma.TicketTierInclude;
 
-
 export const BASH_EVENT_DATA_TO_INCLUDE = {
   creator: {
     select: FRONT_END_USER_DATA_TO_SELECT,
@@ -163,68 +166,12 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
   targetAudience: true,
   amountOfGuests: true,
   recurrence: true,
-  ticketTiers: {
-    include: {
-      promoCodes: true,
-      bashEvent: true,
-      tickets: {
-        include: {
-          owner: {
-            select: {
-              id: true,
-              email: true,
-              givenName: true,
-              familyName: true,
-              image: true,
-              createdOn: true,
-              isSuperUser: true,
-              uploadedImage: true,
-              dob: true,
-              gender: true,
-              sex: true,
-              city: true,
-              state: true,
-              documentIDId: true,
-              reviews: true,
-              userRating: true,
-              socialMediaProfiles: true,
-              contacts: true,
-            },
-          },
-          forUser: {
-            select: {
-              id: true,
-              email: true,
-              givenName: true,
-              familyName: true,
-              image: true,
-              createdOn: true,
-              isSuperUser: true,
-              uploadedImage: true,
-              dob: true,
-              gender: true,
-              sex: true,
-              city: true,
-              state: true,
-              documentIDId: true,
-              reviews: true,
-              userRating: true,
-              socialMediaProfiles: true,
-              contacts: true,
-            },
-          },
-        },
-      },
-    },
-  },
+  ticketTiers: true,
   media: true,
-  eventTasks: true, 
+  eventTasks: true,
+  invitations: true,
 } satisfies Prisma.BashEventInclude;
 
-
-
-
-
 export const BASH_EVENT_DATA_TO_CLONE = [
   "ticketTiers",
   "media",
@@ -561,10 +508,10 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
 } satisfies Prisma.EventTaskInclude;
 
 export interface InvitationExt extends Invitation {
-  creator: PublicUser;
-  sentTo: PublicUser;
-  tickets: Ticket[];
-  associatedBash?: AssociatedBash | null;
+  creator: PublicUser; // Include full details of the creator
+  sentTo?: PublicUser; // Full details of the user the invitation was sent to
+  associatedBash?: Partial<AssociatedBashExt> | null
+  tickets: Ticket[]; // Tickets associated with the invitation
 }
 
 export const INVITATION_DATA_TO_INCLUDE = {
@@ -583,8 +530,8 @@ export interface InvitationExtraData extends Invitation {
 }
 
 export interface AssociatedBashExt extends AssociatedBash {
-  bashEvent: BashEventExt;
-  invitation: InvitationExt;
+  bashEvent: Partial<BashEventExt>;
+  invitation?: Partial<InvitationExt>;
 }
 
 export interface AssociatedServiceExt extends AssociatedService {
@@ -664,18 +611,20 @@ export interface UserExt extends User {
   createdServices?: ServiceExt[];
   password?: string;
   otp?: string;
-  userRating?: UserRating[];}
+  userRating?: UserRating[];
+}
 
 export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
   reviews: {
     select: {
       id: true,
       rating: true,
-      creatorId: true,    // Fetches the creatorId from Review
-      bashEventId: true,  // Fetches the bashEventId
+      creatorId: true, // Fetches the creatorId from Review
+      bashEventId: true, // Fetches the bashEventId
       createdAt: true,
       updatedAt: true,
-      comments: {         // This matches the relation field in the schema
+      comments: {
+        // This matches the relation field in the schema
         select: {
           id: true,
           content: true,
@@ -685,7 +634,6 @@ export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
   },
 } satisfies Prisma.UserSelect;
 
-
 export type PublicUser = Pick<
   UserExt,
   keyof typeof FRONT_END_USER_DATA_TO_SELECT