@bash-app/bash-common 29.64.0 → 29.65.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.64.0",
+  "version": "29.65.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",
@@ -40,6 +40,7 @@
     "@types/shelljs": "^0.8.15",
     "jest": "^29.7.0",
     "shelljs": "^0.8.5",
+    "stripe": "^16.12.0",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.6.2",

package/prisma/schema.prisma

@@ -191,8 +191,7 @@ model BashEvent {
   title                           String
   creatorId                       String
   creator                         User                      @relation("CreatedEvent", fields: [creatorId], references: [id], onDelete: Cascade)
-  createdAt                       DateTime                  @default(now())
-  isApproved                      Boolean?                  @default(false)
+  isApproved                      Boolean?
   description                     String?
   eventType                       String                    @default("Other")
   startDateTime                   DateTime?                 @default(now())
@@ -245,6 +244,7 @@ model BashEvent {
   venue                           Venue?                    @relation(fields: [venueId], references: [id])
   userPromoCodeRedemption         UserPromoCodeRedemption[]
   averageRating                   Float?                    @default(0)
+  createdAt                       DateTime                  @default(now()) // Timestamp for when the review was created
 }
 
 model Coordinates {
@@ -614,9 +614,9 @@ enum Education {
 
 enum BashStatus {
   Draft
-  Pending
   PreSale
   Published
+  Pending
   Finished
 }
 
@@ -630,6 +630,7 @@ enum ServiceCondition {
   Published
   Suspended
   Deactivated
+  Unpublished
 }
 
 enum ServiceSubscriptionStatus {

package/src/definitions.ts

@@ -21,6 +21,7 @@ import {
   BashEventExt,
 } from "./extendedSchemas";
 import { ServiceSubscriptionTier } from "./utils/userSubscriptionUtils";
+import Stripe from "stripe";
 
 export const PASSWORD_MIN_LENGTH = 8 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(
@@ -113,6 +114,14 @@ export const URL_PARAMS_SETUP_PAYMENT_OPTIONS = {
 export type UrlParamsSetupPayment =
   (typeof URL_PARAMS_SETUP_PAYMENT_OPTIONS)[keyof typeof URL_PARAMS_SETUP_PAYMENT_OPTIONS];
 
+export const URL_PARAMS_SETUP_STAGE = "setupStage" as const;
+export const URL_PARAMS_SETUP_STAGE_OPTIONS = {
+  paymentMethod: "payment-method",
+  complete: "complete",
+} as const;
+export type UrlParamsSetupStage =
+  (typeof URL_PARAMS_SETUP_STAGE_OPTIONS)[keyof typeof URL_PARAMS_SETUP_STAGE_OPTIONS];
+
 export const URL_PARAMS_TICKET_LIST_DELIM = "," as const;
 export const URL_PARAMS_TICKET_TIER_ID_NUMBER_OF_TICKETS_DATE_DELIM =
   "__" as const;
@@ -349,6 +358,7 @@ export interface StripePaymentMethod {
   expMonth: number;
   expYear: number;
   country: string;
+  brand: string;
 }
 
 export interface StripeCreateBashEventTicketsCheckoutSessionArgs {
@@ -372,6 +382,18 @@ export interface StripeCreateSetupPaymentMethodSessionArgs {
   cancelUrl: string;
 }
 
+export interface StripeSetDefaultPaymentMethodArgs {
+  paymentMethodId: string;
+}
+
+export interface StripeAddPaymentMethodArgs {
+  paymentMethodId: string;
+}
+
+export interface StripeDeletePaymentMethodArgs {
+  paymentMethodId: string;
+}
+
 export interface StripeCreateAccountPortalSessionArgs {
   stripeAccountId: string;
   returnUrl: string;
@@ -435,10 +457,12 @@ export type StripeBusinessDataOwned = {
   stripeAccountDBId: string;
 
   bankAccount?: string;
-  linkingStatus: StripeLinkingStatus;
+  linkingStatus?: StripeLinkingStatus;
 
   createdDate: string;
   updatedDate: string;
+
+  paymentMethods: StripePaymentMethod[];
 } & StripeBusinessDataPublic;
 
 export interface StripeConfirmPayment {

package/src/utils/luxonUtils.ts

@@ -0,0 +1,86 @@
+// import { DayOfWeek } from "@prisma/client";
+// import { DateTime, Interval } from "luxon";
+// import { DayOfWeekIdx, DayOfWeekToIdx } from "../definitions";
+
+// export function dayOfWeekToIdx(dayOfWeek: DayOfWeek | DayOfWeekIdx): number {
+//   if (typeof dayOfWeek === "number") {
+//     return dayOfWeek;
+//   } else if (typeof dayOfWeek === "string") {
+//     return DayOfWeekToIdx[dayOfWeek];
+//   } else {
+//     throw new Error(`dayOfWeekToIdx: unhandled case`);
+//   }
+// }
+
+// export function dateTimeFromDayTime(
+//   dayOfWeek: DayOfWeek | DayOfWeekIdx,
+//   hour: number = 0,
+//   minute: number = 0
+// ): DateTime {
+//   //use date where first day of month is a known sunday
+//   return DateTime.fromObject({
+//     year: 2020,
+//     month: 1,
+//     day: dayOfWeekToIdx(dayOfWeek),
+//     hour: hour,
+//     minute: minute,
+//   });
+// }
+
+// export type DateTimeTime = Pick<DateTime, "hour" | "minute">;
+// export type DateTimeDate = Pick<DateTime, "year" | "month" | "day">;
+
+// export function dateTimeToTimeComponents(dateTime: DateTime): DateTimeTime {
+//   return {
+//     hour: dateTime.hour,
+//     minute: dateTime.minute,
+//   };
+// }
+
+// export function dateTimeToDateComponents(dateTime: DateTime): DateTimeDate {
+//   return {
+//     year: dateTime.year,
+//     month: dateTime.month,
+//     day: dateTime.day,
+//   };
+// }
+
+// export function objectHasDate(obj: object) {
+//   return "year" in obj;
+// }
+
+// export function objectHasTime(obj: object) {
+//   return "hour" in obj;
+// }
+
+// export function dateTimeSetTime(
+//   dateTime: DateTime,
+//   time: DateTimeTime | DateTime = { hour: 0, minute: 0 }
+// ): DateTime {
+//   const timeComp = objectHasTime(time)
+//     ? dateTimeToTimeComponents(time as DateTime)
+//     : time;
+//   return dateTime.set(timeComp);
+// }
+
+// export function dateTimeSetDate(
+//   dateTime: DateTime,
+//   date: DateTimeDate | DateTime = { year: 2020, month: 1, day: 1 }
+// ): DateTime {
+//   const dateComp = objectHasDate(date)
+//     ? dateTimeToTimeComponents(date as DateTime)
+//     : date;
+//   return dateTime.set(dateComp);
+// }
+
+// export function dateTimeLocalFromUTCDate(date: Date) {
+//   return DateTime.fromJSDate(date).toLocal();
+// }
+
+// export function dateTimeLocalToUTCDate(dateTime: DateTime) {
+//   return dateTime.toUTC().toJSDate();
+// }
+
+// export function dateTimeFormatTime(dateTime: DateTime) {
+//   return dateTime.toFormat("HH:MM");
+// }

package/src/utils/service/serviceUtils.ts

@@ -125,7 +125,12 @@ Object.keys(SERVICE_CANCELATION_POLICY_DATA)
 export function serviceSubscriptionIsActive(
   status: ServiceSubscriptionStatus
 ): boolean {
-  return status in ["Trialing", "Normal"];
+  return (
+    [
+      ServiceSubscriptionStatus.Normal,
+      ServiceSubscriptionStatus.Trialing,
+    ] as ServiceSubscriptionStatus[]
+  ).includes(status);
 }
 
 export function serviceDetailUrl(

package/src/utils/stripeAccountUtils.ts

@@ -1,11 +1,13 @@
 import { StripeLinkingStatus } from "../definitions";
 import { isProduction } from "./apiUtils";
 
-export const stripeAccountFullyLinked = (linkingStatus: StripeLinkingStatus): boolean => {
-    return (
-      !linkingStatus.hasOutstandingRequirements &&
-      linkingStatus.isOnboarded &&
-      linkingStatus.paymentsEnabled &&
-      (!isProduction() || linkingStatus.taxMonitoringEnabled)
-    );
-}
+export const stripeAccountFullyLinked = (
+  linkingStatus: StripeLinkingStatus
+): boolean => {
+  return (
+    !linkingStatus.hasOutstandingRequirements &&
+    linkingStatus.isOnboarded &&
+    linkingStatus.paymentsEnabled &&
+    (!isProduction() || linkingStatus.taxMonitoringEnabled)
+  );
+};

package/src/utils/typeUtils.ts

@@ -0,0 +1 @@
+export type ValueOf<T> = T[keyof T];