@bash-app/bash-common 29.28.2 → 29.29.0

package/package.json

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

package/prisma/schema.prisma

@@ -933,6 +933,13 @@ model AssociatedService {
   @@unique([ownerEmail, serviceId])
 }
 
+enum ServiceCancelationPolicy {
+  VeryFlexible
+  Flexible
+  Standard90Day
+  Standard30Day
+}
+
 // Common data for all services; 1-1 relation between each individual service model such as Venue
 model Service {
   id String @id @default(cuid())
@@ -982,9 +989,9 @@ model Service {
   emergencyContact     String?
   contactDetails       String?
   // rates                Rate[]  @relation("MultipleRates")
-  cancellationPolicy   String?
-  refundPolicy         String?
-  insurancePolicy      String?
+  cancellationPolicy   ServiceCancelationPolicy?
+  // refundPolicy         String?
+  // insurancePolicy      String?
   // hoursOfOperation  Json? @default("{}")
 
   stripeAccountId String?

package/src/extendedSchemas.ts

@@ -37,7 +37,7 @@ import {
   ServiceAddon,
   ServicePackage,
 } from "@prisma/client";
-import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
+import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray, VENUE_DATA_TO_INCLUDE } from "./definitions";
 
 export const FRONT_END_USER_DATA_TO_SELECT = {
   id: true,
@@ -108,6 +108,158 @@ export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEv
   'amountOfGuests',
 ];
 
+//---------------Services------------------
+export interface ServiceExt extends Service {
+  owner?: PublicUser | null;
+  creator?: PublicUser | null;
+
+  stripeAccount?: StripeAccount | null;
+
+  // availableDateTimes?: Availability[];
+
+  bookings?: Booking[];
+  // rates?: Rate[];
+  targetAudience?: TargetAudience | null;
+  media?: Media[];
+  serviceLinks?: ServiceLinkExt[];
+
+  eventService?: EventService;
+  entertainmentService?: EntertainmentService;
+  vendor?: Vendor;
+  exhibitor?: Exhibitor;
+  sponsor?: Sponsor;
+  venue?: Venue;
+  organization?: Organization;
+  volunteerService?: VolunteerService;
+  bashEvent: BashEvent[];
+
+  serviceRatesAssociation?: ServiceRatesAssociationExt | null;
+  associatedBashesReferencingMe?: AssociatedBash[];
+  associatedServicesReferencingMe?: AssociatedService[];
+
+  // googleReviews: GoogleReview[];
+}
+
+export interface ServiceRateExt extends ServiceRate {
+  serviceSpecialRates?: ServiceSpecialRates;
+  serviceDailyRates?: ServiceDailyRates;
+  serviceRatesAssociation?: ServiceRatesAssociation;
+}
+
+export interface ServicePackageExt extends ServicePackage {
+  serviceAddons: ServiceAddon[];
+}
+
+export interface ServiceDailyRatesExt extends ServiceDailyRates {
+  serviceRate?: ServiceRate;
+}
+export interface ServiceSpecialRatesExt extends ServiceSpecialRates {
+  serviceRate?: ServiceRate;
+}
+
+export interface ServiceRatesAssociationExt extends ServiceRatesAssociation {
+  serviceGeneralRates?: ServiceRate | null;
+  serviceDailyRates?: ServiceDailyRatesExt[];
+  serviceSpecialRates?: ServiceSpecialRatesExt[];
+
+  addons?: ServiceAddon[];
+  packages?: ServicePackageExt[];
+  media?: Media[];
+}
+
+
+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;
+}
+
+export interface VenueExt extends Venue {
+  service: ServiceExt;
+  // crowdSize?: AmountOfGuests;
+}
+
+export interface OrganizationExt extends Organization {
+  service: ServiceExt;
+  amountOfGuests?: AmountOfGuests;
+}
+//-----------------------------------------
+
+export interface VolunteerServiceExt extends VolunteerService {
+  service?: ServiceExt;
+  serviceRange?: ServiceRange | null;
+  media?: Media[];
+  links?: Link[];
+  // availableDateTimes?: Availability[];
+}
+
+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) => {
+    acc[key] = true;
+    return acc;
+  }, {} as Record<T, true>);
+}
+
+// Define the keys and values in a single object
+const serviceKeysObject = {
+  eventService: true,
+  entertainmentService: true,
+  vendor: true,
+  exhibitor: true,
+  sponsor: true,
+  venue: true,
+  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"
+} as const;
+
+export const serviceTypeToField = (serviceType : ServiceTypes) : ServiceSpecificName => {
+  return specificServiceMap[serviceType];
+}
 export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
   serviceAddons: true
 } satisfies Prisma.ServicePackageInclude;
@@ -160,52 +312,36 @@ export const SERVICE_DATA_TO_INCLUDE = {
   }
 } satisfies Prisma.ServiceInclude;
 
-// Create the final object dynamically
-function createAllTrueObject<T extends string>(keys: T[]): Record<T, true> {
-  return keys.reduce((acc, key) => {
-    acc[key] = true;
-    return acc;
-  }, {} as Record<T, true>);
-}
-
-// Define the keys and values in a single object
-const serviceKeysObject = {
-  eventService: true,
-  entertainmentService: true,
-  vendor: true,
-  exhibitor: true,
-  sponsor: true,
-  venue: true,
-  organization: true,
-} as const;
-
-
-export type ServiceSpecificName = keyof typeof serviceKeysObject;
-
-const serviceKeysArray = Object.keys(serviceKeysObject);
-
-export type ServiceSpecificType = ServiceExt[ServiceSpecificName];
-
-export const serviceTypeToField = (serviceType : ServiceTypes) : ServiceSpecificName => {
-  const specificServiceMap : Record<ServiceTypes, ServiceSpecificName> = {
-    "EventServices": "eventService",
-    "EntertainmentServices": "entertainmentService",
-    "Vendors": "vendor",
-    "Exhibitors": "exhibitor",
-    "Sponsors": "sponsor",
-    "Venues": "venue",
-    "Organizations": "organization"
-  };
-
-  return specificServiceMap[serviceType];
-}
-
 //full service data to include, includes specific service data
 export const SERVICE_FULL_DATA_TO_INCLUDE = {
   ...SERVICE_DATA_TO_INCLUDE,
   ...createAllTrueObject(serviceKeysArray)
 } satisfies Prisma.ServiceInclude;
 
+export const SERVICE_FULL_DATA_TO_CLONE = [
+  '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>[] = [
+  // 'bashEvents',
+] as const;
+//-----------------------------------------
+
 export interface BashNotificationExt extends BashNotification {
   creator?: PublicUser;
   bashEvent?: BashEvent;
@@ -269,119 +405,6 @@ export const STRIPE_ACCOUNT_DATA_TO_INCLUDE = {
 export interface StripeAccountExt extends StripeAccount {
   logo?: Media | null;
 }
-
-//---------------Services------------------
-export interface ServiceExt extends Service {
-  owner?: PublicUser | null;
-  creator?: PublicUser | null;
-
-  stripeAccount?: StripeAccount | null;
-
-  // availableDateTimes?: Availability[];
-
-  bookings?: Booking[];
-  // rates?: Rate[];
-  targetAudience?: TargetAudience | null;
-  media?: Media[];
-  serviceLinks?: ServiceLinkExt[];
-
-  eventService?: EventService;
-  entertainmentService?: EntertainmentService;
-  vendor?: Vendor;
-  exhibitor?: Exhibitor;
-  sponsor?: Sponsor;
-  venue?: Venue;
-  organization?: Organization;
-  volunteerService?: VolunteerService;
-  bashEvent: BashEvent[];
-
-  serviceRatesAssociation?: ServiceRatesAssociationExt | null;
-  associatedBashesReferencingMe?: AssociatedBash[];
-  associatedServicesReferencingMe?: AssociatedService[];
-
-  // googleReviews: GoogleReview[];
-}
-
-export interface ServiceRateExt extends ServiceRate {
-  serviceSpecialRates?: ServiceSpecialRates;
-  serviceDailyRates?: ServiceDailyRates;
-  serviceRatesAssociation?: ServiceRatesAssociation;
-}
-
-export interface ServicePackageExt extends ServicePackage {
-  serviceAddons: ServiceAddon[];
-}
-
-export interface ServiceDailyRatesExt extends ServiceDailyRates {
-  serviceRate?: ServiceRate;
-}
-export interface ServiceSpecialRatesExt extends ServiceSpecialRates {
-  serviceRate?: ServiceRate;
-}
-
-export interface ServiceRatesAssociationExt extends ServiceRatesAssociation {
-  serviceGeneralRates?: ServiceRate | null;
-  serviceDailyRates?: ServiceDailyRatesExt[];
-  serviceSpecialRates?: ServiceSpecialRatesExt[];
-
-  addons?: ServiceAddon[];
-  packages?: ServicePackageExt[];
-  media?: Media[];
-}
-
-
-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;
-}
-
-export interface VenueExt extends Venue {
-  service: ServiceExt;
-  // crowdSize?: AmountOfGuests;
-}
-
-export interface OrganizationExt extends Organization {
-  service: ServiceExt;
-  amountOfGuests?: AmountOfGuests;
-}
-//-----------------------------------------
-
-export interface VolunteerServiceExt extends VolunteerService {
-  service?: ServiceExt;
-  serviceRange?: ServiceRange | null;
-  media?: Media[];
-  links?: Link[];
-  // availableDateTimes?: Availability[];
-}
-
-export interface ServiceLinkExt extends ServiceLink {
-  link: Link;
-}
-
 export interface InvitationExt extends Invitation {
   creator: PublicUser;
   sentTo: PublicUser;

package/src/index.ts

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

package/src/utils/service/serviceUtils.ts

@@ -0,0 +1,96 @@
+import { ServiceCancelationPolicy as ServiceCancelationPolicyOption } from "@prisma/client";
+
+export type ServiceCancelationRefundPolicy = {
+    days?: number;
+    hours?: number;
+    refundPercentage: number
+}
+
+export type ServiceCancelationPolicyData = {
+    name: string,
+    description?: string,
+    refundPolicy: ServiceCancelationRefundPolicy[],
+};
+
+export type ServiceCancelationPolicyMap = {
+    [key in ServiceCancelationPolicyOption]: ServiceCancelationPolicyData;
+};
+
+export const ServiceCancelationPolicyData: ServiceCancelationPolicyMap = {
+    [ServiceCancelationPolicyOption.VeryFlexible]: {
+        name: "Very Flexible",
+        refundPolicy: [
+            {
+                hours: 24,
+                refundPercentage: 100
+            }
+        ]
+    },
+    [ServiceCancelationPolicyOption.Flexible]: {
+        name: "Flexible",
+        refundPolicy: [
+            {
+                days: 7,
+                refundPercentage: 100
+            },
+            {
+                hours: 24,
+                refundPercentage: 50
+            }
+        ]
+    },
+    [ServiceCancelationPolicyOption.Standard30Day]: {
+        name: "Standard 30 Day",
+        refundPolicy: [
+            {
+                days: 30,
+                refundPercentage: 100
+            },
+            {
+                days: 7,
+                refundPercentage: 50
+            }
+        ]
+    },
+    [ServiceCancelationPolicyOption.Standard90Day]: {
+        name: "Very Flexible",
+        refundPolicy: [
+            {
+                days: 90,
+                refundPercentage: 100
+            },
+            {
+                days: 14,
+                refundPercentage: 50
+            }
+        ]
+    }
+} as const;
+
+function generateDescription(refundPolicy: ServiceCancelationRefundPolicy[]): string {
+    const descriptions = refundPolicy.map((policy, index) => {
+        const unit = policy.days ? 'days' : 'hours';
+        const timeValue = policy.days ?? policy.hours;
+
+        const refundText = policy.refundPercentage === 100 
+            ? "a full refund (including all Fees)"
+            : `${policy.refundPercentage}% refund (excluding Fees)`;
+
+        if (index === 0) {
+            return `Guests may cancel their Booking until ${timeValue} ${unit} before the event start time and will receive ${refundText} of their Booking Price.`;
+        } else {
+            const previousTime = refundPolicy[index - 1].days ?? refundPolicy[index - 1].hours;
+            return `Guests may cancel their Booking between ${timeValue} ${unit} and ${previousTime} ${unit} before the event start time and receive ${refundText} of their Booking Price.`;
+        }
+    });
+
+    const lastTime = refundPolicy[refundPolicy.length - 1].days ?? refundPolicy[refundPolicy.length - 1].hours;
+    descriptions.push(`Cancellations submitted less than ${lastTime} ${refundPolicy[refundPolicy.length - 1].days ? 'days' : 'hours'} before the Event start time are not refundable.`);
+    
+    return descriptions.join(" ");
+}
+
+Object.keys(ServiceCancelationPolicyData).forEach((policyKey) => {
+    const policy = ServiceCancelationPolicyData[policyKey as ServiceCancelationPolicyOption];
+    policy.description = generateDescription(policy.refundPolicy);
+});

package/src/utils/{venueUtils.ts → service/venueUtils.ts}

@@ -27,4 +27,4 @@ export const VenuePricingPlanData: VenuePricingPlanMap = {
         monthlyFee: 100.0,
         flatFee: 0.0
     }
-};
+} as const;