From bff346127868491a66dcd36628a51881e0d72fce Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 24 Sep 2018 14:05:47 +0100 Subject: [PATCH] more work on the note endpoint, for now im going to work around it --- src/controllers/noteController.js | 15 +++++++++------ src/controllers/routes/router.js | 2 +- src/models/notes/notes.js | 6 ++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/controllers/noteController.js b/src/controllers/noteController.js index d9ba7cb..1f5254b 100644 --- a/src/controllers/noteController.js +++ b/src/controllers/noteController.js @@ -11,7 +11,7 @@ export class NoteController extends ControllerHandler { let content = req.body.text || null; let creatorid = req.user.id || undefined; - let group = req.body.parentgroup || undefined; + let group = req.body.parentgroup || null; let order = req.body.order || undefined; let user = req.user || undefined; @@ -23,13 +23,16 @@ export class NoteController extends ControllerHandler { return; } - + if (!order) { + errors.addError(422, 'Unprocessable entity'); + errors.endpoint(); + next(); + return; + } - if (!group) group == 0; + let id = await Notes.genID(); - - - // what the hecking heck is this code supoased to do you hecking idiot + Notes.newNote(id, content, creatorid, order); next(); } diff --git a/src/controllers/routes/router.js b/src/controllers/routes/router.js index caac794..2b944de 100644 --- a/src/controllers/routes/router.js +++ b/src/controllers/routes/router.js @@ -24,7 +24,7 @@ export class Router { app.get('/note/:endpoint', [MiddleWare.RateLimits.request, Controllers.PermaLinkController.getNote]); app.post('/auth/note', [MiddleWare.RateLimits.request, MiddleWare.Auth.authUser, Controllers.NoteController.newNote]); // Passes through auth middleware which if authenticated passes user obj and token to the note handling function for it to deal with - app.post('/aith/group', [MiddleWare.RateLimits.request, MiddleWare.Auth.authUser]); + app.post('/auth/group', [MiddleWare.RateLimits.request, MiddleWare.Auth.authUser]); app.get('/auth/getallnotes', [MiddleWare.RateLimits.request, MiddleWare.Auth.authUser]); app.get('/auth/getallgroups', [MiddleWare.RateLimits.request, MiddleWare.Auth.authUser]); diff --git a/src/models/notes/notes.js b/src/models/notes/notes.js index 1bad473..6f6284d 100644 --- a/src/models/notes/notes.js +++ b/src/models/notes/notes.js @@ -2,10 +2,8 @@ import {Groups} from './groups'; import {Database} from '../database/database'; export class Notes extends Groups { - static async newNote(id, content, creatorid, order) { - - - Database.notes.newNote(id, null, ) + static async newNote(id, content, creatorid, order) { + Database.note.newNote(id, content, creatorid, order, null); } static async genID() {