@bash-app/bash-common 29.50.0 → 29.52.0

package/src/extendedSchemas.ts

@@ -7,12 +7,20 @@ import {
   Invitation,
   Ticket,
   User,
-  TicketTier, Service, Review, Media, BashComment, Recurrence, Contact,
-  BashNotification, BashEventPromoCode,
+  TicketTier,
+  Service,
+  Review,
+  Media,
+  BashComment,
+  Recurrence,
+  Contact,
+  BashNotification,
+  BashEventPromoCode,
   Reminder,
   Checkout,
   ServiceLink,
-  Link, Venue,
+  Link,
+  Venue,
   // Availability,
   TargetAudience,
   Vendor,
@@ -22,7 +30,9 @@ import {
   Sponsor,
   Organization,
   Booking,
-  VolunteerService, Prisma, ServiceRange,
+  VolunteerService,
+  Prisma,
+  ServiceRange,
   StripeAccount,
   VisibilityPreference,
   BashEventType,
@@ -39,25 +49,37 @@ import {
   UserSubscription,
   SocialMediaProfile,
   SocialMediaPlatform,
+  ServiceSubscriptionCounts,
+  UserRating,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
 
 //------------------------------------------------------user subscriptions------------------------------------------------------
-export const PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT = {
+export const PUBLIC_USER_SUBSCRIPTION_DATA_TO_SELECT = {
   type: true,
   status: true,
-  serviceSubscriptionTier: true,
   ownerId: true,
-  stripeAccountId: true
+  subscriptionCount: true,
+  listedCount: true,
 } satisfies Prisma.UserSubscriptionSelect;
 
-export type UserSubscriptionExt = {
-  stripeAccount: StripeAccountExt;
-} & UserSubscription;
+export const PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT = {
+  ...PUBLIC_USER_SUBSCRIPTION_DATA_TO_SELECT,
+  stripeAccountId: true,
+  stripeCheckoutSessionId: true,
+} satisfies Prisma.UserSubscriptionSelect;
 
 export const USER_SUBSCRIPTION_DATA_TO_INCLUDE = {
-  stripeAccount: true
+  stripeAccount: true,
+  subscriptionCount: true,
+  listedCount: true,
 } satisfies Prisma.UserSubscriptionInclude;
+
+export type UserSubscriptionExt = {
+  stripeAccount?: StripeAccountExt;
+  subscriptionCount?: ServiceSubscriptionCounts;
+  listedCount?: ServiceSubscriptionCounts;
+} & UserSubscription;
 //-------------------------------------------------------------------------------------------------------------------------------
 
 export const FRONT_END_USER_DATA_TO_SELECT = {
@@ -69,6 +91,21 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
   uploadedImage: true,
   isSuperUser: true,
   socialMediaProfiles: true,
+  city: true,
+  state: true,
+  createdOn: true,
+  dob: true,
+  gender: true,
+  sex: true,
+  documentIDId: true,
+  // documentID: true,
+  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 = {
@@ -80,8 +117,8 @@ export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
   country: true,
   phone: true,
   userSubscription: {
-    select: PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT
-  }
+    select: PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT,
+  },
 } satisfies Prisma.UserSelect;
 
 export interface BashEventExt extends BashEvent {
@@ -94,45 +131,64 @@ export interface BashEventExt extends BashEvent {
   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[];
 }
 
 export const TICKET_TIER_DATA_TO_INCLUDE = {
+  tickets: {
+    include: {
+      owner: {
+        select: {
+          id: true,
+          email: true,
+          givenName: true,
+          familyName: true,
+        },
+      },
+      forUser: {
+        select: {
+          id: true,
+          email: true,
+          givenName: true,
+          familyName: true,
+        },
+      },
+    },
+  },
   promoCodes: true,
 } satisfies Prisma.TicketTierInclude;
 
 export const BASH_EVENT_DATA_TO_INCLUDE = {
   creator: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
   targetAudience: true,
   amountOfGuests: true,
   recurrence: true,
-  ticketTiers: {
-    include: TICKET_TIER_DATA_TO_INCLUDE
-  },
-  eventTasks: true,
+  ticketTiers: true,
   media: true,
+  eventTasks: true,
+  invitations: true,
 } satisfies Prisma.BashEventInclude;
 
 export const BASH_EVENT_DATA_TO_CLONE = [
-  'ticketTiers',
-  'media',
-  'recurrence',
-  'invitations',
+  "ticketTiers",
+  "media",
+  "recurrence",
+  "invitations",
 ] as const;
 
 type RemoveCommonProperties<T, U> = keyof (Omit<T, keyof U> & Omit<U, keyof T>);
-type BashEventExtMinusDataToCloneType = Omit<BashEventExt, UnionFromArray<typeof BASH_EVENT_DATA_TO_CLONE>>;
+type BashEventExtMinusDataToCloneType = Omit<
+  BashEventExt,
+  UnionFromArray<typeof BASH_EVENT_DATA_TO_CLONE>
+>;
 
-export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEventExtMinusDataToCloneType>[] = [
-  'creator',
-  'eventTasks',
-  'tickets',
-  'targetAudience',
-  'amountOfGuests',
-];
+export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<
+  BashEvent,
+  BashEventExtMinusDataToCloneType
+>[] = ["creator", "eventTasks", "tickets", "targetAudience", "amountOfGuests"];
 
 //---------------Services------------------
 export interface ServiceExt extends Service {
@@ -193,7 +249,6 @@ export interface ServiceRatesAssociationExt extends ServiceRatesAssociation {
   media?: Media[];
 }
 
-
 export interface EventServiceExt extends EventService {
   service: ServiceExt;
   crowdSize?: AmountOfGuests;
@@ -246,7 +301,6 @@ export interface ServiceLinkExt extends ServiceLink {
   link: Link;
 }
 
-
 // Create the final object dynamically
 function createAllTrueObject<T extends string>(keys: T[]): Record<T, true> {
   return keys.reduce((acc, key) => {
@@ -266,51 +320,52 @@ const serviceKeysObject = {
   organization: true,
 } as const;
 
-
 export type ServiceSpecificName = keyof typeof serviceKeysObject;
 
 const serviceKeysArray = Object.keys(serviceKeysObject);
 
 export type ServiceSpecificType = ServiceExt[ServiceSpecificName];
 
-export const specificServiceMap : Record<ServiceTypes, ServiceSpecificName> = {
-  "EventServices": "eventService",
-  "EntertainmentServices": "entertainmentService",
-  "Vendors": "vendor",
-  "Exhibitors": "exhibitor",
-  "Sponsors": "sponsor",
-  "Venues": "venue",
-  "Organizations": "organization"
+export const specificServiceMap: Record<ServiceTypes, ServiceSpecificName> = {
+  EventServices: "eventService",
+  EntertainmentServices: "entertainmentService",
+  Vendors: "vendor",
+  Exhibitors: "exhibitor",
+  Sponsors: "sponsor",
+  Venues: "venue",
+  Organizations: "organization",
 } as const;
 
-export const serviceTypeToField = (serviceType : ServiceTypes) : ServiceSpecificName => {
+export const serviceTypeToField = (
+  serviceType: ServiceTypes
+): ServiceSpecificName => {
   return specificServiceMap[serviceType];
-}
+};
 export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
-  serviceAddons: true
+  serviceAddons: true,
 } satisfies Prisma.ServicePackageInclude;
 
 export const SERVICE_DAILYRATES_DATA_TO_INCLUDE = {
-  serviceRate: true
+  serviceRate: true,
 } satisfies Prisma.ServiceDailyRatesInclude;
 
 export const SERVICE_SPECIALRATES_DATA_TO_INCLUDE = {
-  serviceRate: true
+  serviceRate: true,
 } satisfies Prisma.ServiceSpecialRatesInclude;
 
 export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
   serviceGeneralRates: true,
   serviceDailyRates: {
-    include: SERVICE_DAILYRATES_DATA_TO_INCLUDE
+    include: SERVICE_DAILYRATES_DATA_TO_INCLUDE,
   },
   serviceSpecialRates: {
-    include: SERVICE_SPECIALRATES_DATA_TO_INCLUDE
+    include: SERVICE_SPECIALRATES_DATA_TO_INCLUDE,
   },
   addons: true,
-  packages:  {
-    include: SERVICE_PACKAGE_DATA_TO_INCLUDE
+  packages: {
+    include: SERVICE_PACKAGE_DATA_TO_INCLUDE,
   },
-  media: true
+  media: true,
 } satisfies Prisma.ServiceRatesAssociationInclude;
 
 //------------Stripe Accounts--------------
@@ -318,17 +373,17 @@ export const PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT = {
   logo: true,
   logoId: true,
   createdAt: true,
-  updatedAt: true
+  updatedAt: true,
 } satisfies Prisma.StripeAccountSelect;
 
 export const STRIPE_ACCOUNT_DATA_TO_INCLUDE = {
   logo: true,
   owner: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
   userSubscription: {
-    select: PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT
-  }
+    select: PRIVATE_USER_SUBSCRIPTION_DATA_TO_SELECT,
+  },
 } satisfies Prisma.StripeAccountInclude;
 
 export interface StripeAccountExt extends StripeAccount {
@@ -337,10 +392,10 @@ export interface StripeAccountExt extends StripeAccount {
 
 export const SERVICE_DATA_TO_INCLUDE = {
   creator: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
   owner: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
   targetAudience: true,
   // amountOfGuests: true,
@@ -352,43 +407,49 @@ export const SERVICE_DATA_TO_INCLUDE = {
   media: true,
   stripeAccount: {
     // ...STRIPE_ACCOUNT_DATA_TO_INCLUDE,
-    select: PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT
+    select: PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT,
   },
   // availableDateTimes: true,
   serviceLinks: {
-    include: SERVICE_LINK_DATA_TO_INCLUDE
+    include: SERVICE_LINK_DATA_TO_INCLUDE,
   },
   serviceRatesAssociation: {
-    include: SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE
-  }
+    include: SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE,
+  },
 } satisfies Prisma.ServiceInclude;
 
 //full service data to include, includes specific service data
 export const SERVICE_FULL_DATA_TO_INCLUDE = {
   ...SERVICE_DATA_TO_INCLUDE,
-  ...createAllTrueObject(serviceKeysArray)
+  ...createAllTrueObject(serviceKeysArray),
 } satisfies Prisma.ServiceInclude;
 
 export const SERVICE_FULL_DATA_TO_CLONE = [
-  'media',
-  'targetAudience',
-  'serviceLinks',
+  "media",
+  "targetAudience",
+  "serviceLinks",
   // ...Object.values(specificServiceMap)
 ] as const;
 
-type ServiceExtMinusDataToCloneType = Omit<ServiceExt, UnionFromArray<typeof SERVICE_FULL_DATA_TO_CLONE>>;
-export const SERVICE_FULL_DATA_TO_REMOVE: RemoveCommonProperties<Service, ServiceExtMinusDataToCloneType>[] = [
-  'creator',
-  'owner',
-  'bookings',
-] as const;
-
-export const VENUE_DATA_TO_CLONE = [
-
-] as const;
-
-type VenueExtMinusDataToCloneType = Omit<Venue, UnionFromArray<typeof VENUE_DATA_TO_CLONE>>;
-export const VENUE_DATA_TO_REMOVE: RemoveCommonProperties<Venue, VenueExtMinusDataToCloneType>[] = [
+type ServiceExtMinusDataToCloneType = Omit<
+  ServiceExt,
+  UnionFromArray<typeof SERVICE_FULL_DATA_TO_CLONE>
+>;
+export const SERVICE_FULL_DATA_TO_REMOVE: RemoveCommonProperties<
+  Service,
+  ServiceExtMinusDataToCloneType
+>[] = ["creator", "owner", "bookings"] as const;
+
+export const VENUE_DATA_TO_CLONE = [] as const;
+
+type VenueExtMinusDataToCloneType = Omit<
+  Venue,
+  UnionFromArray<typeof VENUE_DATA_TO_CLONE>
+>;
+export const VENUE_DATA_TO_REMOVE: RemoveCommonProperties<
+  Venue,
+  VenueExtMinusDataToCloneType
+>[] = [
   // 'bashEvents',
 ] as const;
 //-----------------------------------------
@@ -419,7 +480,6 @@ export interface TargetAudienceExt extends TargetAudience {
   customAttributes?: { [key: string]: any };
 }
 
-
 export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
   bashEvent: {
     select: {
@@ -440,27 +500,26 @@ export interface EventTaskExt extends EventTask {
 
 export const EVENT_TASK_DATA_TO_INCLUDE = {
   creator: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
   assignedTo: {
-    select: FRONT_END_USER_DATA_TO_SELECT
-  }
+    select: FRONT_END_USER_DATA_TO_SELECT,
+  },
 } 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 = {
   creator: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
   sentTo: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
   tickets: true,
 } satisfies Prisma.InvitationInclude;
@@ -471,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 {
@@ -482,16 +541,16 @@ export interface AssociatedServiceExt extends AssociatedService {
 
 export const ASSOCIATED_BASH_DATA_TO_INCLUDE = {
   bashEvent: {
-    include: BASH_EVENT_DATA_TO_INCLUDE
+    include: BASH_EVENT_DATA_TO_INCLUDE,
   },
   invitation: {
-    include: INVITATION_DATA_TO_INCLUDE
-  }
+    include: INVITATION_DATA_TO_INCLUDE,
+  },
 } satisfies Prisma.AssociatedBashInclude;
 
 export const ASSOCIATED_SERVICE_DATA_TO_INCLUDE = {
   service: {
-    include: SERVICE_DATA_TO_INCLUDE
+    include: SERVICE_DATA_TO_INCLUDE,
   },
   // invitation: {
   //   include: INVITATION_DATA_TO_INCLUDE
@@ -512,27 +571,27 @@ export interface TicketExt extends Ticket {
 
 export interface CheckoutExt extends Checkout {
   owner: PublicUser;
-  tickets: Ticket[]
+  tickets: Ticket[];
 }
 
 export const CHECKOUT_DATA_TO_INCLUDE = {
   owner: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
   tickets: {
     select: {
-      ownerId: true
-    }
-  }
+      ownerId: true,
+    },
+  },
 } satisfies Prisma.CheckoutInclude;
 
 export interface ReviewExt extends Review {
-  comments: BashComment[];
+  comments?: BashComment[];
 }
 
 export const CONTACT_DATA_TO_INCLUDE = {
   contactOwner: {
-    select: FRONT_END_USER_DATA_TO_SELECT
+    select: FRONT_END_USER_DATA_TO_SELECT,
   },
 } satisfies Prisma.ContactInclude;
 
@@ -552,18 +611,36 @@ export interface UserExt extends User {
   createdServices?: ServiceExt[];
   password?: string;
   otp?: string;
+  userRating?: UserRating[];
 }
 
 export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
   reviews: {
-    include: {
-      comments: true
-    }
-  }
+    select: {
+      id: true,
+      rating: true,
+      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
+        select: {
+          id: true,
+          content: true,
+        },
+      },
+    },
+  },
 } satisfies Prisma.UserSelect;
 
+export type PublicUser = Pick<
+  UserExt,
+  keyof typeof FRONT_END_USER_DATA_TO_SELECT
+> &
+  Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;
 
-export type PublicUser = Pick<UserExt, keyof typeof FRONT_END_USER_DATA_TO_SELECT>
-  & Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;
-
-export type PublicStripeAccount = Pick<StripeAccountExt, keyof typeof PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT>;
+export type PublicStripeAccount = Pick<
+  StripeAccountExt,
+  keyof typeof PUBLIC_STRIPE_ACCOUNT_DATA_TO_SELECT
+>;

package/src/index.ts

@@ -11,6 +11,9 @@ export * from "./utils/sortUtils";
 export * from "./utils/apiUtils";
 export * from "./utils/urlUtils";
 export * from "./utils/promoCodesUtils";
+export * from "./utils/userPromoCodeUtils";
+export * from "./utils/userSubscriptionUtils";
 export * from "./utils/service/serviceUtils";
 export * from "./utils/service/venueUtils";
 export * from "./utils/stripeAccountUtils";
+export * from "./utils/entityUtils";

package/src/utils/entityUtils.ts

@@ -0,0 +1,4 @@
+export const ENTITIES = {
+  Service: "Service",
+  BashEvent: "BashEvent",
+} as const;