@bash-app/bash-common 29.19.35 → 29.20.1

package/package.json

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

package/prisma/schema.prisma

@@ -1361,27 +1361,34 @@ model ServiceRate {
   rateType                ServiceRateType?
   hourlyRate              Int?
   dailyRate               Int?
-  serviceSpecialRates     ServiceSpecialRates?
   serviceDailyRates       ServiceDailyRates?
-  serviceRatesAssociation ServiceRatesAssociation?
+  serviceHourlyRates ServiceHourlyRates?
 
   @@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
+  id                    String   @id @default(cuid())
+  startDate             DateTime @db.Date
+  endDate               DateTime @db.Date
 
-  serviceRateId String?
-  serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
-  isAvailable   Boolean
+  specialHourlyRateId    String?
+  specialHourlyRate      ServiceRate? @relation("SpecialHourlyRate", fields: [specialHourlyRateId], references: [id], onDelete: Cascade)
 
-  serviceRatesAssociation ServiceRatesAssociation?
+  specialDailyRateId     String?
+  specialDailyRate       ServiceRate? @relation("SpecialDailyRate", fields: [specialDailyRateId], references: [id], onDelete: Cascade)
 
-  @@unique([serviceRateId])
+  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)
@@ -1400,6 +1407,21 @@ model ServiceDailyRates {
   @@unique([serviceRateId])
 }
 
+model ServiceHourlyRates {
+  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)
+
+  serviceRatesAssociation ServiceRatesAssociation?
+
+  @@unique([serviceRateId])
+}
+
 model ServiceRatesAssociation {
   id String @id @default(cuid())
 
@@ -1408,23 +1430,19 @@ model ServiceRatesAssociation {
   volunteerServiceId String?
   volunteerService   VolunteerService? @relation(fields: [volunteerServiceId], references: [id], onDelete: Cascade)
 
-  serviceGeneralRatesId String?
-  serviceGeneralRates   ServiceRate? @relation(fields: [serviceGeneralRatesId], references: [id], onDelete: Cascade)
+  serviceHourlyRatesId String?
+  serviceHourlyRates   ServiceHourlyRates? @relation(fields: [serviceHourlyRatesId], 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([serviceGeneralRatesId])
+  @@unique([serviceHourlyRatesId])
   @@unique([serviceDailyRatesId])
-  @@unique([serviceSpecialRatesId])
 }
 
 enum VisibilityPreference {

package/src/extendedSchemas.ts

@@ -33,6 +33,7 @@ import {
   ServiceRatesAssociation,
   ServiceRate,
   ServiceDailyRates,
+  ServiceHourlyRates,
   ServiceSpecialRates,
   ServiceAddon,
   ServicePackage,
@@ -181,27 +182,27 @@ 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 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 interface BashNotificationExt extends BashNotification {
   creator?: PublicUser;
@@ -305,7 +306,8 @@ export interface ServiceSpecialRatesExt extends ServiceSpecialRates {
 }
 
 export interface ServiceRatesAssociationExt extends ServiceRatesAssociation {
-  serviceGeneralRates?: ServiceRate;
+  // serviceGeneralRates?: ServiceRate;
+  serviceHourlyRates?: ServiceHourlyRates;
   serviceDailyRates?: ServiceDailyRates;
   serviceSpecialRates?: ServiceSpecialRates;