Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Griha3212 committed Jun 17, 2019
1 parent 33ad788 commit 36e1cda
Show file tree
Hide file tree
Showing 4 changed files with 168 additions and 5 deletions.
72 changes: 72 additions & 0 deletions controllers/history.controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// req.user.id
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;
Expand All @@ -14,6 +16,73 @@ const getUserInfo = (req, res) => {
}


const getHistoryList = (req, res) => {

History.find({userId: req.user.id}, function (err, histories) {
if (err) return res.status(500).send({
message: err.message,
})
// saved!
res.status(200).send(histories)
});
}

const getHistoryElement = (req, res) => {
// const userId = req.user.id;
console.log('req.params', req.params)

History.findById(req.params.id, function (err, histories) {
if (err) return res.status(500).send({
message: err.message,
})
// saved!
res.status(200).send(histories)
});
}


// getHistoryList
// getHistoryElement



const createHistory = async (req, res) => {
console.log('register', req.body)
try {
const inputData = {
...req.body,
userId: req.user.id
}
const result = await historyService.addHistoryData(inputData);
res.status(200).send(result);

} catch (err) {
res.status(500).send({ message: err.message })
}

// res.status(200).send({
// message: 'register'
// });
}






// const writeHistoryData = (req, res) => {
// // const userId = req.user.id;

// History.create(req.user.id, function (err, users) {
// if (err) return res.status(500).send({
// message: 'Error'
// })
// // saved!
// res.status(200).send(users)
// });
// }


// app.get('/cats/:_id', function (req, res) {
// console.log('req.params', req.params)
// Cat.find(req.params, function (err, cats) {
Expand Down Expand Up @@ -44,4 +113,7 @@ const getUserInfo = (req, res) => {

module.exports = {
getUserInfo,
createHistory,
getHistoryList,
getHistoryElement
}
27 changes: 27 additions & 0 deletions models/history.model.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
var mongoose = require('mongoose');
var Schema = mongoose.Schema;


//создаём схему БД

var historySchema = new Schema({
userId: {
type: String,
required: true,
// unique: true
},
weatherData:[{
type: Object
}],
creationDate: { type: Date, default: Date.now },
city: {type: String},
// _id: { type: String },
});


//создаём модель с использованием схемы
const History = mongoose.model('History', historySchema);


//экспорт для доступа извне
module.exports = History;
15 changes: 13 additions & 2 deletions routes/api.routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,16 @@ var router = express.Router();
router.get('/checkLogin', AuthController.checkLogin);

// GET /api/history
router.get('/history', HistoryController.getUserInfo);
module.exports = router;
router.get('/history', HistoryController.getHistoryList);
router.get('/history/:id', HistoryController.getHistoryElement);

router.post('/history', HistoryController.createHistory);

module.exports = router;


// GET /history - get list
// GET /history/:id - get single history element
// POST /history - create new history
// PUT/PATH/POST /history/:id - edit history
// DELETE /history/:id - delete history
59 changes: 56 additions & 3 deletions services/history.service.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,67 @@
const addHistoryData = (param) => {
const History = require('../models/history.model');

// const addHistoryData = (param) => {

// return new Promise((resolve, reject) => {
// User.findOne(param, function(err, user) {
// if (err) {
// reject(err);
// } else {
// resolve(user)
// }
// })
// })


// }



const addHistoryData = (inputData) => {
return new Promise((resolve, reject) => {
History.create(inputData, function(err, history) {
console.log('err', err)
console.log('user', history)
if (err) {
reject(err);
} else {
resolve(history)
}
})
})
}


const getList = (param) => {
return new Promise((resolve, reject) => {
User.findOne(param, function(err, user) {
History.find(param, function(err, history) {
if (err) {
reject(err);
} else {
resolve(user)
resolve(history)
}
})
})
}


const getHistory = (param) => {
return new Promise((resolve, reject) => {
History.findOne(param, function(err, history) {
if (err) {
reject(err);
} else {
resolve(history)
}
})
})


}


module.exports = {
addHistoryData,
getHistory,
getList
}

0 comments on commit 36e1cda

Please sign in to comment.