Added article deletion

Author: Luciano Nooijen

controllers/articles.js

@@ -77,8 +77,11 @@ const getRelatedArticles = async id => {
     return articlesWithReadingTime;
 };
 
-const getRelatedArticlesToArticleObject = async (id, article) => {
+const addRelatedArticlesToArticleObject = async (id, article) => {
     const relatedArticles = await getRelatedArticles(id);
+    if (relatedArticles.length === 0) {
+        return article;
+    }
     const articleWithRelatedArticles = {
         ...article,
         related_articles: relatedArticles,
@@ -100,7 +103,7 @@ const getArticle = async id => {
         .where('articles.id', '=', id);
     const articlesWithReadingTime = addReadingTimeToArticles(articles);
     const articleBase = articlesWithReadingTime[0];
-    const article = await getRelatedArticlesToArticleObject(id, articleBase);
+    const article = await addRelatedArticlesToArticleObject(id, articleBase);
     return article;
 };
 
@@ -167,29 +170,34 @@ const addArticle = async article => {
     return createdArticle;
 };
 
-const modifyArticles = async (id, article) => {
+const modifyArticle = async (id, article) => {
 
 };
 
-const deleteArticle = async id =>
-    new Promise(resolve =>
-        knex('users')
-            .returning(['id'])
-            .where({ id })
-            .delete()
-            .then(data => resolve(data[0])),
-        ); // eslint-disable-line
+const deleteArticle = async id => {
+    await knex('related_articles')
+        .where({ article_id: id })
+        .orWhere({ related_article_id: id })
+        .delete();
+    await knex('article_content')
+        .where({ article_id: id })
+        .delete();
+    await knex('articles')
+        .where({ id })
+        .delete();
+    return { id };
+};
 
 module.exports = {
     listArticles,
     getRelatedArticles,
-    getRelatedArticlesToArticleObject,
+    addRelatedArticlesToArticleObject,
     calculateReadingTime,
     addReadingTimeToArticles,
     addToRelatedArticlesTable,
     getArticle,
     generateRelatedArticles,
     addArticle,
-    modifyArticles,
+    modifyArticle,
     deleteArticle,
 };

helpers/auth-helper.js

@@ -30,7 +30,7 @@ const checkPasswordHash = async (plainTextPassword, hashedPassword) => {
 const calculateDates = issuedAtParam => {
     const date = new Date();
     const issuedAt = issuedAtParam || date.setDate(date.getDate());
-    const issuedAtDate = new Date(issuedAt);
+    const issuedAtDate = new Date(issuedAt); // eslint-disable-next-line
     const expiryDate = issuedAtDate.setDate(issuedAtDate.getDate() + jwtExpiresInDays);
     const dates = {
         iat: issuedAt,

tests/controllers/articles.test.ts

@@ -3,14 +3,14 @@ import { useTestDatabase } from '../config/index';
 const {
     listArticles,
     getRelatedArticles,
-    getRelatedArticlesToArticleObject,
+    addRelatedArticlesToArticleObject,
     calculateReadingTime,
     addReadingTimeToArticles,
     getArticle,
     generateRelatedArticles,
     addToRelatedArticlesTable,
     addArticle,
-    modifyArticles,
+    modifyArticle,
     deleteArticle,
 } = require('../../controllers/articles');
 
@@ -196,12 +196,17 @@ describe('Articles Controller', () => {
         expect(typeof addedArticle.reading_time).toBe('number');
     });
 
-    // test('addArticle should work with custom posted_on', async () => {
+    // test('addArticle should work with custom posted_on', async () => { TODO:
     // });
 
     // test('modifyArticle should modify an article correctly', async () => {
-    // });
 
-    // test('deleteArticle should delete an article', async () => {
     // });
+
+    test('deleteArticle should delete an article', async () => {
+        expect.assertions(2);
+        return deleteArticle(1)
+            .then(data => expect(data.id).toBe(1))
+            .then(async () => expect(await getArticle(1)).toBeUndefined());
+    });
 });