arnaucube/commonroutesServer
1
0
Fork 0
mirror of https://github.com/arnaucube/commonroutesServer.git synced 2026-02-28 05:26:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

RE-DOING and new Structure of project. Updating functionalities, and models

Browse Source
This commit is contained in:
arnaucode
2017-01-26 00:06:19 +01:00
parent 4961f8ca43
commit da188b9b39
9 changed files with 252 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

207
controllers/travelController.js
View File

@@ -1,129 +1,93 @@
//File: controllers/travelController.js //File: controllers/travelController.js
var mongoose = require('mongoose'); var mongoose = require('mongoose');
var travelModel = mongoose.model('travelModel');
var userModel = mongoose.model('userModel'); var userModel = mongoose.model('userModel');
var travelModel = mongoose.model('travelModel');
var joinModel = mongoose.model('joinModel');
var commentModel = mongoose.model('commentModel'); var commentModel = mongoose.model('commentModel');
//GET //GET
exports.findAllTravels = function(req, res) { exports.getAllTravels = function(req, res) {
//get travels with futures dates ($gte - greater than and equal than) //get travels with futures dates ($gte - greater than and equal than)
travelModel.find({date: {$gte: new Date()}}, function(err, travels) { travelModel.find({date: {$gte: new Date()}})
if(err) res.send(500, err.message); .limit(Number(req.query.pageSize))
.skip(Number(req.query.pageSize) * Number(req.query.page))
res.status(200).jsonp(travels); .exec(function (err, travels) {
}); if (err) return res.send(500, err.message);
res.status(200).jsonp(travels);
});
}; };
//GET exports.getTravelById = function (req, res) {
exports.findById = function(req, res) { travelModel.findOne({_id: req.params.travelid})
travelModel.findById(req.params.id, function(err, travel) { .lean()
if(err) return res.send(500, err.message); .populate('joins', 'username avatar')
.populate('comments', 'comment user')
.exec(function (err, travel) {
if (err) return res.send(500, err.message);
if (!travel) {
res.json({success: false, message: 'travel not found.'});
} else if (travel) {
console.log('GET /travel/' + req.params.id); res.status(200).jsonp(travel);
res.status(200).jsonp(travel); }
}); });
};
exports.findAllTravelsFromUsername = function(req, res) {
travelModel.find({
owner: req.params.username,
date: {$gte: new Date()}
}, function(err, travels) {
if (err) throw err;
if (!travels) {
res.json({ success: false, message: 'no travels for user' });
} else if (travels) {
console.log(travels);
// return the information including token as JSON
res.jsonp(travels);
}
});
}; };
exports.addTravel = function(req, res) { exports.addTravel = function(req, res) {
console.log('POST new travel, title: ' + req.body.title); userModel.findOne({'token': req.headers['x-access-token']})
userModel.find({ .exec(function(err, user){
token: req.headers['x-access-token'] if (err) return res.send(500, err.message);
}, function(err, users){ if (!user) {
var user=users[0]; console.log("user not found");
res.json({success: false, message: 'User not found.'});
var travel = new travelModel({ } else if (user) {
title: req.body.title, var travel = new travelModel({
description: req.body.description, title: req.body.title,
owner: user.username, description: req.body.description,
from: req.body.from, user: user._id,
to: req.body.to, from: req.body.from,
date: req.body.date, to: req.body.to,
periodic: req.body.periodic, date: req.body.date,
generateddate: req.body.generateddate, periodic: req.body.periodic,
seats: req.body.seats, generateddate: Date(),
package: req.body.package, seats: req.body.seats,
icon: req.body.icon, package: req.body.package,
phone: user.phone, collectivized: req.body.collectivized,
telegram: user.telegram, type: req.body.modality
collectivized: req.body.collectivized,
modality: req.body.modality
});
if(travel.title==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.description==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.from==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.to==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.date==undefined)
{
return res.status(500).jsonp("empty inputs");
}else if(travel.title==undefined)
{
return res.status(500).jsonp("empty inputs");
}
travel.save(function(err, travel) {
if(err) return res.send(500, err.message);
//res.status(200).jsonp(travel);
travelModel.find({date: {$gte: new Date()}}, function(err, travels) {
if(err) res.send(500, err.message);
res.status(200).jsonp(travels);
}); });
});//end of travel.save
travel.save(function(err, travel) {
if(err) return res.send(500, err.message);
user.travels.push(travel._id);
user.save(function (err, user) {
if (err) return res.send(500, err.message);
exports.getAllTravels(req, res);
});
});//end of travel.save
}
});//end of usermodel.find });//end of usermodel.find
}; };
//PUT
exports.updateTravel = function(req, res) { exports.updateTravel = function(req, res) {
ActivityModel.findById(req.params.id, function(err, tvshow) { userModel.findOne({'token': req.headers['x-access-token']})
tvshow.title = req.body.petId; .exec(function(err, user){
tvshow.year = req.body.year; if (err) return console.log(err);
tvshow.country = req.body.country; console.log(user);
tvshow.poster = req.body.poster; userModel.findOne({_id: user._id})
tvshow.seasons = req.body.seasons; .lean()
tvshow.genre = req.body.genre; .populate('travels', 'title from to date')
tvshow.summary = req.body.summary; .exec(function (err, user) {
if (err) return res.send(500, err.message);
if (!user) {
res.json({success: false, message: 'User not found.'});
} else if (user) {
tvshow.save(function(err) { res.status(200).jsonp(user);
if(err) return res.send(500, err.message); }
res.status(200).jsonp(tvshow); });
}); });
});
}; };
//DELETE //DELETE
@@ -149,14 +113,10 @@ exports.deleteTravel = function(req, res) {
}); });
}; };
/* join */ /* join */
exports.addJoin = function(req, res) { exports.addJoin = function(req, res) {
userModel.find({ userModel.findOne({'token': req.headers['x-access-token']})
token: req.headers['x-access-token'] .exec(function(err, user){
}, function(err, users){
var user=users[0];
travelModel.findById(req.params.travelId, function(err, travel){ travelModel.findById(req.params.travelId, function(err, travel){
console.log(travel.title); console.log(travel.title);
var join = { var join = {
@@ -248,6 +208,31 @@ exports.getJoinsByTravelId = function(req, res) {
}); });
}; };
exports.findAllTravelsFromUsername = function(req, res) {
travelModel.find({
owner: req.params.username,
date: {$gte: new Date()}
}, function(err, travels) {
if (err) throw err;
if (!travels) {
res.json({ success: false, message: 'no travels for user' });
} else if (travels) {
console.log(travels);
// return the information including token as JSON
res.jsonp(travels);
}
});
};
/* comment */ /* comment */
exports.addComment = function(req, res) { exports.addComment = function(req, res) {

130
controllers/userController.js
View File

@@ -14,16 +14,14 @@ var crypto = require('crypto');
/* */ /* */
//POST - Insert a new User in the DB //POST - Insert a new User in the DB
exports.addUser = function(req, res) { exports.signup = function(req, res) {
console.log('POST new user, name: ' + req.body.username);
//console.log(req.body);
var user = new userModel({ var user = new userModel({
username: req.body.username, username: req.body.username,
password: crypto.createHash('sha256').update(req.body.password).digest('base64'), password: crypto.createHash('sha256').update(req.body.password).digest('base64'),
description: req.body.description, description: req.body.description,
avatar: req.body.avatar, avatar: req.body.avatar,
mail: req.body.mail, email: req.body.email,
phone: req.body.phone, phone: req.body.phone,
telegram: req.body.telegram telegram: req.body.telegram
}); });
@@ -31,7 +29,7 @@ exports.addUser = function(req, res) {
return res.status(500).jsonp("empty inputs"); return res.status(500).jsonp("empty inputs");
} else if (user.password == undefined) { } else if (user.password == undefined) {
return res.status(500).jsonp("empty inputs"); return res.status(500).jsonp("empty inputs");
} else if (user.mail == undefined) { } else if (user.email == undefined) {
return res.status(500).jsonp("empty inputs"); return res.status(500).jsonp("empty inputs");
} }
@@ -71,7 +69,7 @@ exports.login = function(req, res) {
// if user is found and password is right // if user is found and password is right
// create a token // create a token
var token = jwt.sign(user, app.get('superSecret'), { var token = jwt.sign({foo: 'bar'}, app.get('superSecret'), {
//expiresInMinutes: 1440 // expires in 24 hours //expiresInMinutes: 1440 // expires in 24 hours
//expiresIn: '60m' //expiresIn: '60m'
}); });
@@ -98,65 +96,62 @@ exports.login = function(req, res) {
}; };
//GET - Return all Users in the DB //GET - Return all Users in the DB
exports.findAllUsers = function(req, res) { exports.getAllUsers = function(req, res) {
userModel.find(function(err, users) { userModel.find()
if (err) res.send(500, err.message); .limit(Number(req.query.pageSize))
.skip(Number(req.query.pageSize) * Number(req.query.page))
//password deletion .exec(function (err, users) {
for (var i = 0; i < users.length; i++) { if (err) return res.send(500, err.message);
users[i].password = ""; res.status(200).jsonp(users);
users[i].token = ""; });
console.log(users[i].password);
}
console.log('GET /users');
res.status(200).jsonp(users);
});
}; };
//GET - Return a User with specified ID //GET - Return a User with specified ID
exports.findById = function(req, res) { exports.getUserById = function (req, res) {
userModel.findById(req.params.id, function(err, user) { userModel.findOne({_id: req.params.userid})
.lean()
.populate('travels', 'title from to date')
.exec(function (err, user) {
if (err) return res.send(500, err.message); if (err) return res.send(500, err.message);
console.log('GET /users/' + req.params.id);
//password deletion
if (user != null) {
user.password = "";
users.token = "";
}
res.status(200).jsonp(user);
});
};
exports.findUserByUsername = function(req, res) {
userModel.find({
username: req.params.username
}, function(err, user) {
if (err) throw err;
if (!user) { if (!user) {
res.json({ res.json({success: false, message: 'User not found.'});
success: false,
message: 'no user found'
});
} else if (user) { } else if (user) {
// return the information including token as JSON
//res.jsonp(user);
user.password = "";
users.token = "";
console.log(user);
res.status(200).jsonp(user[0]);
res.status(200).jsonp(user);
} }
}); });
}; };
exports.updateUser = function (req, res) {
userModel.update({'token': req.headers['x-access-token']}, req.body,
function (err) {
if (err) return console.log(err);
console.log(user);
userModel.findOne({_id: user._id})
.lean()
.populate('travels', 'title from to date')
.exec(function (err, user) {
if (err) return res.send(500, err.message);
if (!user) {
res.json({success: false, message: 'User not found.'});
} else if (user) {
res.status(200).jsonp(user);
}
});
});
};
//DELETE - Delete a user with specified ID
exports.deleteUser = function(req, res) {
userModel.findOne({'token': req.headers['x-access-token']})
.exec(function(err, user) {
user.remove(function(err) {
if (err) return res.send(500, err.message);
res.status(200).jsonp("deleted");
})
});
};
/* fav */ /* fav */
exports.addFav = function(req, res) { exports.addFav = function(req, res) {
var tokenuser; var tokenuser;
@@ -238,34 +233,3 @@ exports.doUnfav = function(req, res) {
}); });
}); });
}; };
//PUT - Update a user already exists
exports.updateUser = function(req, res) {
userModel.findById(req.params.id, function(err, user) {
user.username = req.body.username;
user.password = md5(req.body.password);
user.description = req.body.description;
user.avatar = req.body.avatar;
user.mail = req.body.mail;
user.phone = req.body.phone;
user.telegram = req.body.telegram;
user.save(function(err) {
if (err) return res.send(500, err.message);
user.password = "";
users.token = "";
res.status(200).jsonp(user);
});
});
};
//DELETE - Delete a user with specified ID
exports.deleteUser = function(req, res) {
userModel.findById(req.params.id, function(err, user) {
user.remove(function(err) {
if (err) return res.send(500, err.message);
res.status(200).jsonp(req.params.id);
console.log('DELETE /users/' + req.params.id);
})
});
};

14
models/carModel.js
View File

@@ -1,14 +0,0 @@
var mongoose = require('mongoose'),
Schema = mongoose.Schema;
var carSchema = new Schema({
title: { type: String },
description: { type: String },
owner: { type: String },
zone: { type: String },
available: { type: Boolean },
generateddate: { type: Date },
seats: { type: Number }
})
module.exports = mongoose.model('carModel', carSchema);

9
models/commentModel.js
View File

@@ -3,11 +3,10 @@ var mongoose = require('mongoose'),
var commentSchema = new Schema({ var commentSchema = new Schema({
travelId: { type: String },
commentUserId: { type: String },
commentUsername: { type: String },
comment: { type: String }, comment: { type: String },
commentAvatar: { type: String } user: {
type: mongoose.Schema.Types.ObjectId,
ref: 'userModel'
}
}); });
module.exports = mongoose.model('commentModel', commentSchema); module.exports = mongoose.model('commentModel', commentSchema);

13
models/joinModel.js
View File

@@ -1,13 +0,0 @@
var mongoose = require('mongoose'),
Schema = mongoose.Schema;
var joinSchema = new Schema({
travelId: { type: String },
joinedUserId: { type: String },
joinedUsername: { type: String },
acceptedUserId: { type: String },
joinedAvatar: { type: String }
});
module.exports = mongoose.model('joinModel', joinSchema);

15
models/needtravelModel.js
View File

@@ -1,15 +0,0 @@
var mongoose = require('mongoose'),
Schema = mongoose.Schema;
var needtravelSchema = new Schema({
title: { type: String },
description: { type: String },
owner: { type: String },
from: { type: String },
to: { type: String },
date: { type: Date },
generateddate: { type: Date },
seats: { type: Number }
})
module.exports = mongoose.model('needtravelModel', needtravelSchema);

30
models/travelModel.js
View File

@@ -3,32 +3,28 @@ var mongoose = require('mongoose'),
var travelSchema = new Schema({ var travelSchema = new Schema({
title: { type: String }, title: { type: String, required: true },
description: { type: String }, description: { type: String },
owner: { type: String }, user: {
from: { type: String }, type: mongoose.Schema.Types.ObjectId,
to: { type: String }, ref: 'userModel'
},
from: { type: String, required: true },
to: { type: String, required: true },
date: { type: Date }, date: { type: Date },
periodic: { type: Boolean }, periodic: { type: Boolean },
generateddate: { type: Date }, generateddate: { type: Date },
seats: { type: Number }, seats: { type: Number, required: true },
package: { type: Boolean }, package: { type: Boolean },
icon: { type: String },
phone: { type: Number },
telegram: { type: String },
collectivized: { type: Boolean }, collectivized: { type: Boolean },
modality: { type: String }, //if is an offering travel or asking for travel type: { type: String }, //if is an offering travel or asking for travel
joins: [{ joins: [{
joinedUserId: { type: String }, type: mongoose.Schema.Types.ObjectId,
joinedUsername: { type: String }, ref: 'userModel'
acceptedUserId: { type: String },
joinedAvatar: { type: String }
}], }],
comments: [{ comments: [{
commentUserId: { type: String }, type: mongoose.Schema.Types.ObjectId,
commentUsername: { type: String }, ref: 'commentModel'
comment: { type: String },
commentAvatar: { type: String }
}] }]
}) })
module.exports = mongoose.model('travelModel', travelSchema); module.exports = mongoose.model('travelModel', travelSchema);

40
models/userModel.js
View File

@@ -5,30 +5,40 @@ var mongooseUniqueValidator = require('mongoose-unique-validator');
var userSchema = new Schema({ var userSchema = new Schema({
username: { type: String, unique: true }, username: { type: String, required: true, unique: true },
password: { type: String }, password: { type: String, required: true, selected: false },
token: { type: String }, token: { type: String, selected: false },
description: { type: String }, description: { type: String },
avatar: { type: String }, avatar: { type: String },
mail: { type: String }, email: { type: String, required: true },
phone: { type: String }, phone: { type: String },
telegram: { type: String }, telegram: { type: String },
valorations: [{ valorations: [{
username: { type: String }, user: {
value: { type: Number }, type: mongoose.Schema.Types.ObjectId,
comment: { type: String } ref: 'userModel'
},
value: { type: Number },
comment: { type: String }
}], }],
favs: [{ favs: [{
username: { type: String }, user: {
userId: { type: String }, type: mongoose.Schema.Types.ObjectId,
avatar: { type: String } ref: 'userModel'
},
date: {type: Date}
}],
travels: [{
type: mongoose.Schema.Types.ObjectId,
ref: 'travelModel'
}], }],
notifications: [{ notifications: [{
type: { type: String },//fav, comment, join state: {type: String},//viewed, pendent
otherusername: { type: String }, message: {type: String},
description: { type: String }, link: {type: String},//aquí oju, a la app i a la web calen links diferents, però ho podem fer posant sempre a la app i a la web el prefix del link (#!/app) o (#/app/), i després afegint-hi la pàgina on volem enviar el routing, per exemple (dashboard)
date: { type: Date }, icon: {type: String},
link: { type: String } date: {type: Date},
dateviewed: {type: Date}
}] }]
}) })

135
server.js
View File

@@ -1,24 +1,26 @@
var express = require("express"), var express = require("express"),
app = express(), app = express(),
bodyParser = require("body-parser"), bodyParser = require("body-parser"),
methodOverride = require("method-override"), methodOverride = require("method-override"),
mongoose = require('mongoose'); mongoose = require('mongoose');
var morgan = require('morgan'); var morgan = require('morgan');
var jwt = require('jsonwebtoken'); // used to create, sign, and verify tokens var jwt = require('jsonwebtoken'); // used to create, sign, and verify tokens
var config = require('./config'); // get our config file var config = require('./config'); // get our config file
mongoose.Promise = global.Promise; mongoose.Promise = global.Promise;
// Connection to DB // Connection to DB
mongoose.connect(config.database, function(err, res) { mongoose.connect(config.database, function(err, res) {
if(err) throw err; if (err) throw err;
console.log('Connected to Database'); console.log('Connected to Database');
}); });
app.set('superSecret', config.secret); // secret variable app.set('superSecret', config.secret); // secret variable
// Middlewares // Middlewares
app.use(bodyParser.urlencoded({ extended: false })); app.use(bodyParser.urlencoded({
extended: false
}));
app.use(bodyParser.json()); app.use(bodyParser.json());
app.use(methodOverride()); app.use(methodOverride());
@@ -26,12 +28,11 @@ app.use(methodOverride());
app.use(morgan('dev')); app.use(morgan('dev'));
// Import Models and controllers // Import Models and controllers
var userMdl = require('./models/userModel')(app, mongoose); var userMdl = require('./models/userModel')(app, mongoose);
var userCtrl = require('./controllers/userController'); var userCtrl = require('./controllers/userController');
var travelMdl = require('./models/travelModel')(app, mongoose); var travelMdl = require('./models/travelModel')(app, mongoose);
var joinMdl = require('./models/joinModel')(app, mongoose); var commentMdl = require('./models/commentModel')(app, mongoose);
var commentMdl = require('./models/commentModel')(app, mongoose);
var travelCtrl = require('./controllers/travelController'); var travelCtrl = require('./controllers/travelController');
/*// Example Route /*// Example Route
@@ -45,82 +46,80 @@ app.use(express.static(__dirname + '/www'));
//CORS //CORS
app.use(function(req, res, next) { app.use(function(req, res, next) {
res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Origin", "*");
res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS'); res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS');
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Access-Token"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Access-Token");
next(); next();
}); });
// API routes ------------------------------------------------------ // API routes ------------------------------------------------------
var apiRoutes = express.Router(); var apiRoutes = express.Router();
apiRoutes.route('/users') apiRoutes.route('/login')
.get(userCtrl.findAllUsers)
.post(userCtrl.addUser);
apiRoutes.route('/users/:id')
.get(userCtrl.findById);
apiRoutes.route('/users/byusername/:username')
.get(userCtrl.findUserByUsername);
apiRoutes.route('/travels/user/:username')
.get(travelCtrl.findAllTravelsFromUsername);
apiRoutes.route('/auth')
.post(userCtrl.login); .post(userCtrl.login);
apiRoutes.route('/signup')
.post(userCtrl.signup);
apiRoutes.route('/users')
.get(userCtrl.getAllUsers);
apiRoutes.route('/users/getById/:userid')
.get(userCtrl.getUserById);
apiRoutes.route('/travels') apiRoutes.route('/travels')
.get(travelCtrl.findAllTravels); .get(travelCtrl.getAllTravels);
apiRoutes.route('/travels/getById/:travelid')
.get(travelCtrl.getTravelById);
apiRoutes.route('/travels/:id')
.get(travelCtrl.findById);
apiRoutes.route('/travels/join/:travelId')
.get(travelCtrl.getJoinsByTravelId);
apiRoutes.route('/travels/comment/:travelId')
.get(travelCtrl.getCommentsByTravelId);
// OJU AQUÏ TREC la verificació de token temporalment, per fer les proves des de l'app // OJU AQUÏ TREC la verificació de token temporalment, per fer les proves des de l'app
// route middleware to verify a token // route middleware to verify a token
apiRoutes.use(function(req, res, next) { apiRoutes.use(function(req, res, next) {
// check header or url parameters or post parameters for token // check header or url parameters or post parameters for token
var token = req.body.token || req.query.token || req.headers['x-access-token']; var token = req.body.token || req.query.token || req.headers['x-access-token'];
// decode token // decode token
if (token) { if (token) {
// verifies secret and checks exp // verifies secret and checks exp
jwt.verify(token, app.get('superSecret'), function(err, decoded) { jwt.verify(token, app.get('superSecret'), function(err, decoded) {
if (err) { if (err) {
return res.json({ success: false, message: 'Failed to authenticate token.' }); return res.json({
} else { success: false,
// if everything is good, save to request for use in other routes message: 'Failed to authenticate token.'
req.decoded = decoded; });
//console.log("decoded " + decoded); } else {
next(); // if everything is good, save to request for use in other routes
} req.decoded = decoded;
}); //console.log("decoded " + decoded);
next();
}
});
} else { } else {
// if there is no token // if there is no token
// return an error // return an error
return res.status(201).send({ return res.status(201).send({
success: false, success: false,
message: 'No token provided.' message: 'No token provided.'
}); });
} }
}); //fi verificació de token }); //fi verificació de token
apiRoutes.route('/users/:id') apiRoutes.route('/users/:id')
.put(userCtrl.updateUser) .put(userCtrl.updateUser)
.delete(userCtrl.deleteUser); .delete(userCtrl.deleteUser);
apiRoutes.route('/travels') apiRoutes.route('/travels')
.post(travelCtrl.addTravel); .post(travelCtrl.addTravel);
//FINS AQUÏ COMPROVAT
apiRoutes.route('/travels/:id') apiRoutes.route('/travels/:id')
.put(travelCtrl.updateTravel) .put(travelCtrl.updateTravel)
.delete(travelCtrl.deleteTravel); .delete(travelCtrl.deleteTravel);
apiRoutes.route('/travels/addJoin/:travelId')
.get(travelCtrl.getJoinsByTravelId);
apiRoutes.route('/travels/comment/:travelId')
.get(travelCtrl.getCommentsByTravelId);
/*apiRoutes.route('/travels/join/:travelId') /*apiRoutes.route('/travels/join/:travelId')
.post(travelCtrl.addJoin); .post(travelCtrl.addJoin);
@@ -145,5 +144,5 @@ app.use('/api', apiRoutes);
// Start server // Start server
app.listen(config.port, function() { app.listen(config.port, function() {
console.log("Node server running on http://localhost:3000"); console.log("Node server running on http://localhost:3000");
}); });