Update

Griha3212 · Jun 18, 2019 · f4e4e0c · f4e4e0c
1 parent 36e1cda
commit f4e4e0c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/controllers/auth.controller.js b/controllers/auth.controller.js
@@ -5,6 +5,8 @@ const bcrypt = require('bcrypt');
 const saltRounds = 10;
 const jwt = require('jsonwebtoken');
 
+const User = require('../models/user.model');
+
 const Constants = require('../config/constants')
 //функции логина и регистрации контроллера
 
@@ -163,9 +165,22 @@ const checkLogin = (req, res) => {
     res.status(200).send(req.user.id);
 }
 
+const getUserInfo = (req, res) => {
+    // const userId = req.user.id;
+
+    User.findById(req.user.id, function (err, users) {
+        if (err) return res.status(500).send({
+            message: 'Error'
+        })
+        // saved!
+        res.status(200).send(users)
+    });
+}
+
 module.exports = {
     login,
     register,
     CheckAllUsers,
-    checkLogin
+    checkLogin,
+    getUserInfo
 }
diff --git a/controllers/history.controller.js b/controllers/history.controller.js
@@ -3,22 +3,12 @@ const User = require('../models/user.model');
 const History = require('../models/history.model');
 const historyService = require('../services/history.service');
 
-const getUserInfo = (req, res) => {
-    // const userId = req.user.id;
 
-    User.findById(req.user.id, function (err, users) {
-        if (err) return res.status(500).send({
-            message: 'Error'
-        })
-        // saved!
-        res.status(200).send(users)
-    });
-}
 
 
 const getHistoryList = (req, res) => {
 
-    History.find({userId: req.user.id}, function (err, histories) {
+    History.find({userId: req.user.id}, {weatherData: false}, function (err, histories) {
         if (err) return res.status(500).send({
             message: err.message,
         })
@@ -112,7 +102,6 @@ const createHistory = async (req, res) => {
 
 
 module.exports = {
-    getUserInfo,
     createHistory,
     getHistoryList,
     getHistoryElement

diff --git a/routes/api.routes.js b/routes/api.routes.js
@@ -10,6 +10,7 @@ router.get('/history', HistoryController.getHistoryList);
 router.get('/history/:id', HistoryController.getHistoryElement);
 
 router.post('/history', HistoryController.createHistory);
+router.get('/profile/', AuthController.getUserInfo);
 
 module.exports = router;