arnaucube/openEventsPlatformServer
1
0
Fork 0
mirror of https://github.com/arnaucube/openEventsPlatformServer.git synced 2026-02-06 19:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

implemented add image to event, and sent it to the goImgServer

Browse Source
This commit is contained in:
arnaucode
2017-06-23 16:42:31 +02:00
parent 908233e842
commit 21757a4712
4 changed files with 255 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.js
View File

@@ -3,7 +3,7 @@ module.exports = {
'database': process.env.MONGO_DSN,*/ 'database': process.env.MONGO_DSN,*/
'secret': 'secretfortoken',// local version 'secret': 'secretfortoken',// local version
'database': 'mongodb://localhost/openeventsplatform', 'database': 'mongodb://localhost/openeventsplatform',
"port" : process.env.PORT || 3000, "port" : process.env.PORT || 3001,
"pageSize": 20 "pageSize": 20
}; };

127
controllers/eventController.js
View File

@@ -9,10 +9,10 @@ var eventModel = mongoose.model('eventModel');
var pageSize = config.pageSize; var pageSize = config.pageSize;
var request = require('request');
exports.getCategoriesList = function(req, res) { exports.getCategoriesList = function(req, res) {
var categoriesList=[ var categoriesList = [{
{
name: "esport" name: "esport"
}, },
{ {
@@ -35,8 +35,12 @@ exports.getCategoriesList = function(req, res) {
}; };
exports.getAllEvents = function(req, res) { exports.getAllEvents = function(req, res) {
eventModel.find({ eventModel.find({
date: {$gte: new Date()}, date: {
type: {$nin: ["alert"]}//cal filtrar per type d'event, aquí només agafem els type: alert $gte: new Date()
},
type: {
$nin: ["alert"]
} //cal filtrar per type d'event, aquí només agafem els type: alert
}) })
.lean() .lean()
.populate('user', 'username img shortDescription') .populate('user', 'username img shortDescription')
@@ -50,7 +54,9 @@ exports.getAllEvents = function(req, res) {
}; };
exports.getAllAlerts = function(req, res) { exports.getAllAlerts = function(req, res) {
eventModel.find({ eventModel.find({
date: {$gte: new Date()}, date: {
$gte: new Date()
},
type: "alert" type: "alert"
}) })
.lean() .lean()
@@ -65,13 +71,18 @@ exports.getAllAlerts = function(req, res) {
}; };
exports.getEventById = function(req, res) { exports.getEventById = function(req, res) {
eventModel.findOne({_id: req.params.eventid}) eventModel.findOne({
_id: req.params.eventid
})
.lean() .lean()
.populate('user', 'username img shortDescription') .populate('user', 'username img shortDescription')
.exec(function(err, event) { .exec(function(err, event) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
if (!event) { if (!event) {
res.json({success: false, message: 'event not found.'}); res.json({
success: false,
message: 'event not found.'
});
} else if (event) { } else if (event) {
res.status(200).jsonp(event); res.status(200).jsonp(event);
@@ -80,14 +91,33 @@ exports.getEventById = function (req, res) {
}; };
exports.addEvent = function(req, res) { function getRandomInt(min, max) {
userModel.findOne({'tokens.token': req.headers['x-access-token']}) min = Math.ceil(min);
.exec(function(err, user){ max = Math.floor(max);
if (err) return res.send(500, err.message); return Math.floor(Math.random() * (max - min)) + min; //The maximum is exclusive and the minimum is inclusive
if (!user) { }
console.log("user not found");
res.json({success: false, message: 'User not found.'}); function postImage(req, res, user, filename, fileImg) {
} else if (user) { url = "http://127.0.0.1:3050/image";
var importFile = function(fileImg) {
var decodedFile = new Buffer(fileImg, 'base64');
var r = request.post(url, function(err, httpResponse, body) {
if (err) {
console.log(err);
}
//console.log(body);
addNewEvent(req, res, user, body);
});
var form = r.form();
form.append('file', decodedFile, {
filename: filename + '.png'
});
}
importFile(fileImg);
}
function addNewEvent(req, res, user, imgUrl){
//adding random number to the url, to force ionic reload the image
req.body.img = imgUrl+ "?" + getRandomInt(1, 9999);
var event = new eventModel({ var event = new eventModel({
title: req.body.title, title: req.body.title,
description: req.body.description, description: req.body.description,
@@ -98,26 +128,51 @@ exports.addEvent = function(req, res) {
location: req.body.location, location: req.body.location,
user: user._id user: user._id
}); });
event.save(function(err, event) { event.save(function(err, event) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
user.events.push(event._id); user.events.push(event._id);
user.save(function(err, user) { user.save(function(err, user) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
exports.getAllEvents(req, res); req.params.eventid=event._id;
exports.getEventById(req, res);
}); });
}); //end of event.save }); //end of event.save
} }
});//end of usermodel.find exports.addEvent = function(req, res) {
}; userModel.findOne({
exports.addAlert = function(req, res) { 'tokens.token': req.headers['x-access-token']
userModel.findOne({'tokens.token': req.headers['x-access-token']}) })
.exec(function(err, user) { .exec(function(err, user) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
if (!user) { if (!user) {
console.log("user not found"); console.log("user not found");
res.json({success: false, message: 'User not found.'}); res.json({
success: false,
message: 'User not found.'
});
} else if (user) {
if (req.body.img) {
imgname = getRandomInt(1, 9999) + "_" + getRandomInt(1, 9999);
postImage(req, res, user, "event_" + imgname, req.body.img);
}else{
addNewEvent(req, res, user, "");
}
}
}); //end of usermodel.find
};
exports.addAlert = function(req, res) {
userModel.findOne({
'tokens.token': req.headers['x-access-token']
})
.exec(function(err, user) {
if (err) return res.send(500, err.message);
if (!user) {
console.log("user not found");
res.json({
success: false,
message: 'User not found.'
});
} else if (user) { } else if (user) {
var event = new eventModel({ var event = new eventModel({
title: req.body.title, title: req.body.title,
@@ -141,7 +196,9 @@ exports.addAlert = function(req, res) {
}); //end of usermodel.find }); //end of usermodel.find
}; };
exports.deleteEvent = function(req, res) { exports.deleteEvent = function(req, res) {
userModel.findOne({'tokens.token': req.headers['x-access-token']}) userModel.findOne({
'tokens.token': req.headers['x-access-token']
})
.exec(function(err, user) { .exec(function(err, user) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
eventModel.findOne({ eventModel.findOne({
@@ -150,8 +207,7 @@ exports.deleteEvent = function(req, res) {
}) })
.exec(function(err, event) { .exec(function(err, event) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
if(event.user.equals(user._id)) if (event.user.equals(user._id)) {
{
event.remove(function(err) { event.remove(function(err) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
@@ -175,14 +231,17 @@ això retorna els events d'aquests users que segueixes
*/ */
exports.getEventsByFollowingArray = function(req, res) { exports.getEventsByFollowingArray = function(req, res) {
if(req.body.users==null) /*if (req.body.users == null) {
{ res.status(200).jsonp([]);
res.status(200).jsonp(null); }*/
}
eventModel.find({ eventModel.find({
date: {$gte: new Date()}, date: {
$gte: new Date()
},
'user': req.body.users, 'user': req.body.users,
type: {$nin: ["alert"]}//cal filtrar per type d'event, aquí només agafem els type: alert type: {
$nin: ["alert"]
} //cal filtrar per type d'event, aquí només agafem els type: alert
}) })
.lean() .lean()
.populate('user', 'username img shortDescription') .populate('user', 'username img shortDescription')
@@ -191,6 +250,8 @@ exports.getEventsByFollowingArray = function(req, res) {
.skip(pageSize * Number(req.query.page)) .skip(pageSize * Number(req.query.page))
.exec(function(err, events) { .exec(function(err, events) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
console.log(events);
res.status(200).jsonp(events); res.status(200).jsonp(events);
}); });
}; };
@@ -202,7 +263,9 @@ això retorna els events d'aquests users que segueixes
*/ */
exports.getEventsByCategory = function(req, res) { exports.getEventsByCategory = function(req, res) {
eventModel.find({ eventModel.find({
date: {$gte: new Date()}, date: {
$gte: new Date()
},
'categories.name': req.params.category 'categories.name': req.params.category
}) })
.lean() .lean()

3
package.json
View File

@@ -15,6 +15,7 @@
"method-override": "^2.1.2", "method-override": "^2.1.2",
"mongoose": "latest", "mongoose": "latest",
"morgan": "latest", "morgan": "latest",
"mongoose-unique-validator": "^1.0.2" "mongoose-unique-validator": "^1.0.2",
"request": "^2.81.0"
} }
} }

7
server.js
View File

@@ -17,10 +17,13 @@ mongoose.connect(config.database, function(err, res) {
app.set('superSecret', config.secret); // secret variable app.set('superSecret', config.secret); // secret variable
// Middlewares // Middlewares
app.use(bodyParser.urlencoded({ /*app.use(bodyParser.urlencoded({
extended: false extended: false
})); }));
app.use(bodyParser.json()); app.use(bodyParser.json());*/
app.use(bodyParser.json({limit: '2mb'}));
app.use(bodyParser.urlencoded({limit: '2mb', extended: true}));
app.use(methodOverride()); app.use(methodOverride());
// use morgan to log requests to the console // use morgan to log requests to the console