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

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

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
}; };

View File

@@ -7,161 +7,217 @@ var mongoose = require('mongoose');
var userModel = mongoose.model('userModel'); var userModel = mongoose.model('userModel');
var eventModel = mongoose.model('eventModel'); 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" },
}, {
{ name: "xerrada"
name: "xerrada" },
}, {
{ name: "taller"
name: "taller" },
}, {
{ name: "festa"
name: "festa" },
}, {
{ name: "concert"
name: "concert" },
}, {
{ name: "musica"
name: "musica" }
} ]
]
res.status(200).jsonp(categoriesList); res.status(200).jsonp(categoriesList);
}; };
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()
}) },
.lean() type: {
.populate('user', 'username img shortDescription') $nin: ["alert"]
.sort('date') } //cal filtrar per type d'event, aquí només agafem els type: alert
.limit(pageSize) })
.skip(pageSize * Number(req.query.page)) .lean()
.exec(function (err, events) { .populate('user', 'username img shortDescription')
if (err) return res.send(500, err.message); .sort('date')
res.status(200).jsonp(events); .limit(pageSize)
}); .skip(pageSize * Number(req.query.page))
.exec(function(err, events) {
if (err) return res.send(500, err.message);
res.status(200).jsonp(events);
});
}; };
exports.getAllAlerts = function(req, res) { exports.getAllAlerts = function(req, res) {
eventModel.find({ eventModel.find({
date: {$gte: new Date()}, date: {
type: "alert" $gte: new Date()
}) },
.lean() type: "alert"
.populate('user', 'username img shortDescription') })
.sort('date') .lean()
.limit(pageSize) .populate('user', 'username img shortDescription')
.skip(pageSize * Number(req.query.page)) .sort('date')
.exec(function (err, events) { .limit(pageSize)
if (err) return res.send(500, err.message); .skip(pageSize * Number(req.query.page))
res.status(200).jsonp(events); .exec(function(err, events) {
}); if (err) return res.send(500, err.message);
res.status(200).jsonp(events);
});
}; };
exports.getEventById = function (req, res) { exports.getEventById = function(req, res) {
eventModel.findOne({_id: req.params.eventid}) eventModel.findOne({
.lean() _id: req.params.eventid
.populate('user', 'username img shortDescription') })
.exec(function (err, event) { .lean()
if (err) return res.send(500, err.message); .populate('user', 'username img shortDescription')
if (!event) { .exec(function(err, event) {
res.json({success: false, message: 'event not found.'}); if (err) return res.send(500, err.message);
} else if (event) { if (!event) {
res.json({
res.status(200).jsonp(event); success: false,
} message: 'event not found.'
});
};
exports.addEvent = 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) {
var event = new eventModel({
title: req.body.title,
description: req.body.description,
img: req.body.img,
date: req.body.date,
categories: req.body.categories,
generateddate: Date(),
location: req.body.location,
user: user._id
});
event.save(function(err, event) {
if(err) return res.send(500, err.message);
user.events.push(event._id);
user.save(function (err, user) {
if (err) return res.send(500, err.message);
exports.getAllEvents(req, res);
}); });
});//end of event.save } else if (event) {
}
});//end of usermodel.find res.status(200).jsonp(event);
}
});
};
function getRandomInt(min, max) {
min = Math.ceil(min);
max = Math.floor(max);
return Math.floor(Math.random() * (max - min)) + min; //The maximum is exclusive and the minimum is inclusive
}
function postImage(req, res, user, filename, fileImg) {
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({
title: req.body.title,
description: req.body.description,
img: req.body.img,
date: req.body.date,
categories: req.body.categories,
generateddate: Date(),
location: req.body.location,
user: user._id
});
event.save(function(err, event) {
if (err) return res.send(500, err.message);
user.events.push(event._id);
user.save(function(err, user) {
if (err) return res.send(500, err.message);
req.params.eventid=event._id;
exports.getEventById(req, res);
});
}); //end of event.save
}
exports.addEvent = 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) {
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) { exports.addAlert = function(req, res) {
userModel.findOne({'tokens.token': req.headers['x-access-token']}) userModel.findOne({
.exec(function(err, user){ 'tokens.token': req.headers['x-access-token']
if (err) return res.send(500, err.message); })
if (!user) { .exec(function(err, user) {
console.log("user not found"); if (err) return res.send(500, err.message);
res.json({success: false, message: 'User not found.'}); if (!user) {
} else if (user) { console.log("user not found");
var event = new eventModel({ res.json({
title: req.body.title, success: false,
description: req.body.description, message: 'User not found.'
date: req.body.date,
generateddate: Date(),
user: user._id,
type: "alert"
});
event.save(function(err, event) {
if(err) return res.send(500, err.message);
user.events.push(event._id);
user.save(function (err, user) {
if (err) return res.send(500, err.message);
exports.getAllEvents(req, res);
}); });
});//end of event.save } else if (user) {
} var event = new eventModel({
});//end of usermodel.find title: req.body.title,
description: req.body.description,
date: req.body.date,
generateddate: Date(),
user: user._id,
type: "alert"
});
event.save(function(err, event) {
if (err) return res.send(500, err.message);
user.events.push(event._id);
user.save(function(err, user) {
if (err) return res.send(500, err.message);
exports.getAllEvents(req, res);
});
}); //end of event.save
}
}); //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({
.exec(function(err, user){ 'tokens.token': req.headers['x-access-token']
if (err) return res.send(500, err.message); })
eventModel.findOne({ .exec(function(err, user) {
_id: req.params.eventid, if (err) return res.send(500, err.message);
user: user._id eventModel.findOne({
}) _id: req.params.eventid,
.exec(function(err, event) { user: user._id
if (err) return res.send(500, err.message); })
if(event.user.equals(user._id)) .exec(function(err, event) {
{ if (err) return res.send(500, err.message);
event.remove(function(err) { if (event.user.equals(user._id)) {
if(err) return res.send(500, err.message); event.remove(function(err) {
if (err) return res.send(500, err.message);
console.log("deleted"); console.log("deleted");
exports.getAllEvents(req, res); exports.getAllEvents(req, res);
}); });
} }
}); });
}); });
};//funciona, pero no esborra les referències dels users als events que s'esborren. Més endavant caldria fer-ho. }; //funciona, pero no esborra les referències dels users als events que s'esborren. Més endavant caldria fer-ho.
/* /*
un get events by following, que seria: un get events by following, que seria:
@@ -175,24 +231,29 @@ 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: {
date: {$gte: new Date()}, $gte: new Date()
'user': req.body.users, },
type: {$nin: ["alert"]}//cal filtrar per type d'event, aquí només agafem els type: alert 'user': req.body.users,
}) type: {
.lean() $nin: ["alert"]
.populate('user', 'username img shortDescription') } //cal filtrar per type d'event, aquí només agafem els type: alert
.sort('date') })
.limit(pageSize) .lean()
.skip(pageSize * Number(req.query.page)) .populate('user', 'username img shortDescription')
.exec(function (err, events) { .sort('date')
if (err) return res.send(500, err.message); .limit(pageSize)
res.status(200).jsonp(events); .skip(pageSize * Number(req.query.page))
}); .exec(function(err, events) {
if (err) return res.send(500, err.message);
console.log(events);
res.status(200).jsonp(events);
});
}; };
/* /*
@@ -201,35 +262,37 @@ s'envia un get /events/category/:category
això retorna els events d'aquests users que segueixes 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: {
'categories.name': req.params.category $gte: new Date()
}) },
.lean() 'categories.name': req.params.category
.populate('user', 'username img shortDescription') })
.sort('date') .lean()
.limit(pageSize) .populate('user', 'username img shortDescription')
.skip(pageSize * Number(req.query.page)) .sort('date')
.exec(function (err, events) { .limit(pageSize)
if (err) return res.send(500, err.message); .skip(pageSize * Number(req.query.page))
res.status(200).jsonp(events); .exec(function(err, events) {
}); if (err) return res.send(500, err.message);
res.status(200).jsonp(events);
});
}; };
exports.getEventsByDay = function(req, res) { exports.getEventsByDay = function(req, res) {
var dayRequested= new Date(req.params.day); var dayRequested = new Date(req.params.day);
eventModel.find({ eventModel.find({
date: { date: {
$gte: dayRequested $gte: dayRequested
} }
}) })
.lean() .lean()
.populate('user', 'username img shortDescription') .populate('user', 'username img shortDescription')
.sort('date') .sort('date')
.limit(pageSize) .limit(pageSize)
.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);
res.status(200).jsonp(events); res.status(200).jsonp(events);
}); });
}; };

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"
} }
} }

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