Merge pull request idurar#604 from idurar/dev

🥅 Imrpove Error Catch
eltonsoftware · Oct 25, 2023 · e3ed99c · e3ed99c
2 parents 2a406dd + 6199fe0
commit e3ed99c
Show file tree

Hide file tree

Showing 63 changed files with 278 additions and 367 deletions.
diff --git a/backend/controllers/appControllers/clientController/remove.js b/backend/controllers/appControllers/clientController/remove.js
@@ -48,12 +48,12 @@ const remove = async (req, res) => {
       result,
       message: 'Successfully Deleted the client by id: ' + id,
     });
-  } catch (err) {
+  } catch (error) {
     return res.status(500).json({
       success: false,
       result: null,
-      message: 'Oops there is an Error',
-      error: err,
+      message: error.message,
+      error: error,
     });
   }
 };

diff --git a/backend/controllers/appControllers/invoiceController/create.js b/backend/controllers/appControllers/invoiceController/create.js
@@ -71,23 +71,23 @@ const create = async (req, res) => {
       result: updateResult,
       message: 'Invoice created successfully',
     });
-  } catch (err) {
-    console.log(err);
-    // If err is thrown by Mongoose due to required validations
-    if (err.name == 'ValidationError') {
+  } catch (error) {
+    console.log(error);
+    // If error is thrown by Mongoose due to required validations
+    if (error.name == 'ValidationError') {
       return res.status(400).json({
         success: false,
         result: null,
-        error: err,
+        error: error,
         message: 'Required fields are not supplied',
       });
     } else {
       // Server Error
       return res.status(500).json({
         success: false,
         result: null,
-        error: err,
-        message: 'Oops there is an Error',
+        error: error,
+        message: error.message,
       });
     }
   }

diff --git a/backend/controllers/appControllers/invoiceController/mailInvoiceController.js b/backend/controllers/appControllers/invoiceController/mailInvoiceController.js
@@ -52,38 +52,38 @@ const sendMail = async (req, res) => {
           }
         }
       )
-      .catch((err) => {
+      .catch((error) => {
         return res.status(500).json({
           success: false,
           result: null,
-          error: err,
-          message: 'Oops there is an Error',
+          error: error,
+          message: error.message,
         });
       });
-  } catch (err) {
-    // If err is thrown by Mongoose due to required validations
-    if (err.name == 'ValidationError') {
+  } catch (error) {
+    // If error is thrown by Mongoose due to required validations
+    if (error.name == 'ValidationError') {
       return res.status(400).json({
         success: false,
         result: null,
-        error: err,
+        error: error,
         message: 'Required fields are not supplied',
       });
-    } else if (err.name == 'BSONTypeError') {
-      // If err is thrown by Mongoose due to invalid ID
+    } else if (error.name == 'BSONTypeError') {
+      // If error is thrown by Mongoose due to invalid ID
       return res.status(400).json({
         success: false,
         result: null,
-        error: err,
+        error: error,
         message: 'Invalid ID',
       });
     } else {
       // Server Error
       return res.status(500).json({
         success: false,
         result: null,
-        error: err,
-        message: 'Oops there is an Error',
+        error: error,
+        message: error.message,
       });
     }
   }

diff --git a/backend/controllers/appControllers/invoiceController/remove.js b/backend/controllers/appControllers/invoiceController/remove.js
@@ -33,12 +33,12 @@ const remove = async (req, res) => {
       result: deletedInvoice,
       message: 'Invoice deleted successfully',
     });
-  } catch (err) {
+  } catch (error) {
     return res.status(500).json({
       success: false,
       result: null,
-      error: err,
-      message: 'Oops there is an Error',
+      error: error,
+      message: error.message,
     });
   }
 };

diff --git a/backend/controllers/appControllers/invoiceController/summary.js b/backend/controllers/appControllers/invoiceController/summary.js
@@ -203,7 +203,7 @@ const summary = async (req, res) => {
     return res.status(500).json({
       success: false,
       result: null,
-      message: 'Oops there is an Error',
+      message: error.message,
       error: error,
     });
   }

diff --git a/backend/controllers/appControllers/invoiceController/update.js b/backend/controllers/appControllers/invoiceController/update.js
@@ -77,22 +77,22 @@ const update = async (req, res) => {
       result,
       message: 'we update this document by this id: ' + req.params.id,
     });
-  } catch (err) {
-    // If err is thrown by Mongoose due to required validations
-    if (err.name == 'ValidationError') {
+  } catch (error) {
+    // If error is thrown by Mongoose due to required validations
+    if (error.name == 'ValidationError') {
       return res.status(400).json({
         success: false,
         result: null,
-        error: err,
+        error: error,
         message: 'Required fields are not supplied',
       });
     } else {
       // Server Error
       return res.status(500).json({
         success: false,
         result: null,
-        error: err,
-        message: 'Oops there is an Error',
+        error: error,
+        message: error.message,
       });
     }
   }

diff --git a/backend/controllers/appControllers/offerController/create.js b/backend/controllers/appControllers/offerController/create.js
@@ -57,9 +57,9 @@ const create = async (req, res) => {
       result: updateResult,
       message: 'Offer created successfully',
     });
-  } catch (err) {
-    // If err is thrown by Mongoose due to required validations
-    if (err.name == 'ValidationError') {
+  } catch (error) {
+    // If error is thrown by Mongoose due to required validations
+    if (error.name == 'ValidationError') {
       return res.status(400).json({
         success: false,
         result: null,
@@ -70,7 +70,7 @@ const create = async (req, res) => {
       return res.status(500).json({
         success: false,
         result: null,
-        message: err.message,
+        message: error.message,
       });
     }
   }

diff --git a/backend/controllers/appControllers/offerController/summary.js b/backend/controllers/appControllers/offerController/summary.js
@@ -110,7 +110,7 @@ const summary = async (req, res) => {
     return res.status(500).json({
       success: false,
       result: null,
-      message: 'Oops there is an Error',
+      message: error.message,
       error: error,
     });
   }

diff --git a/backend/controllers/appControllers/offerController/update.js b/backend/controllers/appControllers/offerController/update.js
@@ -55,10 +55,10 @@ const update = async (req, res) => {
       result,
       message: 'we update this document by this id: ' + req.params.id,
     });
-  } catch (err) {
-    // If err is thrown by Mongoose due to required validations
-    console.log(err);
-    if (err.name == 'ValidationError') {
+  } catch (error) {
+    // If error is thrown by Mongoose due to required validations
+    console.log(error);
+    if (error.name == 'ValidationError') {
       return res.status(400).json({
         success: false,
         result: null,
@@ -69,7 +69,7 @@ const update = async (req, res) => {
       return res.status(500).json({
         success: false,
         result: null,
-        message: 'Oops there is an Error',
+        message: error.message,
       });
     }
   }

diff --git a/backend/controllers/appControllers/paymentController/create.js b/backend/controllers/appControllers/paymentController/create.js
@@ -80,22 +80,22 @@ const create = async (req, res) => {
       result: updatePath,
       message: 'Payment Invoice created successfully',
     });
-  } catch (err) {
-    // If err is thrown by Mongoose due to required validations
-    if (err.name == 'ValidationError') {
+  } catch (error) {
+    // If error is thrown by Mongoose due to required validations
+    if (error.name == 'ValidationError') {
       res.status(400).json({
         success: false,
         result: null,
         message: 'Required fields are not supplied',
-        error: err,
+        error: error,
       });
     } else {
       // Server Error
       res.status(500).json({
         success: false,
         result: null,
-        message: 'Oops there is an Error',
-        error: err,
+        message: error.message,
+        error: error,
       });
     }
   }

diff --git a/backend/controllers/appControllers/paymentController/remove.js b/backend/controllers/appControllers/paymentController/remove.js
@@ -64,12 +64,12 @@ const remove = async (req, res) => {
       result,
       message: 'Successfully Deleted the document by id: ' + req.params.id,
     });
-  } catch (err) {
+  } catch (error) {
     return res.status(500).json({
       success: false,
       result: null,
-      message: 'Oops there is an Error',
-      error: err,
+      message: error.message,
+      error: error,
     });
   }
 };

diff --git a/backend/controllers/appControllers/paymentController/summary.js b/backend/controllers/appControllers/paymentController/summary.js
@@ -66,7 +66,7 @@ const summary = async (req, res) => {
     return res.status(500).json({
       success: false,
       result: null,
-      message: 'Oops there is an Error',
+      message: error.message,
       error: error,
     });
   }

diff --git a/backend/controllers/appControllers/paymentController/update.js b/backend/controllers/appControllers/paymentController/update.js
@@ -84,22 +84,22 @@ const update = async (req, res) => {
       result,
       message: 'Successfully updated the Payment ',
     });
-  } catch (err) {
-    // If err is thrown by Mongoose due to required validations
-    if (err.name == 'ValidationError') {
+  } catch (error) {
+    // If error is thrown by Mongoose due to required validations
+    if (error.name == 'ValidationError') {
       res.status(400).json({
         success: false,
         result: null,
         message: 'Required fields are not supplied',
-        error: err,
+        error: error,
       });
     } else {
       // Server Error
       res.status(500).json({
         success: false,
         result: null,
-        message: err.message,
-        error: err,
+        message: error.message,
+        error: error,
       });
     }
   }

diff --git a/backend/controllers/appControllers/quoteController/convertQuoteToInvoice.js b/backend/controllers/appControllers/quoteController/convertQuoteToInvoice.js
@@ -50,10 +50,14 @@ const convertQuoteToInvoice = async (req, res) => {
       note: quote.note,
     };
 
+    invoiceData['createdBy'] = req.admin._id;
+    // Creating a new document in the collection
+
     // Create the invoice document
     const invoice = await new InvoiceModel(invoiceData).save();
 
     // Mark the quote as converted
+    quote['createdBy'] = req.admin._id;
     quote.converted = true;
     await quote.save();
 
@@ -63,19 +67,21 @@ const convertQuoteToInvoice = async (req, res) => {
       result: quote,
       message: 'Successfully converted quote to invoice',
     });
-  } catch (err) {
+  } catch (error) {
     // If error is because of Invalid ObjectId
-    if (err.kind == 'ObjectId') {
+    if (error.kind == 'ObjectId') {
       return res.status(400).json({
         success: false,
         result: null,
         message: 'Invalid ID format',
+        error: error,
       });
     } else {
       return res.status(500).json({
         success: false,
         result: null,
-        message: 'Oops there is an Errorr',
+        error,
+        message: error.message,
       });
     }
   }

diff --git a/backend/controllers/appControllers/quoteController/create.js b/backend/controllers/appControllers/quoteController/create.js
@@ -56,9 +56,9 @@ const create = async (req, res) => {
       result: updateResult,
       message: 'Quote created successfully',
     });
-  } catch (err) {
-    // If err is thrown by Mongoose due to required validations
-    if (err.name == 'ValidationError') {
+  } catch (error) {
+    // If error is thrown by Mongoose due to required validations
+    if (error.name == 'ValidationError') {
       return res.status(400).json({
         success: false,
         result: null,
@@ -69,7 +69,7 @@ const create = async (req, res) => {
       return res.status(500).json({
         success: false,
         result: null,
-        message: 'Oops there is an Error',
+        message: error.message,
       });
     }
   }