@bash-app/bash-common 29.31.0 → 29.33.0

package/package.json

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

package/prisma/schema.prisma

@@ -934,6 +934,7 @@ model AssociatedService {
 }
 
 enum ServiceCancelationPolicy {
+  None
   VeryFlexible
   Flexible
   Standard90Day
@@ -989,7 +990,7 @@ model Service {
   emergencyContact     String?
   contactDetails       String?
   // rates                Rate[]  @relation("MultipleRates")
-  cancellationPolicy   ServiceCancelationPolicy?
+  cancellationPolicy   ServiceCancelationPolicy? @default(None)
   // refundPolicy         String?
   // insurancePolicy      String?
   // hoursOfOperation  Json? @default("{}")
@@ -1146,25 +1147,26 @@ model Sponsor {
 }
 
 model Venue {
-  id                  String            @id @default(cuid())
-  serviceId           String            @unique
-  service             Service           @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+  id                   String            @id @default(cuid())
+  serviceId            String            @unique
+  service              Service           @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   // serviceConnectionId  String? //Check: ?
   // serviceConnection    String?
-  yearsInBusiness     YearsOfExperience @default(LessThanOneYear)
-  amenities           String[]
-  menuItems           String?
-  features            String[]
-  venueTypes          String[]
-  secondaryVenueTypes String[]          @default([])
-  pitch               String?
-  capacity            Int?
-  trademark           Boolean?
-  manager             Boolean?
-  allowed             String?
-  notAllowed          String?
-  vibe                String?
-  dress               String?
+  yearsInBusiness      YearsOfExperience @default(LessThanOneYear)
+  amenities            String[]
+  menuItems            String?
+  features             String[]
+  venueTypes           String[]
+  secondaryVenueTypes  String[]          @default([])
+  pitch                String?
+  capacity             Int?
+  anticipatedAttendees Int?
+  trademark            Boolean?
+  manager              Boolean?
+  allowed              String?
+  notAllowed           String?
+  vibe                 String?
+  dress                String?
 
   pricingPlan           VenuePricingPlan?   @default(Percentage)
   subscriptionStatus    SubscriptionStatus?
@@ -1372,6 +1374,7 @@ model ServiceRate {
   rateType                ServiceRateType
   hourlyRate              Int?
   dailyRate               Int?
+  cleaningFeePerBooking   Int?
   minimumTimeBlockHours   Int?
   serviceSpecialRates     ServiceSpecialRates?
   serviceDailyRates       ServiceDailyRates?

package/src/utils/service/serviceUtils.ts

@@ -17,6 +17,11 @@ export type ServiceCancelationPolicyMap = {
 };
 
 export const ServiceCancelationPolicyData: ServiceCancelationPolicyMap = {
+    [ServiceCancelationPolicyOption.None]: {
+        name: "None",
+        refundPolicy: [],
+        description: "No cancelation policy."
+    },
     [ServiceCancelationPolicyOption.VeryFlexible]: {
         name: "Very Flexible",
         refundPolicy: [
@@ -90,7 +95,7 @@ function generateDescription(refundPolicy: ServiceCancelationRefundPolicy[]): st
     return descriptions.join(" ");
 }
 
-Object.keys(ServiceCancelationPolicyData).forEach((policyKey) => {
+Object.keys(ServiceCancelationPolicyData).filter((policyKey) => policyKey as ServiceCancelationPolicyOption != ServiceCancelationPolicyOption.None).forEach((policyKey) => {
     const policy = ServiceCancelationPolicyData[policyKey as ServiceCancelationPolicyOption];
     policy.description = generateDescription(policy.refundPolicy);
 });