BROKEN - big bug with endpoints and controllers not doing what they are supoased to and error handling

This commit is contained in:
Ben
2018-11-14 16:04:37 +00:00
parent 6a8df5045c
commit a40fbabfb4
6 changed files with 29 additions and 31 deletions

View File

@@ -1,29 +1,27 @@
import {ControllerHandler} from './controllerHandler';
import {API} from './api/api';
import {Notes} from '../models/notes/notes';
import {Logger} from '../models/logger'
export class NoteController extends ControllerHandler {
static async newNote(req, res, next) {
const errors = new API.errors(res);
const content = req.body.text || null;
const creatorid = req.user.id || undefined;
const group = req.body.parentgroup || undefined;
let order = req.body.order || undefined;
const user = req.user || undefined;
if (!creatorid || !user) {
if (!user) {
errors.addError(403, 'Forbidden');
errors.endpoint();
next();
next(errors);
return;
}
if (!order) {
errors.addError(422, 'Unprocessable entity');
errors.endpoint();
next();
next(errors);
return;
}
@@ -31,22 +29,20 @@ export class NoteController extends ControllerHandler {
let success;
if (!group) {
success = await Notes.newNote(id, content, creatorid, order);
success = await Notes.newNote(id, content, req.user, order);
} else {
const doesExist = await Notes.doesGroupExist(user.id, parentgroup);
if (!doesExist) {
errors.addError(422, 'Unprocessable entity', 'You are trying to create a note for a group that does not exist');
errors.endpoint();
next();
next(errors);
return;
}
success = await Notes.newGroupedNote(id, content, creatorid, order, parentgroup);
success = await Notes.newGroupedNote(id, content, req.user, order, parentgroup);
}
if (success == -1) {
errors.addError(500, 'Internal server error');
errors.endpoint();
next();
next(errors);
return;
}
@@ -58,10 +54,10 @@ export class NoteController extends ControllerHandler {
// id: id,
// content: content,
// parentgroup: parentgroup,
// creatorid: creatorid,
// req.user: req.user,
// order: order,
// catergory: null,
// endpoint: null,
// lastupdated: new Date().getTime()
// static async newNote(id, content, creatorid, order, parentgroup) {
// static async newNote(id, content, req.user, order, parentgroup) {