Merge pull request #23 from MengChiehLiu/develop

Version 1.0.13

backend/server/controllers/fs.js

@@ -4,9 +4,9 @@ const router = require('express').Router();
 const {checkAuthorization, checkDateFormat} = require('../utils/checkRequest');
 
 // import models
-const {getFS} = require('../models/fs');
+const {getBS, getIS} = require('../models/fs');
 
-async function routerGet(req, res){
+async function routerGetBS(req, res){
     try{
         const user_id = req.user.id;
         let date = req.query.timestamp
@@ -19,8 +19,31 @@ async function routerGet(req, res){
             if (new Date(date) > new Date()) return res.status(400).json({error: 'Future Request Is Not Allowed'})
         }
 
-        const fs = await getFS(user_id, date)
-        return res.json({data: {subjects: fs}});
+        const BS = await getBS(user_id, date)
+        return res.json({data: {subjects: BS}});
+
+    }catch(err){
+        console.error(err);
+        return res.status(500).json({error: 'Internal Server Error'});
+    };
+};
+
+
+async function routerGetIS(req, res){
+    try{
+        const user_id = req.user.id;
+        let date = req.query.timestamp
+
+        if (!date){
+            const [year, month] = new Date().toLocaleDateString('zh-TW', { timeZone: 'Asia/Taipei' }).split('/')
+            date = `${year}/${month}/1`
+        }else{
+            date = `${date.slice(0, 7)}-01`
+            if (new Date(date) > new Date()) return res.status(400).json({error: 'Future Request Is Not Allowed'})
+        }
+
+        const IS = await getIS(user_id, date)
+        return res.json({data: {subjects: IS}});
 
     }catch(err){
         console.error(err);
@@ -29,5 +52,6 @@ async function routerGet(req, res){
 };
 
 // router
-router.get( '/', checkAuthorization, checkDateFormat(), routerGet);
+router.get( '/bs', checkAuthorization, checkDateFormat(), routerGetBS);
+router.get( '/is', checkAuthorization, checkDateFormat(), routerGetIS);
 module.exports = router;

backend/server/views/api.js

@@ -7,13 +7,13 @@ router.get('/api/1.0', function(req, res){res.send('Hello World!');})
 router.use('/api/1.0/docs',  require('./swagger.js'));
 
 // routers
-router.use('/api/1.0/data', require('./data.js'));
-router.use('/api/1.0/entries', require('./entries.js'));
-router.use('/api/1.0/registers', require('./registers.js'));
-router.use('/api/1.0/fs', require('./fs.js'));
-router.use('/api/1.0/stats', require('./stats.js'));
-router.use('/api/1.0/goals', require('./goals.js'));
-router.use('/api/1.0/users', require('./users.js'));
+router.use('/api/1.0/data', require('../controllers/data.js'));
+router.use('/api/1.0/entries', require('../controllers/entries.js'));
+router.use('/api/1.0/registers', require('../controllers/registers.js'));
+router.use('/api/1.0/fs', require('../controllers/fs.js'));
+router.use('/api/1.0/stats', require('../controllers/stats.js'));
+router.use('/api/1.0/goals', require('../controllers/goals.js'));
+router.use('/api/1.0/users', require('../controllers/users.js'));
 
 
 module.exports = router;