From 1776e011f21f477fde30a716e05612fd70f5b8ee Mon Sep 17 00:00:00 2001
From: Gregory Campbell <gjcampbell777@gmail.com>
Date: Thu, 25 Nov 2021 21:40:34 -0500
Subject: [PATCH] Bug fix preventing deleteOneMsg from ever responding with 404
 as well as adding the unit test for deleteOneMsg 404 response

---
 controllers/msg.js |  4 ++--
 test/msg.js        | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/controllers/msg.js b/controllers/msg.js
index 3e03a81..022df84 100644
--- a/controllers/msg.js
+++ b/controllers/msg.js
@@ -84,9 +84,9 @@ const deleteOneMsg = (req, res) => {
 
     Msg.deleteOne({id:req.params.id}, (err, data) => {
     //if there's nothing to delete return a message
-    if( data.deletedCount == 0) return res.status(400).json({message: "Message can't be deleted, it doesn't exist."});
+    if (err) return res.status(404).json(`Something went wrong, please try again. ${err}`);
     //else if there's an error, return the err message
-    else if (err) return res.status(404).json(`Something went wrong, please try again. ${err}`);
+    else if( data.deletedCount == 0) return res.status(400).json({message: "Message can't be deleted, it doesn't exist."});
     //else, return the success message
     else return res.status(200).json({message: "Message deleted."});
     });
diff --git a/test/msg.js b/test/msg.js
index aadf862..65bd529 100644
--- a/test/msg.js
+++ b/test/msg.js
@@ -159,6 +159,18 @@ describe('DELETE /msg/:id', function () {
                 done();
             });
     });
+
+    it('respond with 404 error', function (done) {
+        request(app)
+            .delete('/msg/idisnonexisting')
+            .set('Accept', 'application/json')
+            .expect(404) //expecting HTTP status code
+            .expect('Content-Type', /json/) // expecting content value
+            .end((err) => {
+                if (err) return done(err);
+                done();
+            });
+    });
 });
 
 describe('DELETE /msg', function () {