Feature/transaction

.eslintrc.json

@@ -24,6 +24,7 @@
       "no-unused-vars": 1,
       "no-multiple-empty-lines": 0,
       "space-before-function-paren": 0,
-      "eol-last": 0
+      "eol-last": 0,
+      "brace-style": ["error", "stroustrup"]
     }
 }

.gitignore

@@ -2,4 +2,5 @@ node_modules
 .idea
 package-lock.json
 config/config.json
-test.js
+fcm.js
+serviceAccountKey.json

app.js

@@ -5,14 +5,17 @@ const cookieParser = require('cookie-parser');
 const logger = require('morgan');
 const session = require('express-session');
 const sequelize = require('./models').sequelize;
+const util = require('./utils');
 
 const indexRouter = require('./routes/index');
 const authRouter = require('./routes/auth');
 const usersRouter = require('./routes/users');
 
 // TODO: not use yet
-// const breakdownRouter = require('./routes/breakdown');
+const breakdownRouter = require('./routes/breakdown');
 const eventRouter = require('./routes/event');
+const finRouter = require('./routes/fin');
+
 // const guestRouter = require('./routes/guest');
 // const organizerRouter  = require('./routes/organizer');
 
@@ -47,8 +50,23 @@ app.use(express.static(path.join(__dirname, 'public')));
 app.use('/', indexRouter);
 app.use('/auth', authRouter);
 app.use('/users', usersRouter);
-// app.use('/breakdown', breakdownRouter);
+
+// auth check
+app.use('/*', function(req, res, next) {
+    if(req.method === 'OPTIONS') {
+        return next();
+    }
+    const result = util.getUser(req);
+    if(result.user === undefined) {
+        res.status(401).json('no auth');
+        return;
+    }
+    res.locals.user = result.user;
+    next();
+});
 app.use('/event', eventRouter);
+app.use('/fin', finRouter);
+app.use('/breakdown', breakdownRouter);
 // app.use('/guest', guestRouter);
 // app.use('/organizer', organizerRouter);
 

config/config.json.sample

@@ -1,12 +1,22 @@
 { 
-    "development": { 
-        "username": "root",
-        "password": "1234",
-        "database": "nh_db",
-        "host": "127.0.0.1",
-        "dialect": "mysql",
-        "operatorAliases" : false,
-        "logging": false,
-        "jwtSecret": "insert jwt secret key"
+    "development": {
+        "dbOptions": {
+            "username": "root",
+            "password": "1234",
+            "database": "nh_db",
+            "host": "127.0.0.1",
+            "dialect": "mysql",
+            "operatorAliases" : false,
+            "dialectOptions": {
+                "dateStrings": true,
+                "typeCast": true
+            },
+            "timezone": "+09:00",
+            "logging": false
+        },
+        "jwtSecret": "insert jwt secret key",
+        "iscd": "기관코드",
+        "accessToken": "액세스 토큰",
+        "BrdtBrno": "생년월일 or 사업자번호"
     }
 }

models/breakdown.js

@@ -0,0 +1,45 @@
+module.exports = (sequelize, DataTypes) => {
+    return sequelize.define('breakdown', {
+        id: {
+            type: DataTypes.INTEGER,
+            allowNull: false,
+            unique: true,
+            autoIncrement: true,
+            primaryKey: true,
+        },
+        event_id: {
+            type: DataTypes.INTEGER,
+            allowNull: false,
+        },
+        sender_id: {
+            type: DataTypes.INTEGER,
+            allowNull: false,
+            defaultValue: 0,
+        },
+        sender_name: {
+            type: DataTypes.STRING(20),
+            allowNull: true,
+        },
+        transfer_datetime: {
+            type: DataTypes.DATE,
+            allowNull: false,
+        },
+        message: {
+            type: DataTypes.STRING(45),
+            allowNull: true,
+            defaultValue: null,
+        },
+        money: {
+            type: DataTypes.INTEGER,
+            allowNull: false,
+        },
+        is_direct_input: {
+            type: DataTypes.BOOLEAN,
+            allowNull: false,
+            defaultValue: false,
+        },
+    },
+    {
+        timestamps: false,
+    });
+};

models/event.js

@@ -7,6 +7,11 @@ module.exports = (sequelize, DataTypes) => {
             autoIncrement: true,
             primaryKey: true,
         },
+        event_hash: {
+            type: DataTypes.STRING(100),
+            unique: true,
+            allowNull: true,
+        },
         user_id: {
             type: DataTypes.INTEGER,
             allowNull: false,
@@ -32,17 +37,18 @@ module.exports = (sequelize, DataTypes) => {
             allowNull: true,
             defaultValue: null,
         },
-        start_datetime: {
+        event_datetime: {
             type: DataTypes.DATE,
             allowNull: false,
         },
-        end_datetime: {
-            type: DataTypes.DATE,
+        is_activated: {
+            type: DataTypes.BOOLEAN,
             allowNull: false,
         },
-        is_activated: {
+        is_received: {
             type: DataTypes.BOOLEAN,
             allowNull: false,
+            defaultValue: false,
         },
     },
     {

models/index.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const Sequelize = require('sequelize');
 const env = process.env.NODE_ENV || 'development';
-const config = require(path.join(__dirname, '..', 'config', 'config.json'))[env];
+const config = require(path.join(__dirname, '..', 'config', 'config.json'))[env]['dbOptions'];
 
 const db = {};
 
@@ -13,6 +13,11 @@ db.User = require('./user')(sequelize, Sequelize);
 db.Event = require('./event')(sequelize, Sequelize);
 db.EventAdmin = require('./eventadmin')(sequelize, Sequelize);
 db.Guest = require('./guest')(sequelize, Sequelize);
+db.BreakDown = require('./breakdown')(sequelize, Sequelize);
+
+db.Event.hasMany(db.Guest, {foreignKey: {name: 'event_id'}});
+db.Event.hasMany(db.EventAdmin, {foreignKey: {name: 'event_id'}});
+db.Event.hasMany(db.BreakDown, {foreignKey: {name: 'event_id'}});
+db.User.hasMany(db.BreakDown, {foreignKey: {name: 'sender_id'}});
 
-db.Event.hasMany(db.Guest,  { foreignKey: { name: 'event_id'} });
 module.exports = db;

models/user.js

@@ -30,6 +30,11 @@ module.exports = (sequelize, DataTypes) => {
             allowNull: true,
             unique: true,
         },
+        firebase_token: {
+            type: DataTypes.STRING(200),
+            allowNull: true,
+            unique: true,
+        },
     },
     {
         timestamps: false,

package.json

@@ -7,13 +7,16 @@
     "dev-node": "node ./bin/www"
   },
   "dependencies": {
+    "axios": "^0.21.0",
     "bcrypt": "^5.0.0",
     "cookie-parser": "~1.4.4",
     "cors": "^2.8.5",
+    "crypto": "^1.0.1",
     "debug": "~2.6.9",
     "dotenv": "^8.2.0",
     "express": "^4.16.4",
     "express-session": "^1.17.1",
+    "firebase-admin": "^9.4.1",
     "http-errors": "^1.8.0",
     "jsonwebtoken": "^8.5.1",
     "morgan": "~1.9.1",

routes/auth.js

@@ -34,7 +34,8 @@ router.get('/', function(req, res, next) {
     const session = req.session;
     if(session.name) {
         res.json(session.name);
-    } else{
+    }
+    else{
         res.json('login fail');
     }
 });
@@ -43,14 +44,15 @@ router.get('/', function(req, res, next) {
 router.post('/login', async function(req, res, next) {
     try {
         const {body} = req;
-        const user = await User.findOne({attributes: ['id', 'password'], where: {username: body.username}});
+        const user = await User.findOne({attributes: ['id', 'password', 'fin_account','name'], where: {username: body.username}});
 
         if(user === null) {
             console.log('cannot find user');
             res.status(404).json({
                 'detail': 'No user found.',
             });
-        } else {
+        }
+        else {
             console.log(user.dataValues);
             const dbPassword = user.dataValues.password;
             const inputPassword = body.password;
@@ -67,15 +69,17 @@ router.post('/login', async function(req, res, next) {
                     token: jwtSignUser(user),
                     user: user,
                 });
-            } else {
+            }
+            else {
                 console.log('pw incorrect');
                 res.status(401).json({
                     auth: false,
                     token: null,
                 });
             }
         }
-    } catch (error) {
+    }
+    catch (error) {
         console.log('Login Error');
         next(error);
     }