Skip to content

Commit

Permalink
yarn lint --fix + yarn add sequelize-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
junsung.yoon committed Oct 10, 2020
1 parent e1da57c commit a4d9be8
Show file tree
Hide file tree
Showing 45 changed files with 622 additions and 285 deletions.
8 changes: 4 additions & 4 deletions config/config.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
require("dotenv").config();
require('dotenv').config();

module.exports = {
development: {
username: process.env.USERNAME,
password: process.env.PASSWORD,
database: process.env.DATABASE,
host: process.env.HOST,
dialect: "mysql",
dialect: 'mysql',
operatorsAliases: 0,
},
test: {
username: process.env.USERNAME,
password: process.env.PASSWORD,
database: process.env.DATABASE,
host: process.env.HOST,
dialect: "mysql",
dialect: 'mysql',
operatorsAliases: 0,
},
production: {
username: process.env.USERNAME,
password: process.env.PASSWORD,
database: process.env.DATABASE,
host: process.env.HOST,
dialect: "mysql",
dialect: 'mysql',
operatorsAliases: 0,
},
};
32 changes: 16 additions & 16 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
require("dotenv").config();
const Koa = require("koa");
const bodyParser = require("koa-body");
const cors = require("@koa/cors");
const logger = require("koa-logger");
const router = require("./src/routes");
const models = require("./src/database/models/index.js");
const helmet = require("koa-helmet");
const swagger = require("koa2-swagger-ui");
const swaggerDoc = require("./src/utils/swaggerDef.js");
const { jwtMiddleware } = require("./src/utils");
require('dotenv').config();
const Koa = require('koa');
const bodyParser = require('koa-body');
const cors = require('@koa/cors');
const logger = require('koa-logger');
const router = require('./src/routes');
const models = require('./src/database/models/index.js');
const helmet = require('koa-helmet');
const swagger = require('koa2-swagger-ui');
const swaggerDoc = require('./src/utils/swaggerDef.js');
const { jwtMiddleware } = require('./src/utils');

const run = async () => {
const app = new Koa();

models.sequelize
.sync()
.then(() => {
console.log(" DB 연결 성공");
console.log(' DB 연결 성공');
})
.catch((err) => {
console.log("연결 실패");
console.log('연결 실패');
console.log(err);
});

Expand All @@ -31,11 +31,11 @@ const run = async () => {
app.use(router.routes()).use(router.allowedMethods());
app.use(
swagger({
routePrefix: "/swagger",
routePrefix: '/swagger',
swaggerOptions: {
url: "/swagger.json",
url: '/swagger.json',
},
})
}),
);
app.use(swaggerDoc.routes());

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"passport-accesstoken": "^0.1.0",
"router": "^1.3.5",
"sequelize": "^6.3.5",
"sequelize-cli": "^6.2.0",
"swagger-jsdoc": "^4.0.0",
"yarn": "^1.22.4"
},
Expand Down
6 changes: 3 additions & 3 deletions src/database/migrations/20200827223319-create-admin.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";
'use strict';

module.exports = {
up: async (queryInterface, Sequelize) => {
await queryInterface.createTable("Admin", {
await queryInterface.createTable('Admin', {
id: {
type: Sequelize.UUID,
defaultValue: Sequelize.UUIDV4,
Expand All @@ -17,6 +17,6 @@ module.exports = {
},

down: async (queryInterface, Sequelize) => {
await queryInterface.dropTable("Admin");
await queryInterface.dropTable('Admin');
},
};
6 changes: 3 additions & 3 deletions src/database/migrations/20200827223527-create-banner.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";
'use strict';

module.exports = {
up: async (queryInterface, Sequelize) => {
await queryInterface.createTable("Banner", {
await queryInterface.createTable('Banner', {
id: {
type: Sequelize.UUID,
defaultValue: Sequelize.UUIDV4,
Expand All @@ -15,6 +15,6 @@ module.exports = {
},

down: async (queryInterface, Sequelize) => {
await queryInterface.dropTable("Banner");
await queryInterface.dropTable('Banner');
},
};
6 changes: 3 additions & 3 deletions src/database/migrations/20200827223657-create-board.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";
'use strict';

module.exports = {
up: async (queryInterface, Sequelize) => {
await queryInterface.createTable("Board", {
await queryInterface.createTable('Board', {
id: {
autoIncrement: true,
primaryKey: true,
Expand All @@ -16,6 +16,6 @@ module.exports = {
},

down: async (queryInterface, Sequelize) => {
await queryInterface.dropTable("Board");
await queryInterface.dropTable('Board');
},
};
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";
'use strict';

module.exports = {
up: async (queryInterface, Sequelize) => {
await queryInterface.createTable("CancelRequest", {
await queryInterface.createTable('CancelRequest', {
id: {
type: Sequelize.UUID,
defaultValue: Sequelize.UUIDV4,
Expand All @@ -16,6 +16,6 @@ module.exports = {
},

down: async (queryInterface, Sequelize) => {
await queryInterface.dropTable("CancelRequest");
await queryInterface.dropTable('CancelRequest');
},
};
6 changes: 3 additions & 3 deletions src/database/migrations/20200827223935-create-payment.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";
'use strict';

module.exports = {
up: async (queryInterface, Sequelize) => {
await queryInterface.createTable("Payment", {
await queryInterface.createTable('Payment', {
id: {
type: Sequelize.UUID,
defaultValue: Sequelize.UUIDV4,
Expand All @@ -15,6 +15,6 @@ module.exports = {
},

down: async (queryInterface, Sequelize) => {
await queryInterface.dropTable("Payment");
await queryInterface.dropTable('Payment');
},
};
6 changes: 3 additions & 3 deletions src/database/migrations/20200827224019-create-post.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";
'use strict';

module.exports = {
up: async (queryInterface, Sequelize) => {
await queryInterface.createTable("Post", {
await queryInterface.createTable('Post', {
id: {
type: Sequelize.UUID,
defaultValue: Sequelize.UUIDV4,
Expand All @@ -24,6 +24,6 @@ module.exports = {
},

down: async (queryInterface, Sequelize) => {
await queryInterface.dropTable("Post");
await queryInterface.dropTable('Post');
},
};
6 changes: 3 additions & 3 deletions src/database/migrations/20200827224111-create-student.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";
'use strict';

module.exports = {
up: async (queryInterface, Sequelize) => {
await queryInterface.createTable("Student", {
await queryInterface.createTable('Student', {
id: {
type: Sequelize.UUID,
defaultValue: Sequelize.UUIDV4,
Expand All @@ -23,6 +23,6 @@ module.exports = {
},

down: async (queryInterface, Sequelize) => {
await queryInterface.dropTable("Student");
await queryInterface.dropTable('Student');
},
};
56 changes: 28 additions & 28 deletions src/database/migrations/20200827230222-create-associations.js
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
"use strict";
'use strict';

module.exports = {
up: async (queryInterface, Sequelize) => {
// Board hasMany Post
return queryInterface
.addColumn(
"Post", // name of Source model
"boardId", // name of the key we're adding
'Post', // name of Source model
'boardId', // name of the key we're adding
{
type: Sequelize.INTEGER,
references: {
model: "Board", // name of Target model
key: "id", // key in Target model that we're referencing
model: 'Board', // name of Target model
key: 'id', // key in Target model that we're referencing
},
onUpdate: "CASCADE",
onDelete: "SET NULL",
}
onUpdate: 'CASCADE',
onDelete: 'SET NULL',
},
)
.then(() => {
// Student hasMany CancelRequest
return queryInterface.addColumn(
"CancelRequest", // name of Target model
"studentNumber", // name of the key we're adding
'CancelRequest', // name of Target model
'studentNumber', // name of the key we're adding
{
type: Sequelize.INTEGER,
references: {
model: "Student", // name of Source model
key: "studentNumber",
model: 'Student', // name of Source model
key: 'studentNumber',
},
onUpdate: "CASCADE",
onDelete: "CASCADE",
}
onUpdate: 'CASCADE',
onDelete: 'CASCADE',
},
);
})
.then(() => {
// Student hasMany Payment
return queryInterface.addColumn(
"Payment", // name of Target model
"studentId", // name of the key we're adding
'Payment', // name of Target model
'studentId', // name of the key we're adding
{
type: Sequelize.UUID,
references: {
model: "Student", // name of Source model
key: "id",
model: 'Student', // name of Source model
key: 'id',
},
onUpdate: "CASCADE",
onDelete: "SET NULL",
}
onUpdate: 'CASCADE',
onDelete: 'SET NULL',
},
);
});
},
Expand All @@ -55,21 +55,21 @@ module.exports = {
// remove Board hasMany Post
return queryInterface
.removeColumn(
"Post", // name of Source model
"boardId" // key we want to remove
'Post', // name of Source model
'boardId', // key we want to remove
)
.then(() => {
// remove Student hasMany CancelRequest
return queryInterface.removeColumn(
"CancelRequest", // name of the Target model
"studentNumber" // key we want to remove
'CancelRequest', // name of the Target model
'studentNumber', // key we want to remove
);
})
.then(() => {
// remove Student hasMany Payment
return queryInterface.removeColumn(
"Payment", // name of the Target model
"studentId" // key we want to remove
'Payment', // name of the Target model
'studentId', // key we want to remove
);
});
},
Expand Down
14 changes: 7 additions & 7 deletions src/database/migrations/20200926153605-edit-post.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
"use strict";
'use strict';

module.exports = {
up: (queryInterface, Sequelize) => {
return Promise.all([
queryInterface.addColumn("Post", "korAuthor", {
queryInterface.addColumn('Post', 'korAuthor', {
type: Sequelize.TEXT,
}),
queryInterface.addColumn("Post", "engAuthor", {
queryInterface.addColumn('Post', 'engAuthor', {
type: Sequelize.TEXT,
}),
queryInterface.removeColumn("Post", "author"),
queryInterface.removeColumn('Post', 'author'),
]);
},

down: (queryInterface, Sequelize) => {
return Promise.all([
queryInterface.removeColumn("Post", "korAuthor"),
queryInterface.removeColumn("Post", "engAuthor"),
queryInterface.addColumn("Post", "author", {
queryInterface.removeColumn('Post', 'korAuthor'),
queryInterface.removeColumn('Post', 'engAuthor'),
queryInterface.addColumn('Post', 'author', {
type: Sequelize.TEXT,
}),
]);
Expand Down
6 changes: 3 additions & 3 deletions src/database/migrations/20200930185340-create-petition.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use strict";
'use strict';

module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable("Petition", {
return queryInterface.createTable('Petition', {
id: {
type: Sequelize.UUID,
defaultValue: Sequelize.UUIDV4,
Expand All @@ -18,6 +18,6 @@ module.exports = {
},

down: (queryInterface, Sequelize) => {
return queryInterface.dropTable("Petition");
return queryInterface.dropTable('Petition');
},
};
Loading

0 comments on commit a4d9be8

Please sign in to comment.