@bash-app/bash-common 29.20.1 → 29.20.2

package/package.json

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

package/prisma/schema.prisma

@@ -1332,10 +1332,10 @@ enum ServiceRateType {
 //can optionally be associated with a package
 model ServiceAddon {
   id          String @id @default(cuid())
-  name        String?
-  description String?
+  name        String
+  description String
   price       Int?
-  quantity    Int?
+  quantity    Int
 
   servicePackage   ServicePackage? @relation(fields: [servicePackageId], references: [id], onDelete: Cascade)
   servicePackageId String?
@@ -1358,61 +1358,39 @@ model ServicePackage {
 
 model ServiceRate {
   id                      String                   @id @default(cuid())
-  rateType                ServiceRateType?
+  rateType                ServiceRateType
   hourlyRate              Int?
   dailyRate               Int?
+  serviceSpecialRates     ServiceSpecialRates?
   serviceDailyRates       ServiceDailyRates?
-  serviceHourlyRates ServiceHourlyRates?
+  serviceRatesAssociation ServiceRatesAssociation?
 
   @@index([rateType])
-  serviceSpecialDailyRates ServiceSpecialRates[] @relation("SpecialDailyRate")
-  serviceSpecialHourlyRates ServiceSpecialRates[] @relation("SpecialHourlyRate")
 }
 
 model ServiceSpecialRates {
-  id                    String   @id @default(cuid())
-  startDate             DateTime @db.Date
-  endDate               DateTime @db.Date
-
-  specialHourlyRateId    String?
-  specialHourlyRate      ServiceRate? @relation("SpecialHourlyRate", fields: [specialHourlyRateId], references: [id], onDelete: Cascade)
-
-  specialDailyRateId     String?
-  specialDailyRate       ServiceRate? @relation("SpecialDailyRate", fields: [specialDailyRateId], references: [id], onDelete: Cascade)
-
-  isAvailable            Boolean
-
-  serviceRatesAssociationId String?
-
-  @@unique([specialHourlyRateId])
-  @@unique([specialDailyRateId])
-}
-
-
-// different days of the week have different rates
-// can block of certain dates of the year and days of the week as being closed
-// 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
+  startDate DateTime @db.Date
+  endDate   DateTime @db.Date
 
   serviceRateId String?
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
+  isAvailable   Boolean
 
   serviceRatesAssociation ServiceRatesAssociation?
 
   @@unique([serviceRateId])
 }
 
-model ServiceHourlyRates {
+// different days of the week have different rates
+// can block of certain dates of the year and days of the week as being closed
+// 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
-  numberOfHours Int?
 
   serviceRateId String?
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
@@ -1430,19 +1408,23 @@ model ServiceRatesAssociation {
   volunteerServiceId String?
   volunteerService   VolunteerService? @relation(fields: [volunteerServiceId], references: [id], onDelete: Cascade)
 
-  serviceHourlyRatesId String?
-  serviceHourlyRates   ServiceHourlyRates? @relation(fields: [serviceHourlyRatesId], references: [id], onDelete: Cascade)
+  serviceGeneralRatesId String?
+  serviceGeneralRates   ServiceRate? @relation(fields: [serviceGeneralRatesId], references: [id], onDelete: Cascade)
 
   serviceDailyRatesId String?
   serviceDailyRates   ServiceDailyRates? @relation(fields: [serviceDailyRatesId], references: [id], onDelete: Cascade)
 
+  serviceSpecialRatesId String?
+  serviceSpecialRates   ServiceSpecialRates? @relation(fields: [serviceSpecialRatesId], references: [id], onDelete: Cascade)
+
   addons   ServiceAddon[]
   packages ServicePackage[]
 
   @@unique([serviceId])
   @@unique([volunteerServiceId])
-  @@unique([serviceHourlyRatesId])
+  @@unique([serviceGeneralRatesId])
   @@unique([serviceDailyRatesId])
+  @@unique([serviceSpecialRatesId])
 }
 
 enum VisibilityPreference {

package/src/definitions.ts

@@ -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;

package/src/extendedSchemas.ts

@@ -33,7 +33,6 @@ import {
   ServiceRatesAssociation,
   ServiceRate,
   ServiceDailyRates,
-  ServiceHourlyRates,
   ServiceSpecialRates,
   ServiceAddon,
   ServicePackage,
@@ -182,27 +181,27 @@ export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
   serviceAddons: true
 } satisfies Prisma.ServicePackageInclude;
 
-// export const SERVICE_DAILYRATES_DATA_TO_INCLUDE = {
-//   serviceDailyRate: true
-// } satisfies Prisma.ServiceDailyRatesInclude;
-
-// export const SERVICE_SPECIALHOURLYRATES_DATA_TO_INCLUDE = {
-//   serviceHourlyRate: 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 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;
@@ -306,8 +305,7 @@ export interface ServiceSpecialRatesExt extends ServiceSpecialRates {
 }
 
 export interface ServiceRatesAssociationExt extends ServiceRatesAssociation {
-  // serviceGeneralRates?: ServiceRate;
-  serviceHourlyRates?: ServiceHourlyRates;
+  serviceGeneralRates?: ServiceRate;
   serviceDailyRates?: ServiceDailyRates;
   serviceSpecialRates?: ServiceSpecialRates;