@bash-app/bash-common 29.21.26 → 29.22.1

package/package.json

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

package/prisma/schema.prisma

@@ -948,7 +948,7 @@ model Service {
   creatorId String?
   creator   User?   @relation("CreatedService", fields: [creatorId], references: [id])
 
-  createdAt DateTime @default(now())
+  createdAt DateTime  @default(now())
   updatedAt DateTime? @updatedAt
 
   associatedBashesReferencingMe   AssociatedBash[]
@@ -1024,8 +1024,8 @@ model StripeAccount {
 
   stripeAccountId String
 
-logoId String? 
-  logo Media?  @relation(fields: [logoId], references: [id], onDelete: SetNull)
+  logoId String?
+  logo   Media?  @relation(fields: [logoId], references: [id], onDelete: SetNull)
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -1368,6 +1368,7 @@ model ServiceRate {
   @@index([rateType])
 }
 
+// if isAvailable is false it is closed
 model ServiceSpecialRates {
   id        String   @id @default(cuid())
   startDate DateTime @db.Date
@@ -1377,7 +1378,8 @@ model ServiceSpecialRates {
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
   isAvailable   Boolean
 
-  serviceRatesAssociation ServiceRatesAssociation?
+  serviceRatesAssociationId String
+  serviceRatesAssociation   ServiceRatesAssociation @relation(fields: [serviceRatesAssociationId], references: [id], onDelete: Cascade)
 
   @@unique([serviceRateId])
 }
@@ -1387,15 +1389,16 @@ 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 DayOfWeek
+  startTime DateTime  @db.Time
+  endTime   DateTime  @db.Time
 
   serviceRateId String?
   serviceRate   ServiceRate? @relation(fields: [serviceRateId], references: [id], onDelete: Cascade)
 
-  serviceRatesAssociation ServiceRatesAssociation?
+  serviceRatesAssociationId String
+  serviceRatesAssociation   ServiceRatesAssociation @relation(fields: [serviceRatesAssociationId], references: [id], onDelete: Cascade)
 
   @@unique([serviceRateId])
 }
@@ -1411,11 +1414,8 @@ model ServiceRatesAssociation {
   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)
+  serviceDailyRates   ServiceDailyRates[]
+  serviceSpecialRates ServiceSpecialRates[]
 
   addons   ServiceAddon[]
   packages ServicePackage[]
@@ -1423,8 +1423,6 @@ model ServiceRatesAssociation {
   @@unique([serviceId])
   @@unique([volunteerServiceId])
   @@unique([serviceGeneralRatesId])
-  @@unique([serviceDailyRatesId])
-  @@unique([serviceSpecialRatesId])
 }
 
 enum VisibilityPreference {

package/src/extendedSchemas.ts

@@ -305,12 +305,12 @@ export interface ServiceSpecialRatesExt extends ServiceSpecialRates {
 }
 
 export interface ServiceRatesAssociationExt extends ServiceRatesAssociation {
-  serviceGeneralRates?: ServiceRate;
-  serviceDailyRates?: ServiceDailyRates;
-  serviceSpecialRates?: ServiceSpecialRates;
+  serviceGeneralRates?: ServiceRate | null;
+  serviceDailyRates?: ServiceDailyRates[];
+  serviceSpecialRates?: ServiceSpecialRates[];
 
-  addons: ServiceAddon[];
-  packages: ServicePackageExt[];
+  addons?: ServiceAddon[];
+  packages?: ServicePackageExt[];
 }