put models in file not schema

This commit is contained in:
Thomas Ruoff
2020-08-14 23:09:22 +02:00
parent 1ce67e881e
commit 8e1356209c
3 changed files with 42 additions and 30 deletions

14
db/booker.js Normal file
View File

@@ -0,0 +1,14 @@
import * as mongoose from 'mongoose'
const BookerSchema = new mongoose.Schema(
{
name: { type: String, required: true },
email: { type: String, required: true, unique: true, minlength: 5 },
street: { type: String, required: true },
zip: { type: String, required: true },
city: { type: String, required: true },
},
{ timestamps: true }
)
export default mongoose.models.Booker || mongoose.model('Booker', BookerSchema)

View File

@@ -1,21 +1,14 @@
import { Schema } from 'mongoose' import * as mongoose from 'mongoose'
import { getDays, dateFormat } from '../helpers/date' import { getDays, dateFormat } from '../helpers/date'
export const BookerSchema = new Schema( const BookingSchema = new mongoose.Schema(
{ {
name: { type: String, required: true }, booker: {
email: { type: String, required: true, unique: true, minlength: 5 }, type: mongoose.Schema.Types.ObjectId,
street: { type: String, required: true }, ref: 'Booker',
zip: { type: String, required: true }, required: true,
city: { type: String, required: true }, },
},
{ timestamps: true }
)
export const BookingSchema = new Schema(
{
booker: { type: Schema.Types.ObjectId, ref: 'Booker', required: true },
startDate: { startDate: {
type: Date, type: Date,
required: true, required: true,
@@ -43,3 +36,6 @@ export const BookingSchema = new Schema(
BookingSchema.virtual('days').get(function () { BookingSchema.virtual('days').get(function () {
return getDays({ startDate: this.startDate, endDate: this.endDate }) return getDays({ startDate: this.startDate, endDate: this.endDate })
}) })
export default mongoose.models.Booking ||
mongoose.model('Booking', BookingSchema)

View File

@@ -1,24 +1,25 @@
import mongoose from 'mongoose' import * as mongoose from 'mongoose'
import { BookingSchema, BookerSchema } from './schema'
mongoose.connect(process.env.MONGO_URI, { import Booker from './booker'
useNewUrlParser: true, import Booking from './booking'
useUnifiedTopology: true,
connectTimeoutMS: 1000,
serverSelectionTimeoutMS: 5000,
})
if (process.env.NODE_ENV !== 'production') { let connectedPromise
mongoose.modelNames().includes('Booker') && mongoose.deleteModel('Booker')
mongoose.modelNames().includes('Booking') && mongoose.deleteModel('Booking') function connect() {
if (connectedPromise) {
return
}
connectedPromise = mongoose.connect(process.env.MONGO_URI, {
useNewUrlParser: true,
})
return connectedPromise
} }
export const Booker =
mongoose.models.Booker || mongoose.model('Booker', BookerSchema)
export const Booking =
mongoose.models.Booking || mongoose.model('Booking', BookingSchema)
export async function getBookedDays() { export async function getBookedDays() {
await connect()
const bookings = await Booking.find( const bookings = await Booking.find(
{ {
status: { $ne: 'rejected' }, status: { $ne: 'rejected' },
@@ -48,6 +49,7 @@ export async function createBooking({
zip, zip,
city, city,
}) { }) {
await connect()
const booking = new Booking({ startDate, endDate, purpose, org, destination }) const booking = new Booking({ startDate, endDate, purpose, org, destination })
const bookedDays = await getBookedDays() const bookedDays = await getBookedDays()