@bash-app/bash-common 29.20.5 → 29.20.22

package/package.json

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

package/prisma/schema.prisma

@@ -726,8 +726,6 @@ model Media {
   serviceReferencingMe         Service[]
   volunteerService             VolunteerService? @relation(fields: [volunteerServiceId], references: [id])
   volunteerServiceId           String?
-
-  stripeAccount StripeAccount[]
 }
 
 enum MediaType {
@@ -936,7 +934,7 @@ model AssociatedService {
 model Service {
   id String @id @default(cuid())
 
-  serviceType      ServiceTypes?
+  serviceType      ServiceTypes
   serviceStatus    ServiceStatus    @default(Draft)
   serviceCondition ServiceCondition @default(Pending)
 
@@ -949,7 +947,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[]
@@ -1020,13 +1018,10 @@ model StripeAccount {
   id String @id @default(cuid())
 
   ownerId String
-  owner   User   @relation(fields: [ownerId], references: [id], onDelete: Restrict)
+  owner   User   @relation(fields: [ownerId], references: [id])
 
   stripeAccountId String
 
-logoId String? 
-  logo Media?  @relation(fields: [logoId], references: [id], onDelete: SetNull)
-
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
@@ -1387,10 +1382,10 @@ model ServiceSpecialRates {
 // can have special rates on different days of the year (single or range)
 // free trial period with promo code (1 or 2 months of listing for free)
 model ServiceDailyRates {
-  id        String   @id @default(cuid())
-  dayOfWeek Int
-  startTime DateTime @db.Time
-  endTime   DateTime @db.Time
+  id            String   @id @default(cuid())
+  dayOfWeek     Int
+  startDateTime DateTime @db.Time
+  endDateTime   DateTime @db.Time
 
   serviceRateId String?
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)

package/src/definitions.ts

@@ -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 = 8 as const;
+export const MIN_PASSWORD_LENGTH = 10 as const;
 
 export const DEBOUNCE_WAIT = 1000 as const;
 
@@ -229,16 +229,6 @@ 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;
@@ -317,7 +307,7 @@ export type StripeLinkingStatus = {
 };
 
 export type StripeBusinessDataPublic = {
-  logoUrl?: string; //not possible to fetch logo directly from stripe
+  logo?: string; //not possible to fetch logo directly from stripe
   businessName?: string;
   businessNameDBA?: string;
   supportEmail?: string;

package/src/extendedSchemas.ts

@@ -35,7 +35,6 @@ import {
   ServiceDailyRates,
   ServiceSpecialRates,
   ServiceAddon,
-  ServicePackage,
 } from "@prisma/client";
 import { SERVICE_LINK_DATA_TO_INCLUDE, UnionFromArray } from "./definitions";
 
@@ -177,32 +176,6 @@ 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;
@@ -257,16 +230,6 @@ 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;
@@ -289,18 +252,16 @@ export interface ServiceExt extends Service {
   venue?: Venue;
   organization?: Organization;
 
-  serviceRatesAssociation?: ServiceRatesAssociationExt | null;
-
   // googleReviews: GoogleReview[];
 }
-export interface ServicePackageExt extends ServicePackage {
-  serviceAddons: ServiceAddon[];
+export interface ServicePackageExt extends ServiceDailyRates {
+  serviceAddons: ServiceAddon[]
 }
 
 export interface ServiceDailyRatesExt extends ServiceDailyRates {
   serviceRate?: ServiceRate;
 }
-export interface ServiceSpecialRatesExt extends ServiceSpecialRates {
+export interface ServiceSpecialRatesExt extends ServiceRatesAssociation {
   serviceRate?: ServiceRate;
 }
 
@@ -308,9 +269,6 @@ export interface ServiceRatesAssociationExt extends ServiceRatesAssociation {
   serviceGeneralRates?: ServiceRate;
   serviceDailyRates?: ServiceDailyRates;
   serviceSpecialRates?: ServiceSpecialRates;
-
-  addons: ServiceAddon[];
-  packages: ServicePackageExt[];
 }