@bash-app/bash-common 30.1.0 → 30.3.0

package/.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "cSpell.words": [
+        "autoincrement",
+        "bashfeed",
+        "cuid",
+        "Pinterest",
+        "Tradeshow"
+    ]
+}

package/package.json

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

package/prisma/schema.prisma

@@ -77,7 +77,7 @@ model Competition {
   owner          User                 @relation(fields: [userId], references: [id], onDelete: Cascade)
   prizes         Prize[]
   userId         String
-  sponser        CompetitionSponsor[]
+  sponsor        CompetitionSponsor[]
   bashEvent      BashEvent            @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
   bashEventId    String
   numberOfPrizes Int
@@ -99,7 +99,8 @@ model EventTask {
   creator                        User               @relation(fields: [creatorId], references: [id], onDelete: Cascade)
   bashEventId                    String
   bashEvent                      BashEvent          @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
-  description                    String
+  title                          String             
+  description                    String?
   assignedToId                   String?
   assignedTo                     User?              @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
   status                         TaskStatus?
@@ -111,6 +112,8 @@ enum TaskStatus {
   Accepted
   Rejected
   Completed
+  Assigned
+  Open
 }
 
 model Reminder {
@@ -280,7 +283,7 @@ model TicketTier {
   bashEvent              BashEvent            @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
   tickets                Ticket[]
   waitList               User[]
-  price                  Int                  @default(0) //stored multipled by 100 to allow for decimals
+  price                  Int                  @default(0) //stored multiplied by 100 to allow for decimals
   title                  String               @default("Free")
   sortOrder              Int?
   description            String?
@@ -931,7 +934,7 @@ model User {
   bashEventPromoCodesIUsed      BashEventPromoCode[]
   // bookingForMe                  Booking[]
   userSubscription              UserSubscription?
-  // serviceSubcriptions           ServiceSubscription[]
+  // serviceSubscriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
   stripeAccounts                StripeAccount[]
   userPromoCodeRedemption       UserPromoCodeRedemption[]
@@ -994,7 +997,7 @@ model AssociatedService {
   @@unique([ownerEmail, serviceId])
 }
 
-enum ServiceCancelationPolicy {
+enum ServiceCancellationPolicy {
   None
   VeryFlexible
   Flexible
@@ -1126,7 +1129,7 @@ model Service {
   emergencyContact     String?
   contactDetails       String?
   // rates                Rate[]  @relation("MultipleRates")
-  cancellationPolicy   ServiceCancelationPolicy? @default(None)
+  cancellationPolicy   ServiceCancellationPolicy? @default(None)
   // refundPolicy         String?
   // insurancePolicy      String?
   // hoursOfOperation  Json? @default("{}")

package/src/extendedSchemas.ts

@@ -516,11 +516,12 @@ export const VENUE_DATA_TO_REMOVE: RemoveCommonProperties<
 //-----------------------------------------
 
 export interface BashNotificationExt extends BashNotification {
-  creator?: PublicUser;
   bashEvent?: BashEvent;
+  creator?: PublicUser;
+  eventTask?: EventTask;
+  userAction?: string;
   service?: ServiceExt;
   serviceBooking?: ServiceBookingExt;
-  eventTask?: EventTask;
   invitation?: Invitation;
   reminders?: Reminder[];
 }

package/src/utils/service/serviceUtils.ts

@@ -1,33 +1,33 @@
 import {
-  ServiceCancelationPolicy as ServiceCancelationPolicyOption,
+  ServiceCancellationPolicy as ServiceCancellationPolicyOption,
   ServiceSubscriptionStatus,
   ServiceTypes,
 } from "@prisma/client";
 import { ServiceExt } from "../../extendedSchemas";
 
-export type ServiceCancelationRefundPolicy = {
+export type ServiceCancellationRefundPolicy = {
   days?: number;
   hours?: number;
   refundPercentage: number;
 };
 
-export type ServiceCancelationPolicyData = {
+export type ServiceCancellationPolicyData = {
   name: string;
   description?: string;
-  refundPolicy: ServiceCancelationRefundPolicy[];
+  refundPolicy: ServiceCancellationRefundPolicy[];
 };
 
-export type ServiceCancelationPolicyMap = {
-  [key in ServiceCancelationPolicyOption]: ServiceCancelationPolicyData;
+export type ServiceCancellationPolicyMap = {
+  [key in ServiceCancellationPolicyOption]: ServiceCancellationPolicyData;
 };
 
-export const SERVICE_CANCELATION_POLICY_DATA: ServiceCancelationPolicyMap = {
-  [ServiceCancelationPolicyOption.None]: {
+export const SERVICE_CANCELLATION_POLICY_DATA: ServiceCancellationPolicyMap = {
+  [ServiceCancellationPolicyOption.None]: {
     name: "None",
     refundPolicy: [],
     description: "No cancellation policy.",
   },
-  [ServiceCancelationPolicyOption.VeryFlexible]: {
+  [ServiceCancellationPolicyOption.VeryFlexible]: {
     name: "Very Flexible",
     refundPolicy: [
       {
@@ -36,7 +36,7 @@ export const SERVICE_CANCELATION_POLICY_DATA: ServiceCancelationPolicyMap = {
       },
     ],
   },
-  [ServiceCancelationPolicyOption.Flexible]: {
+  [ServiceCancellationPolicyOption.Flexible]: {
     name: "Flexible",
     refundPolicy: [
       {
@@ -49,7 +49,7 @@ export const SERVICE_CANCELATION_POLICY_DATA: ServiceCancelationPolicyMap = {
       },
     ],
   },
-  [ServiceCancelationPolicyOption.Standard30Day]: {
+  [ServiceCancellationPolicyOption.Standard30Day]: {
     name: "Standard 30 Day",
     refundPolicy: [
       {
@@ -62,7 +62,7 @@ export const SERVICE_CANCELATION_POLICY_DATA: ServiceCancelationPolicyMap = {
       },
     ],
   },
-  [ServiceCancelationPolicyOption.Standard90Day]: {
+  [ServiceCancellationPolicyOption.Standard90Day]: {
     name: "Very Flexible",
     refundPolicy: [
       {
@@ -78,7 +78,7 @@ export const SERVICE_CANCELATION_POLICY_DATA: ServiceCancelationPolicyMap = {
 } as const;
 
 function generateDescription(
-  refundPolicy: ServiceCancelationRefundPolicy[]
+  refundPolicy: ServiceCancellationRefundPolicy[]
 ): string {
   const descriptions = refundPolicy.map((policy, index) => {
     const unit = policy.days ? "days" : "hours";
@@ -110,16 +110,16 @@ function generateDescription(
   return descriptions.join(" ");
 }
 
-Object.keys(SERVICE_CANCELATION_POLICY_DATA)
+Object.keys(SERVICE_CANCELLATION_POLICY_DATA)
   .filter(
     (policyKey) =>
-      (policyKey as ServiceCancelationPolicyOption) !=
-      ServiceCancelationPolicyOption.None
+      (policyKey as ServiceCancellationPolicyOption) !=
+      ServiceCancellationPolicyOption.None
   )
   .forEach((policyKey) => {
     const policy =
-      SERVICE_CANCELATION_POLICY_DATA[
-        policyKey as ServiceCancelationPolicyOption
+      SERVICE_CANCELLATION_POLICY_DATA[
+        policyKey as ServiceCancellationPolicyOption
       ];
     policy.description = generateDescription(policy.refundPolicy);
   });