From b629d8c245074e2686673f7ac0b11ec4acec2623 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Tue, 27 Nov 2018 19:57:21 +1100 Subject: [PATCH] Added Update Article. --- private/blog/Articles.js | 9 +++ .../database/queries/blog/updateArticle.sql | 12 +++ .../server/api/methods/blog/CreateBlogPost.js | 6 +- .../server/api/methods/blog/GetBlogArticle.js | 2 +- .../api/methods/blog/UpdateBlogArticle.js | 75 +++++++++++++++++++ 5 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 private/database/queries/blog/updateArticle.sql create mode 100644 private/server/api/methods/blog/UpdateBlogArticle.js diff --git a/private/blog/Articles.js b/private/blog/Articles.js index e216b9a..0edcdff 100644 --- a/private/blog/Articles.js +++ b/private/blog/Articles.js @@ -65,6 +65,7 @@ module.exports = class Articles extends DatabaseInterface { } + async addArticle(handle, title, image, shortDescription, description, date) { if(!date) date = new Date(); let article = await this.getDatabase().one('addArticle', { @@ -73,4 +74,12 @@ module.exports = class Articles extends DatabaseInterface { this.store.flush();//In future support my wildcard syntax to make this no longer necessary. return article; } + + + + async updateArticle(article) { + let newArticle = await this.getDatabase().one('updateArticle', article); + this.store.flush(); + return newArticle; + } } diff --git a/private/database/queries/blog/updateArticle.sql b/private/database/queries/blog/updateArticle.sql new file mode 100644 index 0000000..9a364ea --- /dev/null +++ b/private/database/queries/blog/updateArticle.sql @@ -0,0 +1,12 @@ +UPDATE + "BlogArticles" +SET + "title"=${title}, + "image"=${image}, + "shortDescription"=${shortDescription}, + "description"=${description} +WHERE + "id"=${id} +RETURNING + * +; diff --git a/private/server/api/methods/blog/CreateBlogPost.js b/private/server/api/methods/blog/CreateBlogPost.js index eac806e..331dc0c 100644 --- a/private/server/api/methods/blog/CreateBlogPost.js +++ b/private/server/api/methods/blog/CreateBlogPost.js @@ -46,9 +46,9 @@ module.exports = class GetBlogArticle extends APIHandler { async handle(request) { //Until we have the server running passport or some other auth service... - if(!request.hasString('password', 128)) return { ok: false, data: ERRORS.password }; + if(!request.hasString('password', 128)) return { ok: 401, data: ERRORS.password }; let password = request.getString('password', 128); - if(password !== request.getApp().getConfig().get('admin.password')) return { ok: false, data: ERRORS.password }; + if(password !== request.getApp().getConfig().get('admin.password')) return { ok: 401, data: ERRORS.password }; //Everything after this point should be fine to keep. if(!request.hasString('title', LENGTHS.title)) return { ok: false, data: ERRORS.title }; @@ -81,6 +81,6 @@ module.exports = class GetBlogArticle extends APIHandler { return { ok: 500, data: ERRORS.internal }; } - return { ok: true, data: article }; + return { ok: 201, data: article }; } } diff --git a/private/server/api/methods/blog/GetBlogArticle.js b/private/server/api/methods/blog/GetBlogArticle.js index 649e5db..ffa0986 100644 --- a/private/server/api/methods/blog/GetBlogArticle.js +++ b/private/server/api/methods/blog/GetBlogArticle.js @@ -39,7 +39,7 @@ module.exports = class GetBlogArticle extends APIHandler { let handle = request.getApp().createHandle(request.getString('article', 128)); let article = await request.getApp().getArticles().getArticleByHandle(handle); - if(!article) return { ok: false, data: ERRORS.notFound }; + if(!article) return { ok: 404, data: ERRORS.notFound }; return { ok: true, diff --git a/private/server/api/methods/blog/UpdateBlogArticle.js b/private/server/api/methods/blog/UpdateBlogArticle.js new file mode 100644 index 0000000..a691f1f --- /dev/null +++ b/private/server/api/methods/blog/UpdateBlogArticle.js @@ -0,0 +1,75 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +const APIHandler = require('./../../APIHandler'); + +const LENGTHS = { + title: 128, + image: 512, + shortDescription: 2048, + description: 65536 +}; + +const ERRORS = { + password: 'Missing, or invalid password', + missingHandle: "Missing article handle.", + notFound: "Cannot find that article.", + internal: 'An internal error occurred' +}; + +module.exports = class GetBlogArticle extends APIHandler { + constructor(api) { + super(api, ['PUT', 'GET'], '/blog/update'); + } + + async handle(request) { + //Until we have the server running passport or some other auth service... + if(!request.hasString('password', 128)) return { ok: 401, data: ERRORS.password }; + let password = request.getString('password', 128); + if(password !== request.getApp().getConfig().get('admin.password')) return { ok: 401, data: ERRORS.password }; + //Everything after this point should be fine to keep. + + if(!request.hasString('article', 128)) return { ok: false, data: ERRORS.missingHandle }; + + let handle = request.getApp().createHandle(request.getString('article', 128)); + let article = await request.getApp().getArticles().getArticleByHandle(handle); + if(!article) return { ok: 404, data: ERRORS.notFound }; + + if(request.hasString('title', LENGTHS.title)) article.title = request.getString('title', LENGTHS.title); + if(request.hasString('image', LENGTHS.image)) article.image = request.getString('image', LENGTHS.image); + if(request.hasString('shortDescription', LENGTHS.shortDescription)) article.shortDescription = request.getString('shortDescription', LENGTHS.shortDescription); + if(request.hasString('description', LENGTHS.description)) article.description = request.getString('description', LENGTHS.description); + + try { + await request.getApp().getArticles().updateArticle(article); + } catch(e) { + console.error(e); + return { ok: 500, data: ERRORS.internal }; + } + + return { + ok: true, + data: article + }; + } +}