@bash-app/bash-common 29.28.3 → 29.30.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.28.3",
+  "version": "29.30.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -21,6 +21,7 @@
     "@aws-sdk/client-s3": "^3.529.0",
     "@aws-sdk/client-textract": "^3.529.0",
     "@aws-sdk/s3-request-presigner": "^3.529.0",
+    "@testing-library/jest-dom": "^6.6.3",
     "@types/qrcode": "^1.5.5",
     "qrcode": "^1.5.3"
   },

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,11 +989,14 @@ 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("{}")
 
+  displayGoogleReviewsOnDetailPage Boolean?
+  displayBashReviewsOnDetailPage   Boolean?
+
   stripeAccountId String?
   stripeAccount   StripeAccount? @relation(fields: [stripeAccountId], references: [id], onDelete: Restrict)
 

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/typeUtils.ts

@@ -1 +0,0 @@
-export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;