Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"license": "MIT",
"scripts": {
"undomigrate": "babel-node node_modules/.bin/sequelize db:migrate:undo:all",
"seed": "babel-node node_modules/.bin/sequelize db:seed:all",
"migrate": "npm run undomigrate && babel-node node_modules/.bin/sequelize db:migrate",
"dev": "nodemon --exec babel-node ./src/index.js",
"clean": "rm -rf build && mkdir build",
Expand Down
5 changes: 2 additions & 3 deletions src/db/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ dotenv.config();
module.exports = {
development: {
url: process.env.DATABASE_URL_DEV,
dialect: 'postgres',
logging: false,
},
test: {
url: process.env.DATABASE_URL_TEST,
dialect: 'postgres',
logging: true,
},
production: {
url: process.env.DATABASE_URL,
dialect: 'postgres',
ssl: true,
dialectOptions: {
ssl: true,
Expand Down
Empty file removed src/db/migrations/.gitKeep
Empty file.
40 changes: 40 additions & 0 deletions src/db/migrations/20190724104333-create-user.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
export default {
up: (queryInterface, Sequelize) => queryInterface.createTable('Users', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
firstName: {
type: Sequelize.STRING,
allowNull: false,
},
lastName: {
type: Sequelize.STRING,
allowNull: false,
},
email: {
type: Sequelize.STRING,
allowNull: false,
},
password: {
type: Sequelize.STRING,
allowNull: false,
},
isAdmin: {
type: Sequelize.BOOLEAN,
defaultValue: false,
},
createdAt: {
allowNull: false,
type: Sequelize.DATE,
defaultValue: Sequelize.fn('now'),
},
updatedAt: {
allowNull: true,
type: Sequelize.DATE,
},
}),
down: queryInterface => queryInterface.dropTable('Users'),
};
39 changes: 39 additions & 0 deletions src/db/migrations/20190724105152-create-bus.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

export default {
up: (queryInterface, Sequelize) => queryInterface.createTable('Buses', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
numberPlate: {
type: Sequelize.STRING,
allowNull: false,
},
manufacturer: {
type: Sequelize.STRING,
},
model: {
type: Sequelize.STRING,
allowNull: false,
},
year: {
type: Sequelize.STRING,
},
capacity: {
type: Sequelize.INTEGER,
allowNull: false,
},
createdAt: {
allowNull: false,
type: Sequelize.DATE,
defaultValue: Sequelize.fn('now'),
},
updatedAt: {
allowNull: true,
type: Sequelize.DATE,
},
}),
down: queryInterface => queryInterface.dropTable('Buses'),
};
47 changes: 47 additions & 0 deletions src/db/migrations/20190724105744-create-trip.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
export default {
up: (queryInterface, Sequelize) => queryInterface.createTable('Trips', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
busId: {
type: Sequelize.INTEGER,
allowNull: false,
references: {
model: 'Buses',
key: 'id',
},
},
origin: {
type: Sequelize.STRING,
allowNull: false,
},
destination: {
type: Sequelize.STRING,
allowNull: false,
},
tripDate: {
type: Sequelize.DATE,
allowNull: false,
},
fare: {
type: Sequelize.FLOAT,
allowNull: false,
},
status: {
type: Sequelize.FLOAT,
},
createdAt: {
allowNull: false,
type: Sequelize.DATE,
defaultValue: Sequelize.fn('now'),
},
updatedAt: {
allowNull: true,
type: Sequelize.DATE,
},
}),
down: queryInterface => queryInterface.dropTable('Trips'),
};
36 changes: 36 additions & 0 deletions src/db/migrations/20190724105907-create-booking.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
export default {
up: (queryInterface, Sequelize) => queryInterface.createTable('Bookings', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
tripId: {
type: Sequelize.INTEGER,
allowNull: false,
references: {
model: 'Trips',
key: 'id',
},
},
userId: {
type: Sequelize.INTEGER,
allowNull: false,
references: {
model: 'Users',
key: 'id',
},
},
createdAt: {
allowNull: false,
type: Sequelize.DATE,
defaultValue: Sequelize.fn('now'),
},
updatedAt: {
allowNull: true,
type: Sequelize.DATE,
},
}),
down: queryInterface => queryInterface.dropTable('Bookings'),
};
7 changes: 7 additions & 0 deletions src/db/models/booking.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default (sequelize, DataTypes) => {
const Booking = sequelize.define('Booking', {
tripId: DataTypes.INTEGER,
userId: DataTypes.INTEGER,
}, {});
return Booking;
};
10 changes: 10 additions & 0 deletions src/db/models/bus.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export default (sequelize, DataTypes) => {
const Bus = sequelize.define('Bus', {
numberPlate: DataTypes.STRING,
manufacturer: DataTypes.STRING,
model: DataTypes.STRING,
year: DataTypes.STRING,
capacity: DataTypes.INTEGER,
}, {});
return Bus;
};
11 changes: 11 additions & 0 deletions src/db/models/trip.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export default (sequelize, DataTypes) => {
const Trip = sequelize.define('Trip', {
busId: DataTypes.INTEGER,
origin: DataTypes.STRING,
destination: DataTypes.STRING,
tripDate: DataTypes.DATE,
fare: DataTypes.FLOAT,
status: DataTypes.FLOAT,
}, {});
return Trip;
};
10 changes: 10 additions & 0 deletions src/db/models/user.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export default (sequelize, DataTypes) => {
const User = sequelize.define('User', {
firstName: DataTypes.STRING,
lastName: DataTypes.STRING,
email: DataTypes.STRING,
password: DataTypes.STRING,
isAdmin: DataTypes.BOOLEAN,
}, {});
return User;
};
Empty file removed src/db/seeders/.gitKeep
Empty file.
10 changes: 10 additions & 0 deletions src/db/seeders/20190724111907-users.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export default {
up: queryInterface => queryInterface.bulkInsert('Users', [{
firstName: 'John',
lastName: 'Doe',
email: 'demo@demo.com',
password: 'password',
}], {}),

down: queryInterface => queryInterface.bulkDelete('Users', null, {}),
};