Merge kaistusc/kaist-ua-server master into master

config/config.js

@@ -0,0 +1,28 @@
+require("dotenv").config();
+
+module.exports = {
+  development: {
+    username: process.env.USERNAME,
+    password: process.env.PASSWORD,
+    database: process.env.DATABASE,
+    host: process.env.HOST,
+    dialect: "mysql",
+    operatorsAliases: 0,
+  },
+  test: {
+    username: process.env.USERNAME,
+    password: process.env.PASSWORD,
+    database: process.env.DATABASE,
+    host: process.env.HOST,
+    dialect: "mysql",
+    operatorsAliases: 0,
+  },
+  production: {
+    username: process.env.USERNAME,
+    password: process.env.PASSWORD,
+    database: process.env.DATABASE,
+    host: process.env.HOST,
+    dialect: "mysql",
+    operatorsAliases: 0,
+  },
+};

index.js

@@ -1,42 +1,41 @@
-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 passport = require('koa-passport');
-const swagger = require('koa2-swagger-ui');
-const swaggerDoc = require('./src/utils/swaggerDef.js');
+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);
     });
 
-  app.use(cors());
+  app.use(cors({ credentials: true, origin: process.env.ORIGIN }));
   app.use(helmet());
-  app.use(passport.initialize());
-  require('./src/config/accesstoken-strategy.js');
   app.use(logger());
   app.use(bodyParser());
+  app.use(jwtMiddleware);
   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());
 

package.json

@@ -20,10 +20,12 @@
   "homepage": "https://github.com/winningarc/kaist-ua-server#readme",
   "dependencies": {
     "@koa/cors": "^3.0.0",
+    "aws-sdk": "^2.766.0",
     "cors": "^2.8.5",
     "crypto": "^1.0.1",
     "dotenv": "^8.2.0",
-    "koa": "^2.11.0",
+    "jsonwebtoken": "^8.5.1",
+    "koa": "^2.13.0",
     "koa-body": "^4.1.1",
     "koa-helmet": "^5.2.0",
     "koa-logger": "^3.2.1",
@@ -36,11 +38,11 @@
     "passport": "^0.4.1",
     "passport-accesstoken": "^0.1.0",
     "router": "^1.3.5",
-    "sequelize": "^4.44.4",
+    "sequelize": "^6.3.5",
     "swagger-jsdoc": "^4.0.0",
     "yarn": "^1.22.4"
   },
   "devDependencies": {
     "eslint": "^7.7.0"
   }
-}
+}

src/database/migrations/20200827223319-create-admin.js

@@ -0,0 +1,22 @@
+"use strict";
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable("Admin", {
+      id: {
+        type: Sequelize.UUID,
+        defaultValue: Sequelize.UUIDV4,
+        primaryKey: true,
+      },
+      email: Sequelize.STRING,
+      password: Sequelize.STRING,
+      salt: Sequelize.STRING,
+      createdAt: Sequelize.DATE,
+      updatedAt: Sequelize.DATE,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable("Admin");
+  },
+};

src/database/migrations/20200827223527-create-banner.js

@@ -0,0 +1,20 @@
+"use strict";
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable("Banner", {
+      id: {
+        type: Sequelize.UUID,
+        defaultValue: Sequelize.UUIDV4,
+        primaryKey: true,
+      },
+      image: Sequelize.TEXT,
+      link: Sequelize.TEXT,
+      isActive: Sequelize.BOOLEAN,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable("Banner");
+  },
+};

src/database/migrations/20200827223657-create-board.js

@@ -0,0 +1,21 @@
+"use strict";
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable("Board", {
+      id: {
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER,
+      },
+      korTitle: Sequelize.STRING,
+      engTitle: Sequelize.STRING,
+      korDescription: Sequelize.TEXT,
+      engDescription: Sequelize.TEXT,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable("Board");
+  },
+};

src/database/migrations/20200827223837-create-cancel-request.js

@@ -0,0 +1,21 @@
+"use strict";
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable("CancelRequest", {
+      id: {
+        type: Sequelize.UUID,
+        defaultValue: Sequelize.UUIDV4,
+        primaryKey: true,
+      },
+      year: Sequelize.INTEGER,
+      semester: Sequelize.STRING,
+      createdAt: Sequelize.DATE,
+      updatedAt: Sequelize.DATE,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable("CancelRequest");
+  },
+};

src/database/migrations/20200827223935-create-payment.js

@@ -0,0 +1,20 @@
+"use strict";
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable("Payment", {
+      id: {
+        type: Sequelize.UUID,
+        defaultValue: Sequelize.UUIDV4,
+        primaryKey: true,
+      },
+      studentNumber: Sequelize.STRING,
+      year: Sequelize.INTEGER,
+      semester: Sequelize.STRING,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable("Payment");
+  },
+};

src/database/migrations/20200827224019-create-post.js

@@ -0,0 +1,29 @@
+"use strict";
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable("Post", {
+      id: {
+        type: Sequelize.UUID,
+        defaultValue: Sequelize.UUIDV4,
+        primaryKey: true,
+      },
+      author: Sequelize.TEXT,
+      korTitle: Sequelize.TEXT,
+      engTitle: Sequelize.TEXT,
+      korContent: Sequelize.TEXT,
+      engContent: Sequelize.TEXT,
+      views: {
+        type: Sequelize.INTEGER,
+        defaultValue: 0,
+      },
+      isActive: Sequelize.BOOLEAN,
+      createdAt: Sequelize.DATE,
+      updatedAt: Sequelize.DATE,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable("Post");
+  },
+};

src/database/migrations/20200827224111-create-student.js

@@ -0,0 +1,28 @@
+"use strict";
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable("Student", {
+      id: {
+        type: Sequelize.UUID,
+        defaultValue: Sequelize.UUIDV4,
+        primaryKey: true,
+      },
+      studentNumber: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        unique: true,
+      },
+      kaistUid: Sequelize.STRING,
+      korName: Sequelize.STRING,
+      engName: Sequelize.STRING,
+      affiliation: Sequelize.STRING,
+      createdAt: Sequelize.DATE,
+      updatedAt: Sequelize.DATE,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable("Student");
+  },
+};

src/database/migrations/20200827230222-create-associations.js

@@ -0,0 +1,76 @@
+"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
+        {
+          type: Sequelize.INTEGER,
+          references: {
+            model: "Board", // name of Target model
+            key: "id", // key in Target model that we're referencing
+          },
+          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
+          {
+            type: Sequelize.INTEGER,
+            references: {
+              model: "Student", // name of Source model
+              key: "studentNumber",
+            },
+            onUpdate: "CASCADE",
+            onDelete: "SET NULL",
+          }
+        );
+      })
+      .then(() => {
+        // Student hasMany Payment
+        return queryInterface.addColumn(
+          "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",
+            },
+            onUpdate: "CASCADE",
+            onDelete: "SET NULL",
+          }
+        );
+      });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    // remove Board hasMany Post
+    return queryInterface
+      .removeColumn(
+        "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
+        );
+      })
+      .then(() => {
+        // remove Student hasMany Payment
+        return queryInterface.removeColumn(
+          "Payment", // name of the Target model
+          "studentId" // key we want to remove
+        );
+      });
+  },
+};