@bash-app/bash-common 29.21.22 → 29.21.24

package/package.json

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

package/prisma/schema.prisma

@@ -726,6 +726,8 @@ model Media {
   serviceReferencingMe         Service[]
   volunteerService             VolunteerService? @relation(fields: [volunteerServiceId], references: [id])
   volunteerServiceId           String?
+
+  stripeAccount StripeAccount[]
 }
 
 enum MediaType {
@@ -934,7 +936,7 @@ model AssociatedService {
 model Service {
   id String @id @default(cuid())
 
-  serviceType      ServiceTypes
+  serviceType      ServiceTypes?
   serviceStatus    ServiceStatus    @default(Draft)
   serviceCondition ServiceCondition @default(Pending)
 
@@ -947,7 +949,7 @@ model Service {
   creator   User?   @relation("CreatedService", fields: [creatorId], references: [id])
 
   createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  updatedAt DateTime? @updatedAt
 
   associatedBashesReferencingMe   AssociatedBash[]
   associatedServicesReferencingMe AssociatedService[]
@@ -1018,10 +1020,13 @@ model StripeAccount {
   id String @id @default(cuid())
 
   ownerId String
-  owner   User   @relation(fields: [ownerId], references: [id])
+  owner   User   @relation(fields: [ownerId], references: [id], onDelete: Restrict)
 
   stripeAccountId String
 
+logoId String? 
+  logo Media?  @relation(fields: [logoId], references: [id], onDelete: SetNull)
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 

package/src/definitions.ts

@@ -15,7 +15,7 @@ import {
 import { ServiceExt, CheckoutExt, PublicUser, VolunteerServiceExt, BashEventExt} from "./extendedSchemas";
 
 export const PASSWORD_MIN_LENGTH = 10 as const;
-export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{${PASSWORD_MIN_LENGTH},}$`);
+export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&^#])[A-Za-z\d@$!%*?&^#]{${PASSWORD_MIN_LENGTH},}$`);
 export const BASH_FEE_PERCENTAGE = 0.10;
 export const GOOGLE_CALLBACK_URL = '/auth/google/callback' as const;
 export const CHECKOUT_RETURN_SUCCESS_URL = `/checkout-return/success/{CHECKOUT_SESSION_ID}` as const;
@@ -79,7 +79,7 @@ export const PRISMA_USER_TTL_SECONDS = 60 * 7; // 7 hours
 export const PRISMA_BASH_EVENT_TTL_SECONDS = 60 as const;
 export const PRISMA_SERVICE_TTL_SECONDS = 60 as const;
 
-export const MIN_PASSWORD_LENGTH = 10 as const;
+export const MIN_PASSWORD_LENGTH = 8 as const;
 
 export const DEBOUNCE_WAIT = 1000 as const;
 
@@ -229,6 +229,16 @@ export interface SignInEmailWithPassword {
   password: string;
 }
 
+export interface ForgotPassword {
+  email: string;
+}
+
+export interface ResetPassword {
+  email: string;
+  password: string;
+  otp: string;
+}
+
 export interface ApiResult<T, P extends ErrorDataType = ErrorDataType> {
   data?: T;
   status?: number;
@@ -307,7 +317,7 @@ export type StripeLinkingStatus = {
 };
 
 export type StripeBusinessDataPublic = {
-  logo?: string; //not possible to fetch logo directly from stripe
+  logoUrl?: string; //not possible to fetch logo directly from stripe
   businessName?: string;
   businessNameDBA?: string;
   supportEmail?: string;

package/src/extendedSchemas.ts

@@ -35,6 +35,7 @@ import {
   ServiceDailyRates,
   ServiceSpecialRates,
   ServiceAddon,
+  ServicePackage,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
 
@@ -176,6 +177,32 @@ export const SERVICE_FULL_DATA_TO_INCLUDE = {
   ...createAllTrueObject(serviceKeysArray)
 } satisfies Prisma.ServiceInclude;
 
+export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
+  serviceAddons: true
+} satisfies Prisma.ServicePackageInclude;
+
+export const SERVICE_DAILYRATES_DATA_TO_INCLUDE = {
+  serviceRate: true
+} satisfies Prisma.ServiceDailyRatesInclude;
+
+export const SERVICE_SPECIALRATES_DATA_TO_INCLUDE = {
+  serviceRate: true
+} satisfies Prisma.ServiceSpecialRatesInclude;
+
+export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
+  serviceGeneralRates: true,
+  serviceDailyRates: {
+    include: SERVICE_DAILYRATES_DATA_TO_INCLUDE
+  },
+  serviceSpecialRates: {
+    include: SERVICE_SPECIALRATES_DATA_TO_INCLUDE
+  },
+  addons: true,
+  packages:  {
+    include: SERVICE_PACKAGE_DATA_TO_INCLUDE
+  },
+} satisfies Prisma.ServiceRatesAssociationInclude;
+
 export interface BashNotificationExt extends BashNotification {
   creator?: PublicUser;
   bashEvent?: BashEvent;
@@ -230,6 +257,16 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
   }
 } satisfies Prisma.EventTaskInclude;
 
+
+//------------Stripe Accounts--------------
+export const STRIPE_ACCOUNT_DATA_TO_INCLUDE = {
+  logo: true
+} satisfies Prisma.StripeAccountInclude;
+
+export interface StripeAccountExt extends StripeAccount {
+  logo?: Media | null;
+}
+
 //---------------Services------------------
 export interface ServiceExt extends Service {
   owner?: PublicUser | null;
@@ -252,18 +289,18 @@ export interface ServiceExt extends Service {
   venue?: Venue;
   organization?: Organization;
 
-  serviceRatesAssociation?: ServiceRatesAssociationExt;
+  serviceRatesAssociation?: ServiceRatesAssociationExt | null;
 
   // googleReviews: GoogleReview[];
 }
-export interface ServicePackageExt extends ServiceDailyRates {
-  serviceAddons: ServiceAddon[]
+export interface ServicePackageExt extends ServicePackage {
+  serviceAddons: ServiceAddon[];
 }
 
 export interface ServiceDailyRatesExt extends ServiceDailyRates {
   serviceRate?: ServiceRate;
 }
-export interface ServiceSpecialRatesExt extends ServiceRatesAssociation {
+export interface ServiceSpecialRatesExt extends ServiceSpecialRates {
   serviceRate?: ServiceRate;
 }
 
@@ -271,9 +308,9 @@ export interface ServiceRatesAssociationExt extends ServiceRatesAssociation {
   serviceGeneralRates?: ServiceRate;
   serviceDailyRates?: ServiceDailyRates;
   serviceSpecialRates?: ServiceSpecialRates;
-  
-  packages?: ServicePackageExt;
+
   addons: ServiceAddon[];
+  packages: ServicePackageExt[];
 }