surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Created all Tests with Mocha: User + Todo tables

Browse Source
This commit is contained in:
Paolo Arena
2019-02-07 00:52:48 +01:00
parent 779bd1cb63
commit 87378fe732
10 changed files with 309 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
server/router/todos_router.js
View File

@@ -2,6 +2,10 @@ const express = require('express');
const router = express.Router();
const webpush = require('web-push');
const tools = require('../tools/general');
var server_constants = require('../tools/server_constants');
var { authenticate } = require('../middleware/authenticate');
var mongoose = require('mongoose');
@@ -13,18 +17,27 @@ const _ = require('lodash');
const { ObjectID } = require('mongodb');
const allfieldTodo = ['userId', 'pos', 'category', 'descr', 'priority', 'completed', 'created_at', 'modify_at',
'completed_at', 'expiring_at', 'enableExpiring', 'id_prev', 'id_next', 'progress', 'modified'];
const allfieldTodoWithId = ['_id', ...allfieldTodo];
router.post('/:id', authenticate, (req, res) => {
router.post('/', authenticate, (req, res) => {
var body = _.pick(req.body, allfieldTodoWithId);
var body = _.pick(req.body, tools.allfieldTodoWithId());
var todo = new Todo(body);
console.log('POST ', todo.descr);
// tools.mylogshow('ID :', todo._id)
// tools.mylogshow('userid', todo.userId, req.user._id)
if (!('descr' in req.body)){
return res.status(400).send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC });
}
if (todo.userId !== String(req.user._id)) {
// I'm trying to write something not mine!
return res.status(404).send({ code: server_constants.RIS_CODE_TODO_CREATING_NOTMYUSER });
}
tools.mylog('POST ', todo.descr);
todo.modified = false;
if (!todo.descr) {
@@ -34,6 +47,7 @@ router.post('/:id', authenticate, (req, res) => {
sendNotificationToUser(todo.userId, 'New Todo', 'New Todo added!', '/' + todo.category, 'todo');
todo.save().then((doc) => {
// tools.mylogshow('ID SAVED :', doc._id)
res.send(doc);
}).catch((e) => {
console.log(e.message);
@@ -115,18 +129,24 @@ function sendNotificationToUser(userId, title, content, openUrl, tag) {
router.patch('/:id', authenticate, (req, res) => {
var id = req.params.id;
var body = _.pick(req.body, allfieldTodo);
var body = _.pick(req.body, tools.allfieldTodo());
if (!ObjectID.isValid(id)) {
console.log('ERROR: id not VALID', id);
tools.mylog('ERROR: id not VALID', id);
return res.status(404).send();
}
Todo.findByIdAndUpdate(id, {$set: body}, {new: true}).then((todo) => {
if (!todo) {
return res.status(404).send();
}
if (todo.userId !== String(req.user._id)) {
// I'm trying to write something not mine!
return res.status(404).send({ code: server_constants.RIS_CODE_TODO_CREATING_NOTMYUSER });
}
todo.modified = false;
res.send({todo});
@@ -140,10 +160,20 @@ router.patch('/:id', authenticate, (req, res) => {
router.get('/:userId', authenticate, (req, res) => {
var userId = req.params.userId;
console.log('GET : ', req.params);
// tools.mylogshow('GET : ', req.params);
if (!ObjectID.isValid(userId)) {
return res.status(404).send();
}
if (userId !== String(req.user._id)) {
// I'm trying to write something not mine!
return res.status(404).send({ code: server_constants.RIS_CODE_TODO_CREATING_NOTMYUSER });
}
// Extract all the todos of the userId only
Todo.findAllByUserId(userId).then((todos) => {
// tools.mylogshow('todos', todos)
res.send({ todos });
}).catch((e) => {
console.log(e);

52
server/router/users_router.js
View File

@@ -5,6 +5,8 @@ var { User } = require('../models/user');
var sendemail = require('../sendemail');
const tools = require('../tools/general');
var server_constants = require('../tools/server_constants');
const _ = require('lodash');
@@ -13,30 +15,18 @@ var reg = require('../reg/registration');
var { authenticate } = require('../middleware/authenticate');
function testing() {
return (process.env.TESTING_ON === '1')
}
function mylog(...args) {
if (!testing())
console.log(args)
}
function mylogshow(...args) {
console.log(args)
}
// POST /users
router.post('/', (req, res) => {
mylog("POST /users");
tools.mylog("POST /users");
var body = _.pick(req.body, ['email', 'password', 'username', 'idapp', 'keyappid', 'lang']);
var user = new User(body);
// mylog("LANG PASSATO = " + user.lang, "IDAPP", user.idapp);
// tools.mylog("LANG PASSATO = " + user.lang, "IDAPP", user.idapp);
user.linkreg = reg.getlinkregByEmail(body.email, body.username);
user.verified_email = false;
if (testing()) {
if (tools.testing()) {
user.verified_email = true;
}
@@ -44,7 +34,7 @@ router.post('/', (req, res) => {
User.findByUsername(user.username)
.then((usertrovato) => {
mylog("TROVATO USERNAME ? ", user.username, usertrovato);
tools.mylog("TROVATO USERNAME ? ", user.username, usertrovato);
if (usertrovato !== null) {
return user.generateAuthToken();
} else {
@@ -52,13 +42,13 @@ router.post('/', (req, res) => {
return 0;
}
}).then((token) => {
// mylog("passo il TOKEN: ", token);
// tools.mylog("passo il TOKEN: ", token);
res.header('x-auth', token).send(user);
// mylog("LINKREG = " + user.linkreg);
// tools.mylog("LINKREG = " + user.linkreg);
// Invia un'email all'utente
// mylog('process.env.TESTING_ON', process.env.TESTING_ON);
if (!testing()) {
// tools.mylog('process.env.TESTING_ON', process.env.TESTING_ON);
if (!tools.testing()) {
sendemail.sendEmail_Registration(res.locale, user.email, user.username, user.idapp, user.linkreg);
}
@@ -86,9 +76,9 @@ router.post('/login', (req, res) => {
var body = _.pick(req.body, ['username', 'password', 'idapp', 'keyappid', 'lang']);
var user = new User(body);
mylogshow("username: " + user.username + " pwd = " + user.password);
tools.mylog("username: " + user.username + " pwd = " + user.password);
mylogshow("user REC:", user);
tools.mylog("user REC:", user);
if (body.keyappid !== process.env.KEY_APP_ID)
return res.status(400).send();
@@ -96,9 +86,9 @@ router.post('/login', (req, res) => {
User.findByCredentials(user.username, user.password)
.then((user) => {
mylogshow("CREDENZIALI ! ");
tools.mylog("CREDENZIALI ! ");
if (!user) {
mylogshow("NOT FOUND !");
tools.mylogshow("NOT FOUND !");
res.status(404).send({ code: server_constants.RIS_CODE_LOGIN_ERR });
} else {
return user.generateAuthToken().then((token) => {
@@ -108,23 +98,23 @@ router.post('/login', (req, res) => {
usertosend.userId = user._id.toHexString();
usertosend.verified_email = user.verified_email;
// mylog("user.verified_email:" + user.verified_email);
// mylog("usertosend.userId", usertosend.userId);
// tools.mylog("user.verified_email:" + user.verified_email);
// tools.mylog("usertosend.userId", usertosend.userId);
// mylog("usertosend:");
// mylog(usertosend);
// tools.mylog("usertosend:");
// tools.mylog(usertosend);
res.header('x-auth', token).send(usertosend);
// mylog("TROVATOOO!");
// tools.mylog("TROVATOOO!");
});
}
}).catch((e) => {
mylog("ERR: " + e);
tools.mylog("ERR: " + e);
res.status(400).send({ code: server_constants.RIS_CODE_LOGIN_ERR_GENERIC });
});
});
router.delete('/me/token', authenticate, (req, res) => {
mylog("TOKENREM = " + req.token);
tools.mylog("TOKENREM = " + req.token);
req.user.removeToken(req.token).then(() => {
res.status(200).send();
}, () => {