use types instead of interfaces

This commit is contained in:
Thomas Ruoff
2021-06-08 23:02:52 +02:00
parent dbe3904759
commit 498f212ee0
10 changed files with 56 additions and 71 deletions

View File

@@ -2,12 +2,12 @@ import * as mongoose from 'mongoose'
import { BILL_STATUS, MILAGE_TARIFS } from './enums'
import { getBillTotal } from '../helpers/bill'
export interface AdditionalCost {
export type AdditionalCost = {
name: string
value: number
}
export interface Bill {
export type Bill = {
milageStart: number
milageEnd: number
milage?: number
@@ -16,12 +16,11 @@ export interface Bill {
additionalCosts: AdditionalCost[]
}
export interface BillDocument
extends Bill,
mongoose.SchemaTimestampsConfig,
mongoose.Document { }
export type BillDocument = Bill &
mongoose.SchemaTimestampsConfig &
mongoose.Document
export interface BillModel extends mongoose.Model<BillDocument> { }
export type BillModel = mongoose.Model<BillDocument>
const BillSchema = new mongoose.Schema<BillDocument>(
{
@@ -29,7 +28,7 @@ const BillSchema = new mongoose.Schema<BillDocument>(
type: Number,
required: true,
validate: {
validator: function(v: number): boolean {
validator: function (v: number): boolean {
const bill = this as BillDocument
return v <= bill.milageEnd
@@ -43,7 +42,7 @@ const BillSchema = new mongoose.Schema<BillDocument>(
required: true,
validate: {
validator: function(v: number): boolean {
validator: function (v: number): boolean {
const bill = this as BillDocument
return v >= bill.milageStart
@@ -77,12 +76,12 @@ const BillSchema = new mongoose.Schema<BillDocument>(
}
)
BillSchema.virtual('milage').get(function(): number {
BillSchema.virtual('milage').get(function (): number {
const bill = this as BillDocument
return bill.milageEnd - bill.milageStart
})
BillSchema.virtual('total').get(function(): number {
BillSchema.virtual('total').get(function (): number {
const bill = this as BillDocument
return getBillTotal(bill)

View File

@@ -1,6 +1,6 @@
import * as mongoose from 'mongoose'
export interface Booker {
export type Booker = {
name: string
email: string
phone: string
@@ -9,12 +9,11 @@ export interface Booker {
city: string
}
export interface BookerDocument
extends Booker,
mongoose.SchemaTimestampsConfig,
mongoose.Document {}
export type BookerDocument = Booker &
mongoose.SchemaTimestampsConfig &
mongoose.Document
export interface BookerModel extends mongoose.Model<BookerDocument> {}
export type BookerModel = mongoose.Model<BookerDocument>
const BookerSchema = new mongoose.Schema<BookerDocument>(
{

View File

@@ -7,25 +7,24 @@ import { Booker } from './booker'
import { BOOKING_STATUS, VALIDATION_ERRORS } from './enums'
import { getBookedDays } from './index'
export interface Booking {
export type Booking = {
uuid: string
booker: Booker
bill: Bill
booker?: Booker
bill?: Bill
startDate: string
endDate: string
status: BOOKING_STATUS
status?: BOOKING_STATUS
purpose?: string
org?: string
destination?: string
days?: string[]
}
export interface BookingDocument
extends Booking,
mongoose.Document,
mongoose.SchemaTimestampsConfig { }
export type BookingDocument = Booking &
mongoose.Document &
mongoose.SchemaTimestampsConfig
export interface BookingModel extends mongoose.Model<BookingDocument> {
export type BookingModel = mongoose.Model<BookingDocument> & {
findBookedDays(uuidsToIngore?: string[]): Promise<string[]>
}
@@ -52,10 +51,11 @@ const BookingSchema = new mongoose.Schema<BookingDocument>(
required: true,
get: dateFormatBackend,
validate: {
validator: function(v: Date): boolean {
validator: function (v: Date): boolean {
return v >= nowInTz()
},
message: (props: { value: Date }): string => `${props.value} is in the past`,
message: (props: { value: Date }): string =>
`${props.value} is in the past`,
},
},
endDate: {
@@ -63,17 +63,18 @@ const BookingSchema = new mongoose.Schema<BookingDocument>(
required: false,
get: dateFormatBackend,
validate: {
validator: function(v: Date): boolean {
validator: function (v: Date): boolean {
return v >= nowInTz()
},
message: (props: { value: Date }): string => `${props.value} is in the past`,
message: (props: { value: Date }): string =>
`${props.value} is in the past`,
},
},
days: {
type: [String],
required: true,
validate: {
validator: async function(days: string[]): Promise<boolean> {
validator: async function (days: string[]): Promise<boolean> {
const booking = this as Booking
const uuid = booking.uuid && [booking.uuid]
const bookedDays = await getBookedDays(uuid)
@@ -105,7 +106,7 @@ const BookingSchema = new mongoose.Schema<BookingDocument>(
}
)
BookingSchema.pre('validate', function(next: () => void): void {
BookingSchema.pre('validate', function (next: () => void): void {
const booking = this as BookingDocument
booking.days = getDays({
startDate: new Date(booking.startDate),
@@ -114,7 +115,7 @@ BookingSchema.pre('validate', function(next: () => void): void {
next()
})
BookingSchema.static('findBookedDays', async function(
BookingSchema.static('findBookedDays', async function (
uuidsToIngore: string[] = []
): Promise<string[]> {
const model = this as BookingModel