Delete query improvements

Author: Luciano Nooijen

controllers/authors.js

@@ -40,8 +40,8 @@ const modifyAuthor = async (id, author) => {
     return modifiedAuthor[0];
 };
 
-const deleteAuthor = async id => {
-    return new Promise(resolve => {
+const deleteAuthor = async id =>
+    new Promise(resolve => {
         knex('users')
             .where({ author_id: id })
             .update({ author_id: null }) // foreign key
@@ -53,7 +53,6 @@ const deleteAuthor = async id => {
                     .then(data => resolve(data[0])),
             ); // eslint-disable-line
     });
-};
 
 module.exports = {
     listAuthors,

controllers/users.js

@@ -74,10 +74,13 @@ const modifyUser = async (id, user) => {
 };
 
 const deleteUser = async id =>
-    knex('users')
-        .returning(['id'])
-        .where({ id })
-        .delete();
+    new Promise(resolve =>
+        knex('users')
+            .returning(['id'])
+            .where({ id })
+            .delete()
+            .then(data => resolve(data[0])),
+        ); // eslint-disable-line
 
 module.exports = {
     listUsers,

tests/database/users.test.js

@@ -83,8 +83,8 @@ describe('Test if Users CRUD operations are working correctly', () => {
 
     test('Deleting an User should return undefined', async () => {
         expect.assertions(2);
-        return deleteUser(1)
-            .then(data => expect(data.id).toBe(undefined))
-            .then(async () => expect(await getUser(1)).toBeUndefined());
+        return deleteUser(2)
+            .then(data => expect(data.id).toBe(2))
+            .then(async () => expect(await getUser(2)).toBeUndefined());
     });
 });