mirror of
https://github.com/tomru/pfadi-bussle.git
synced 2026-03-03 06:27:11 +01:00
fix all the formatting
This commit is contained in:
@@ -1,6 +1,11 @@
|
||||
import * as mongoose from 'mongoose'
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
import { dateFormatBackend, getDays, nowInTz, dateParseBackend } from '../helpers/date'
|
||||
import {
|
||||
dateFormatBackend,
|
||||
getDays,
|
||||
nowInTz,
|
||||
dateParseBackend,
|
||||
} from '../helpers/date'
|
||||
import { createCalendarEvent, deleteCalendarEvent } from '../lib/googlecalendar'
|
||||
|
||||
import { Bill } from './bill'
|
||||
@@ -16,9 +21,9 @@ export type Booking = {
|
||||
city: string
|
||||
bill?: Bill
|
||||
// format YYYY-MM-DD
|
||||
startDate: string,
|
||||
startDate: string
|
||||
// format YYYY-MM-DD
|
||||
endDate: string,
|
||||
endDate: string
|
||||
status?: BOOKING_STATUS
|
||||
purpose?: string
|
||||
org?: string
|
||||
@@ -58,14 +63,14 @@ const BookingSchema = new mongoose.Schema<BookingDocument>(
|
||||
type: String,
|
||||
required: true,
|
||||
validator: function (value: string): boolean {
|
||||
return !!dateParseBackend(value);
|
||||
return !!dateParseBackend(value)
|
||||
},
|
||||
},
|
||||
endDate: {
|
||||
type: String,
|
||||
required: true,
|
||||
validator: function (value: string): boolean {
|
||||
return !!dateParseBackend(value);
|
||||
return !!dateParseBackend(value)
|
||||
},
|
||||
},
|
||||
days: {
|
||||
@@ -160,4 +165,4 @@ const BookingModel = (mongoose.models.Booking ||
|
||||
BookingSchema
|
||||
)) as BookingModel
|
||||
|
||||
export default BookingModel;
|
||||
export default BookingModel
|
||||
|
||||
12
db/index.ts
12
db/index.ts
@@ -23,12 +23,10 @@ export async function getBookedDays(
|
||||
uuidsToIngore?: string[]
|
||||
): Promise<string[]> {
|
||||
await connect()
|
||||
const bookedInDatabase = await BookingModel.findBookedDays(uuidsToIngore);
|
||||
const bookedInCalendar = await calendarGetBookedDays();
|
||||
const bookedInDatabase = await BookingModel.findBookedDays(uuidsToIngore)
|
||||
const bookedInCalendar = await calendarGetBookedDays()
|
||||
|
||||
return [ ...bookedInDatabase, ...bookedInCalendar]
|
||||
.filter(uniqueFilter)
|
||||
.sort();
|
||||
return [...bookedInDatabase, ...bookedInCalendar].filter(uniqueFilter).sort()
|
||||
}
|
||||
|
||||
export async function getBookingByUUID(uuid: string): Promise<BookingDocument> {
|
||||
@@ -85,11 +83,11 @@ export async function createBooking({
|
||||
|
||||
export async function patchBooking(
|
||||
bookingUUID: string,
|
||||
bookingData: Booking,
|
||||
bookingData: Booking
|
||||
): Promise<Booking> {
|
||||
await connect()
|
||||
const booking = await getBookingByUUID(bookingUUID)
|
||||
booking.set(bookingData);
|
||||
booking.set(bookingData)
|
||||
await booking.save()
|
||||
|
||||
return booking.toJSON()
|
||||
|
||||
Reference in New Issue
Block a user