Merge pull request #34 from ohtuprojekti-ilmo/fixes

fixed tokencheckrouter

controllers/tokenCheck.js

@@ -1,4 +1,4 @@
-const tokenCheckRouter = require('express').Router
+const tokenCheckRouter = require('express').Router()
 const checkLogin = require('../utils/middleware/checkLogin').checkLogin
 const checkAdmin = require('../utils/middleware/checkAdmin').checkAdmin
 
@@ -8,4 +8,6 @@ tokenCheckRouter.get('/login', checkLogin, (req, res) => {
 
 tokenCheckRouter.get('/admin', checkAdmin, (req, res) => {
   res.status(200).send()
-})
+})
+
+module.exports = tokenCheckRouter

controllers/topics.js

@@ -41,15 +41,25 @@ topicsRouter.put('/:id', checkAdmin, (req, res) => {
 })
 
 topicsRouter.get('/', (req, res) => {
-  try {
-    db.Topic.findAll({}).then(topics => {
-      if (topics) {
-        return res.status(200).json(topics)
-      }
+  db.Topic.findAll({})
+    .then(topics => {
+      res.status(200).json(topics)
+    })
+    .catch(error => {
+      console.log(error)
+      res.status(500).json({ error: 'database error' })
+    })
+})
+
+topicsRouter.get('/:id', (req, res) => {
+  db.Topic.findOne({ where: { topic_id: req.params.id } })
+    .then(topic => {
+      res.status(200).json(topic)
+    })
+    .catch(error => {
+      console.log(error)
+      res.status(500).json({ error: 'database error' })
     })
-  } catch (error) {
-    res.status(500).json({ error: 'database error' })
-  }
 })
 
 module.exports = topicsRouter