@bash-app/bash-common 30.26.0 → 30.28.0

package/package.json

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

package/prisma/schema.prisma

@@ -372,7 +372,7 @@ model Ticket {
   email                      String?
   paidOn                     DateTime?
   allowPromiseToPay          Boolean?
-  status                     TicketStatus     @default(Pending)
+  status                     TicketStatus?     @default(Pending)
   isFreeGuest                Boolean?
   geoFenceCheckInUnnecessary Boolean?
   checkedInAt                DateTime?

package/src/definitions.ts

@@ -216,6 +216,10 @@ export type FilterFields = {
   eventFormat: string[];
 };
 
+export type ApiEntityApproval = {
+  isApproved: boolean;
+};
+
 export type TicketTierWherePriceIsAString = Omit<TicketTier, "price"> & {
   price: string;
 } & { cannotDelete: boolean };

package/src/extendedSchemas.ts

@@ -1,57 +1,58 @@
 import {
   AmountOfGuests,
-  EventTask,
   AssociatedBash,
   AssociatedService,
-  BashEvent,
-  Invitation,
-  Ticket,
-  User,
-  TicketTier,
-  Service,
-  Review,
-  Media,
   BashComment,
-  Recurrence,
-  Contact,
-  BashNotification,
+  BashEvent,
   BashEventPromoCode,
-  Reminder,
+  BashNotification,
   Checkout,
-  ServiceLink,
-  Link,
-  Venue,
-  TargetAudience,
-  Vendor,
-  EventService,
+  Contact,
+  Coordinates,
   EntertainmentService,
+  EventService,
+  EventTask,
   Exhibitor,
-  Sponsor,
+  Invitation,
+  Link,
+  Media,
   Organization,
-  VolunteerService,
   Prisma,
-  ServiceRange,
-  StripeAccount,
-  Coordinates,
-  ServiceRatesAssociation,
-  ServiceRate,
-  ServiceDailyRates,
+  Recurrence,
+  Reminder,
+  Review,
+  Service,
   ServiceAddon,
-  ServicePackage,
-  UserSubscription,
-  SocialMediaProfile,
-  SocialMediaPlatform,
-  ServiceSubscriptionCounts,
-  ServiceSpecialRates,
+  ServiceBooking,
   ServiceBookingAddOn,
+  ServiceBookingCheckout,
   ServiceBookingDay,
+  ServiceBookingFee,
   ServiceBookingPackage,
-  ServiceBookingCheckout,
-  ServiceBooking,
   ServiceBookingPriceBreakdown,
-  ServiceBookingFee,
+  ServiceDailyRates,
+  ServiceLink,
+  ServicePackage,
+  ServiceRange,
+  ServiceRate,
+  ServiceRatesAssociation,
+  ServiceSpecialRates,
+  ServiceSubscriptionCounts,
+  SocialMediaPlatform,
+  SocialMediaProfile,
+  Sponsor,
+  StripeAccount,
+  TargetAudience,
+  Ticket,
+  TicketTier,
+  User,
+  UserSubscription,
+  Vendor,
+  Venue,
+  VolunteerService,
   TicketTransfer,
   TicketMetadata,
+  SponsoredEvent,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE } from "./definitions";
 import { serviceKeysArray } from "./utils/service/serviceUtils";
@@ -127,6 +128,8 @@ export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
   },
 } satisfies Prisma.UserSelect;
 
+export interface SponsoredEventExt extends SponsoredEvent {}
+
 export interface BashEventExt extends BashEvent {
   targetAudience?: TargetAudience;
   amountOfGuests?: AmountOfGuests;
@@ -140,17 +143,8 @@ export interface BashEventExt extends BashEvent {
   invitations: Partial<InvitationExt>[];
   coordinates?: Coordinates[];
   venueServiceId?: string;
-  venueOwner?: {
-    id: string;
-    email: string;
-    givenName?: string;
-    familyName?: string;
-  };
-  sponsorships?: Array<{
-    sponsorId: string;
-    sponsorEmail: string;
-    name?: string;
-  }>;
+  venueOwner?: PublicUser;
+  sponsorships?: SponsoredEventExt[];
 }
 
 export const TICKET_TIER_DATA_TO_INCLUDE = {
@@ -252,6 +246,56 @@ export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
   media: true,
 } satisfies Prisma.ServiceRatesAssociationInclude;
 
+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;
+
+export const VENDOR_DATA_TO_INCLUDE = {
+  crowdSize: true,
+  serviceRange: true,
+} satisfies Prisma.VendorInclude;
+
+export const VOLUNTEER_DATA_TO_INCLUDE = {
+  links: {
+    include: {
+      serviceLinks: true,
+    },
+  },
+  media: true,
+  serviceRange: true,
+} satisfies Prisma.VolunteerServiceInclude;
+
+export const VENUE_DATA_TO_INCLUDE = {} satisfies Prisma.VenueInclude;
+
+export const EVENT_SERVICE_DATA_TO_INCLUDE = {
+  crowdSize: true,
+  serviceRange: true,
+} satisfies Prisma.EventServiceInclude;
+
+export const ENTERTAINMENT_SERVICE_DATA_TO_INCLUDE = {
+  crowdSize: true,
+  serviceRange: true,
+} satisfies Prisma.EntertainmentServiceInclude;
+
+export const SPONSOR_DATA_TO_INCLUDE = {
+  crowdSize: true,
+  serviceRange: true,
+} satisfies Prisma.SponsorInclude;
+
+export const EXHIBITOR_DATA_TO_INCLUDE = {
+  crowdSize: true,
+  serviceRange: true,
+} satisfies Prisma.ExhibitorInclude;
+
 export const SERVICE_DATA_TO_INCLUDE = {
   creator: {
     select: FRONT_END_USER_DATA_TO_SELECT,
@@ -271,12 +315,30 @@ export const SERVICE_DATA_TO_INCLUDE = {
   serviceRatesAssociation: {
     include: SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE,
   },
-  // bookings: {
-  //   include: SERVICE_BOOKING_PRIVATE_DATA_TO_INCLUDE, //make sure only to include owned bookedDays
-  // },
   bashEvent: {
     include: BASH_EVENT_DATA_TO_INCLUDE,
   },
+  venue: {
+    include: VENUE_DATA_TO_INCLUDE,
+  },
+  eventService: {
+    include: EVENT_SERVICE_DATA_TO_INCLUDE,
+  },
+  entertainmentService: {
+    include: ENTERTAINMENT_SERVICE_DATA_TO_INCLUDE,
+  },
+  vendor: {
+    include: VENDOR_DATA_TO_INCLUDE,
+  },
+  exhibitor: {
+    include: EXHIBITOR_DATA_TO_INCLUDE,
+  },
+  sponsor: {
+    include: SPONSOR_DATA_TO_INCLUDE,
+  },
+  // bookings: {
+  //   include: SERVICE_BOOKING_PRIVATE_DATA_TO_INCLUDE, //make sure only to include owned bookedDays
+  // },
   // bookedCheckouts: {
   //   include: SERVICE_BOOKING_CHECKOUT_DATA_TO_INCLUDE, //make sure only to include owned checkouts
   // },
@@ -312,19 +374,6 @@ export interface StripeAccountExt extends StripeAccount {
   logo?: Media | null;
 }
 
-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;
-
 export interface ServiceRateExt extends ServiceRate {
   serviceSpecialRates?: ServiceSpecialRates;
   serviceDailyRates?: ServiceDailyRates;
@@ -470,23 +519,23 @@ export interface ServiceExt extends Service {
   // availableDateTimes?: Availability[];
 
   // rates?: Rate[];
-  targetAudience?: TargetAudience | null;
+  targetAudience?: TargetAudienceExt | null;
   media?: Media[];
   serviceLinks?: ServiceLinkExt[];
 
-  eventService?: EventService;
-  entertainmentService?: EntertainmentService;
-  vendor?: Vendor;
-  exhibitor?: Exhibitor;
-  sponsor?: Sponsor;
-  venue?: Venue;
-  organization?: Organization;
-  volunteerService?: VolunteerService;
-  bashEvent: BashEvent[];
+  eventService?: EventServiceExt;
+  entertainmentService?: EntertainmentServiceExt;
+  vendor?: VendorExt;
+  exhibitor?: ExhibitorExt;
+  sponsor?: SponsorExt;
+  venue?: VenueExt;
+  organization?: OrganizationExt;
+  volunteerService?: VolunteerServiceExt;
+  bashEvent: BashEventExt[];
 
   serviceRatesAssociation?: ServiceRatesAssociationExt | null;
-  associatedBashesReferencingMe?: AssociatedBash[];
-  associatedServicesReferencingMe?: AssociatedService[];
+  associatedBashesReferencingMe?: AssociatedBashExt[];
+  associatedServicesReferencingMe?: AssociatedServiceExt[];
 
   // googleReviews: GoogleReview[];
 
@@ -494,41 +543,33 @@ export interface ServiceExt extends Service {
   // bookings?: ServiceBookingExt[];
 }
 export interface EventServiceExt extends EventService {
-  service: ServiceExt;
   crowdSize?: AmountOfGuests;
   serviceRange?: ServiceRange;
 }
 
 export interface EntertainmentServiceExt extends EntertainmentService {
-  service: ServiceExt;
   crowdSize?: AmountOfGuests;
   serviceRange?: ServiceRange;
 }
 
 export interface ExhibitorExt extends Exhibitor {
-  service: ServiceExt;
   crowdSize?: AmountOfGuests;
   serviceRange?: ServiceRange;
 }
 
 export interface SponsorExt extends Sponsor {
-  service: ServiceExt;
   crowdSize?: AmountOfGuests;
   serviceRange?: ServiceRange;
 }
 
 export interface VendorExt extends Vendor {
-  service: ServiceExt;
   crowdSize?: AmountOfGuests;
+  serviceRange?: ServiceRange;
 }
 
-export interface VenueExt extends Venue {
-  service: ServiceExt;
-  // crowdSize?: AmountOfGuests;
-}
+export interface VenueExt extends Venue {}
 
 export interface OrganizationExt extends Organization {
-  service: ServiceExt;
   amountOfGuests?: AmountOfGuests;
 }
 //-----------------------------------------
@@ -545,25 +586,6 @@ export interface ServiceLinkExt extends ServiceLink {
   link: Link;
 }
 
-export const VENDOR_DATA_TO_INCLUDE = {
-  crowdSize: true,
-} satisfies Prisma.VendorInclude;
-
-export const VOLUNTEER_DATA_TO_INCLUDE = {
-  links: {
-    include: {
-      serviceLinks: true,
-    },
-  },
-  media: true,
-  serviceRange: true,
-  service: {
-    include: SERVICE_DATA_TO_INCLUDE,
-  },
-} satisfies Prisma.VolunteerServiceInclude;
-
-export const VENUE_DATA_TO_INCLUDE = {} satisfies Prisma.VenueInclude;
-
 //-----------------------------------------
 
 export interface BashNotificationExt extends BashNotification {

package/src/utils/objUtils.ts

@@ -1,7 +1,11 @@
 export function isObject(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    !Array.isArray(value) &&
+    !(value instanceof Date)
+  );
 }
-
 export function deepMerge<
   T extends Record<string, any>,
   U extends Record<string, any>
@@ -10,7 +14,7 @@ export function deepMerge<
   source: U | undefined | null,
   mergeArrays: boolean = false,
   mergeCommon: boolean = false
-): T & U {
+): T {
   const output = { ...(mergeCommon ? [] : target) } as T & U;
 
   for (const key in source) {

package/src/utils/service/serviceDBUtils.ts

@@ -1,5 +1,5 @@
-import { ServiceRate } from "@prisma/client";
-import { ServiceExt, ServiceSpecialRatesExt } from "../../extendedSchemas";
+import { ServiceExt } from "../../extendedSchemas";
+import { DeepPartial } from "../typeUtils";
 // import {
 //   specialRateConvertToDb,
 //   generalRatesConvertRatesToDB,
@@ -7,7 +7,9 @@ import { ServiceExt, ServiceSpecialRatesExt } from "../../extendedSchemas";
 //   generalRatesConvertRatesFromDB,
 // } from "./serviceRateDBUtils";
 
-export function serviceToDb(service: Partial<ServiceExt>): Partial<ServiceExt> {
+export function serviceToDb(
+  service: DeepPartial<ServiceExt>
+): DeepPartial<ServiceExt> {
   if (service.serviceRatesAssociation) {
     // service.serviceRatesAssociation.serviceSpecialRates =
     //   service.serviceRatesAssociation.serviceSpecialRates?.map(

package/src/utils/service/serviceUtils.ts

@@ -157,9 +157,7 @@ export function serviceGetSpecificType<BookingType extends Service>(
     return null;
   }
 
-  const specificId = service[
-    `${specificFieldName}Id` as keyof BookingType
-  ] as string;
+  const specificId = service[`${specificFieldName}Id`] as string;
 
   return {
     serviceId: service.id,
@@ -211,7 +209,61 @@ export const specificServiceMap: Record<ServiceTypes, ServiceSpecificName> = {
   Venues: "venue",
   Organizations: "organization",
 } as const;
-
-const serviceTypeToField = (serviceType: ServiceTypes): ServiceSpecificName => {
+export const serviceTypeToField = (
+  serviceType: ServiceTypes
+): ServiceSpecificName => {
   return specificServiceMap[serviceType];
 };
+
+// export type SpecificServiceMap = {
+//   [P in keyof T]: ServiceSpecificInfo;
+// };
+
+// type ServiceExtKeyMap = {
+//   EventServices: "eventService";
+//   EntertainmentServices: "entertainmentService";
+//   Vendors: "vendor";
+//   Exhibitors: "exhibitor";
+//   Sponsors: "sponsor";
+//   Venues: "venue";
+//   Organizations: "organization";
+// };
+// export type ServiceExtKey<T extends ServiceTypes> = ServiceExtKeyMap[T];
+// export type ServiceSpecificInfo = {
+//   description: string;
+// };
+
+// export type ServiceSpecificInfoMap<T> = {
+//   [P in keyof T]: ServiceSpecificInfo;
+// };
+// export type SpecificServiceInfoMap = {
+//   [K in ServiceTypes]: ServiceSpecificInfoMap<
+//     ServiceExt[ServiceExtKey<K>]
+//   >;
+// };
+
+// export const serviceSpecificInfo = {
+//   EventServices:{
+
+//   },
+//   EntertainmentServices: {
+
+//   },
+//   Vendors:{
+
+//   },
+//   Exhibitors:{
+
+//   };
+//   Sponsors:{
+
+//   },
+//   Venues:{
+//     venueTypes: {
+//       description: `venueTypes (array of primary venue types)`
+//     }
+//   },
+//   Organizations: {
+
+//   },
+// } as SpecificServiceInfoMap;

package/src/utils/typeUtils.ts

@@ -6,6 +6,20 @@ export type RemoveCommonProperties<T, U> = keyof (Omit<T, keyof U> &
 export type MakeOptional<T, K extends keyof T> = Omit<T, K> &
   Partial<Pick<T, K>>;
 
+export type MakeRequired<T, K extends keyof T> = Omit<T, K> &
+  Required<Pick<T, K>>;
+
+export type DeepPartial<T> =
+  | T extends Function
+      ? T
+      : T extends Array<infer U>
+      ? Array<DeepPartial<U>>
+      : T extends object
+      ? { [P in keyof T]?: DeepPartial<T[P]> }
+      : T;
+
+export type Override<T, U> = Omit<T, keyof U> & U;
+
 // Create the final object dynamically
 export function createAllTrueObject<T extends string>(
   keys: T[]