From 31bbcb52c72b1807e5dff1c2b8ac72795a0e054b Mon Sep 17 00:00:00 2001
From: ruihildt <ruihildt@protonmail.com>
Date: Thu, 1 Aug 2019 21:12:20 +0200
Subject: [PATCH] Add daily averages endpoint / move authentication

---
 api/server.js                                 |  7 ++++---
 services/dailyAverages/dailyAveragesModel.js  |  8 ++++----
 services/dailyAverages/dailyAveragesRouter.js | 14 +++++---------
 services/sessions/sessionsRouter.js           |  9 ++++-----
 services/users/usersRouter.js                 |  5 ++---
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/api/server.js b/api/server.js
index c65f1c9..2ba72ab 100644
--- a/api/server.js
+++ b/api/server.js
@@ -6,6 +6,7 @@ const authRouter = require('../services/auth/authRouter');
 const usersRouter = require('../services/users/usersRouter');
 const sessionsRouter = require('../services/sessions/sessionsRouter');
 const dailyAveragesRouter = require('../services/dailyAverages/dailyAveragesRouter');
+const { authenticate } = require('../services/auth/authenticate');
 
 const server = express();
 
@@ -14,8 +15,8 @@ server.use(express.json());
 server.use(cors());
 
 server.use('/api/auth', authRouter);
-server.use('/api/users', usersRouter);
-server.use('/api/users', sessionsRouter);
-server.use('/api/users', dailyAveragesRouter);
+server.use('/api/users', authenticate, usersRouter);
+server.use('/api/users', authenticate, sessionsRouter);
+server.use('/api/users', authenticate, dailyAveragesRouter);
 
 module.exports = server;
diff --git a/services/dailyAverages/dailyAveragesModel.js b/services/dailyAverages/dailyAveragesModel.js
index 9059dd7..11ab16f 100644
--- a/services/dailyAverages/dailyAveragesModel.js
+++ b/services/dailyAverages/dailyAveragesModel.js
@@ -1,10 +1,10 @@
 const db = require('../../data/dbConfig');
 
 module.exports = {
-	getDailyAverageBy
+	getDailyAverages
 }
 
-function getDailyAverageBy(id) {
-return db('dailyAverages')
-		.where({});
+function getDailyAverages(id) {
+	return db('sessions')
+		.where({ id });
 }
\ No newline at end of file
diff --git a/services/dailyAverages/dailyAveragesRouter.js b/services/dailyAverages/dailyAveragesRouter.js
index 1574647..892d357 100644
--- a/services/dailyAverages/dailyAveragesRouter.js
+++ b/services/dailyAverages/dailyAveragesRouter.js
@@ -4,15 +4,11 @@ const router = require('express').Router();
 const Averages = require('./dailyAveragesModel');
 
 router.get('/:id/averages', (req, res) => {
-
-	Averages.findUserBy(req.params.id)
-		.first()
-		.then(response => {
-			res.status(200).json(response);
-		})
-		.catch(error => {
-			res.status(500).json(error);
-		});
+   Averages.getDailyAverages(req.params.id)
+			.then(averages => {
+				res.status(200).json(averages);
+			})
+			.catch(err => res.send(err));
 });
 
 module.exports = router;
diff --git a/services/sessions/sessionsRouter.js b/services/sessions/sessionsRouter.js
index fd118fb..6d10efc 100644
--- a/services/sessions/sessionsRouter.js
+++ b/services/sessions/sessionsRouter.js
@@ -1,9 +1,8 @@
 const router = require('express').Router();
 
-const { authenticate } = require('../auth/authenticate');
 const Sessions = require('../sessions/sessionsModel');
 
-router.post('/sessions', authenticate, (req, res) => {
+router.post('/sessions', (req, res) => {
    Sessions.addSession(req.body)
          .then(response => {
             res.status(200).json(response);
@@ -14,7 +13,7 @@ router.post('/sessions', authenticate, (req, res) => {
 			});
 });
 
-router.get('/:id/sessions', authenticate, (req, res) => {
+router.get('/:id/sessions', (req, res) => {
    Sessions.findUserSessions(req.params.id)
 			.then(users => {
 				res.status(200).json(users);
@@ -22,7 +21,7 @@ router.get('/:id/sessions', authenticate, (req, res) => {
 			.catch(err => res.send(err));
 });
 
-router.put('/sessions/:id', authenticate, async (req, res) => {
+router.put('/sessions/:id', async (req, res) => {
 	Sessions.updateSession(req.params.id, req.body)
 		.then(session => {
 			if (session) {
@@ -36,7 +35,7 @@ router.put('/sessions/:id', authenticate, async (req, res) => {
       });
 });
 
-router.delete("/sessions/:id", authenticate, async (req, res) => {
+router.delete("/sessions/:id", async (req, res) => {
 	Sessions.removeSession(req.params.id)
 		.then(() => res.status(200).json({ message: 'The session has been successfully deleted' }))
 		.catch(err => res.json(err));
diff --git a/services/users/usersRouter.js b/services/users/usersRouter.js
index a1163ec..64f96e2 100644
--- a/services/users/usersRouter.js
+++ b/services/users/usersRouter.js
@@ -1,9 +1,8 @@
 const router = require('express').Router();
 
-const { authenticate } = require('../auth/authenticate');
 const Users = require('../users/usersModel');
 
-router.get('/:id', authenticate, (req, res) => {
+router.get('/:id', (req, res) => {
 		Users.findUserById(req.params.id)
 			.then(users => {
 				res.status(200).json(users);
@@ -11,7 +10,7 @@ router.get('/:id', authenticate, (req, res) => {
 			.catch(err => res.send(err));
 });
 
-router.put('/:id', authenticate, async (req, res) => {
+router.put('/:id', async (req, res) => {
 	Users.updateUser(req.params.id, req.body)
 		.then(user => {
 			if (user) {