@bash-app/bash-common 1.9.0 → 1.9.2

package/package.json

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

package/src/definitions.ts

@@ -47,7 +47,7 @@ export const URL_PARAMS_LINKED_IN_CODE = 'code' as const;
 export const URL_PARAMS_STATE = 'state' as const;
 
 export const URL_PARAMS_TICKET_LIST_DELIM = ',' as const;
-export const URL_PARAMS_TICKET_ID_NUMBER_OF_TICKETS_DATE_DELIM = '__' as const
+export const URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM = '__' as const
 export const URL_PARAMS_NUMBER_OF_TICKETS_TICKETS_DATE_DELIM = '~~' as const
 export const URL_PARAMS_TICKETS_DATE_DELIM = ';;' as const
 
@@ -142,7 +142,8 @@ export enum ApiErrorType {
   StripeUserInfoIncomplete,
   TicketsAlreadyPurchasedUsingThisCheckoutSession,
   StripeAccountHasNotSetupTaxData,
-  StripeCheckoutSessionIncomplete
+  StripeCheckoutSessionIncomplete,
+  CouldNotSendEmail
 }
 
 export type ErrorDataType = Record<RecordKey, any>;

package/src/extendedSchemas.ts

@@ -7,7 +7,8 @@ import {
   TargetAudience,
   Ticket,
   User,
-  TicketTier, Service, Review, Media, BashComment, Recurrence, Contact
+  TicketTier, Service, Review, Media, BashComment, Recurrence, Contact,
+  BashNotification
 } from "@prisma/client";
 import {RecordKey} from "./definitions";
 
@@ -27,6 +28,31 @@ export interface BashEventExt extends BashEvent {
   invitations: InvitationExt[];
 }
 
+export interface BashNotificationsExt extends BashNotification {
+  creator?: {
+    id: string;
+    name: string;
+    image?: string;
+  };
+  bashEvent?: {
+    id: string;
+    name: string;
+    coverPhoto?: string;
+  };
+  eventTask?: {
+    id: string;
+    title: string;
+  };
+  invitation?: {
+    id: string;
+    eventName: string;
+  };
+  reminders?: Array<{
+    id: string;
+    reminderText: string;
+  }>;
+}
+
 export const BASH_EVENT_DATA_TO_INCLUDE = {
   targetAudience: true,
   amountOfGuests: true,

package/src/utils/ticketListUtils.ts

@@ -2,7 +2,7 @@ import dayjs from "dayjs";
 import {
   NumberOfTicketsForDate,
   URL_PARAMS_NUMBER_OF_TICKETS_TICKETS_DATE_DELIM,
-  URL_PARAMS_TICKET_ID_NUMBER_OF_TICKETS_DATE_DELIM,
+  URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM,
   URL_PARAMS_TICKET_LIST_DELIM,
   URL_PARAMS_TICKETS_DATE_DELIM
 } from "../definitions";
@@ -17,7 +17,7 @@ export function ticketListToString(ticketList: Map<string, NumberOfTicketsForDat
   const ticketListArr: string[] = [];
 
   for (const [ticketTierId, ticketListArgs] of ticketList.entries()) {
-    const ticketArgs: string[] = [`${ticketTierId}${URL_PARAMS_TICKET_ID_NUMBER_OF_TICKETS_DATE_DELIM}`];
+    const ticketArgs: string[] = [`${ticketTierId}${URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM}`];
     for (const ticketNumAndDates of ticketListArgs) {
       if (ticketNumAndDates.numberOfTickets > 0) {
         ticketArgs.push(
@@ -36,34 +36,33 @@ export function ticketListToString(ticketList: Map<string, NumberOfTicketsForDat
 export function ticketListStrToTicketList(ticketListStr: string): Map<string, NumberOfTicketsForDate[]> {
   const ticketList: Map<string, NumberOfTicketsForDate[]> = new Map();
 
-  // [ticketTierId]__[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...,...
+  // [ticketTierId]__~~[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...,...
   const ticketListArgs = ticketListStr.split(URL_PARAMS_TICKET_LIST_DELIM);
 
   ticketListArgs.forEach((tierIdAndTicketNumbersAndDates: string): void => {
     const ticketNumAndDatesArr: NumberOfTicketsForDate[] = [];
-    // [ticketTierId]__[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...
-    const [ticketTierId, ticketNumAndDatesStr] = tierIdAndTicketNumbersAndDates.split(URL_PARAMS_TICKET_ID_NUMBER_OF_TICKETS_DATE_DELIM);
+    // [ticketTierId]__~~[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...
+    const [ticketTierId, ticketNumAndDatesStr] = tierIdAndTicketNumbersAndDates.split(URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM);
     if (!ticketNumAndDatesArr) {
       throw new Error(`Could not parse ticketListStr. Maybe it is just an amount?`);
     }
-    // [numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...
+    // ~~[numberOfTickets];;[date]~~[numberOfTickets];;[date]~~...
     const ticketNumAndDates = ticketNumAndDatesStr.split(URL_PARAMS_NUMBER_OF_TICKETS_TICKETS_DATE_DELIM)
                                                   .filter((ticketNumAndDateStr): boolean => !!ticketNumAndDateStr);
 
     for (const ticketNumAndDateStr of ticketNumAndDates) {
       // [numberOfTickets];;[date]
       const [numberOfTickets, ticketDateTimeStr] = ticketNumAndDateStr.split(URL_PARAMS_TICKETS_DATE_DELIM);
-      let ticketDateTime: string | undefined;
-      if (!ticketDateTimeStr) {
-        ticketDateTime = undefined;
-      }
-      else {
-        ticketDateTime = dayjs(ticketDateTimeStr).format(DATETIME_FORMAT_ISO_LIKE);
+      const ticketDateTime = dayjs(ticketDateTimeStr);
+      let ticketDateTimeFormattedStr: string | undefined = undefined;
+
+      if (ticketDateTime.isValid()) {
+        ticketDateTimeFormattedStr = ticketDateTime.format(DATETIME_FORMAT_ISO_LIKE);
       }
 
       ticketNumAndDatesArr.push({
         numberOfTickets: parseInt(numberOfTickets),
-        ticketDateTime: ticketDateTime,
+        ticketDateTime: ticketDateTimeFormattedStr,
       });
     }
     ticketList.set(ticketTierId, ticketNumAndDatesArr);