Skip to content
Snippets Groups Projects
Commit 6690c613 authored by fu1106jv's avatar fu1106jv
Browse files

- fixed crashing server caused by webpack production build in combination with sequelize

parent b0917dda
No related branches found
No related tags found
No related merge requests found
File moved
......@@ -9,7 +9,7 @@
"server": "nodemon server --ignore client",
"start": "node ./dist/src/server.js",
"test": "jest",
"build:prod": "webpack --mode=production",
"build:prod": "webpack --mode=development",
"start:prod": "node ./server.js"
},
"author": "",
......
import { Client } from "pg";
import { Dialect, Sequelize } from "sequelize";
import envVars from "../config";
import { initBoat } from "./models/Boat";
import { initBoatType } from "./models/BoatType";
import Boat, { initBoat } from "./models/Boat";
import BoatType, { initBoatType } from "./models/BoatType";
import CheckIn, { initCheckIn } from "./models/CheckIn";
import { initEmployee } from "./models/Employee";
import { initSport } from "./models/Sport";
import Sport, { initSport } from "./models/Sport";
export default async function initializeDatabase() {
await createDbIfNotExists();
......@@ -19,16 +19,11 @@ export default async function initializeDatabase() {
logging: false,
}
);
await initEmployee(sequelize);
console.log("Account")
const Sport = await initSport(sequelize);
console.log("Sport")
const Boat = await initBoat(sequelize);
console.log("Boat")
const BoatType = await initBoatType(sequelize);
console.log("Boattype")
await initCheckIn(sequelize);
console.log("Checkin")
initCheckIn(sequelize);
initBoatType(sequelize);
initBoat(sequelize);
initSport(sequelize);
initEmployee(sequelize);
BoatType.belongsToMany(Sport, { through: "Sport_BoatType" });
BoatType.hasMany(Boat);
......
......@@ -25,7 +25,7 @@ class Boat
declare readonly updatedAt: Date;
}
export const initBoat = async (sequelizeConnection: Sequelize) => {
export const initBoat = (sequelizeConnection: Sequelize) => {
Boat.init(
{
id: {
......@@ -48,7 +48,6 @@ export const initBoat = async (sequelizeConnection: Sequelize) => {
sequelize: sequelizeConnection,
}
);
return Boat;
};
export default Boat;
......@@ -36,7 +36,7 @@ class BoatType
};
}
export const initBoatType = async (sequelizeConnection: Sequelize) => {
export const initBoatType = (sequelizeConnection: Sequelize) => {
BoatType.init(
{
id: {
......@@ -59,6 +59,5 @@ export const initBoatType = async (sequelizeConnection: Sequelize) => {
sequelize: sequelizeConnection,
}
);
return BoatType
};
export default BoatType;
......@@ -42,7 +42,7 @@ class CheckIn
declare readonly updatedAt: Date;
}
export const initCheckIn = async (sequelizeConnection: Sequelize) => {
export const initCheckIn = (sequelizeConnection: Sequelize) => {
CheckIn.init(
{
id: {
......
......@@ -22,7 +22,7 @@ class Employee
declare readonly createdAt: Date;
declare readonly updatedAt: Date;
}
export const initEmployee = async (sequelizeConnection: Sequelize) => {
export const initEmployee = (sequelizeConnection: Sequelize) => {
Employee.init(
{
id: {
......
......@@ -23,7 +23,7 @@ class Sport
declare readonly updatedAt: Date;
}
export const initSport = async (sequelizeConnection: Sequelize) => {
export const initSport = (sequelizeConnection: Sequelize) => {
Sport.init(
{
id: {
......@@ -46,6 +46,5 @@ export const initSport = async (sequelizeConnection: Sequelize) => {
sequelize: sequelizeConnection,
}
);
return Sport;
};
export default Sport;
......@@ -15,6 +15,7 @@ import schedule from "node-schedule"
let init = async () => {
// DB
console.log("Sarting Server")
await initializeDatabase();
await createInitialEmployeeIfNotExists();
// server
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment