fix type errors hopefully *fingerscrossed*

This commit is contained in:
Thomas Ruoff
2020-12-23 16:49:43 +01:00
parent 01dbe7a7bb
commit b723fc5660
3 changed files with 22 additions and 12 deletions

View File

@@ -34,7 +34,8 @@ const BillSchema = new mongoose.Schema<BillDocument>(
return v <= bill.milageEnd
},
message: (props) => `${props.value} is bigger than milageEnd!`,
message: (props: { value: Number }) =>
`${props.value} is bigger than milageEnd!`,
},
},
milageEnd: {
@@ -47,7 +48,8 @@ const BillSchema = new mongoose.Schema<BillDocument>(
return v >= bill.milageStart
},
message: (props) => `${props.value} is smaller than milageStart!`,
message: (props: { value: Number }) =>
`${props.value} is smaller than milageStart!`,
},
},
tarif: {

View File

@@ -1,6 +1,7 @@
import * as mongoose from 'mongoose'
import { v4 as uuidv4 } from 'uuid'
import { dateFormatBackend, getDays, nowInTz } from '../helpers/date'
import { Bill } from './bill'
import { Booker } from './booker'
import { BOOKING_STATUS } from './enums'
@@ -49,13 +50,23 @@ const BookingSchema = new mongoose.Schema<BookingDocument>(
type: Date,
required: true,
get: dateFormatBackend,
min: nowInTz(),
validate: {
validator: function (v: Date) {
return v >= nowInTz()
},
message: (props: { value: Date }) => `${props.value} is in the past`,
},
},
endDate: {
type: Date,
required: false,
get: dateFormatBackend,
min: nowInTz(),
validate: {
validator: function (v: Date) {
return v >= nowInTz()
},
message: (props: { value: Date }) => `${props.value} is in the past`,
},
},
days: {
type: [String],

View File

@@ -72,14 +72,11 @@ export async function createBooking({
bookedDays.includes(day)
)
if (doubleBookedDays.length) {
const error = new mongoose.Error.ValidationError(booking)
error.addError(
'days',
new mongoose.Error.ValidatorError({
message: `${doubleBookedDays
.map((dateString) => dateFormatFrontend(new Date(dateString)))
.join(', ')} schon gebucht`,
})
const error = new mongoose.Error.ValidationError(booking.uuid)
error.errors.days = new mongoose.Error.ValidatorError(
`${doubleBookedDays
.map((dateString) => dateFormatFrontend(new Date(dateString)))
.join(', ')} schon gebucht`
)
throw error
}