Merge pull request #602 from idurar/dev

🚚 Fix not found download pdf file

backend/handlers/downloadHandler/downloadPdf.js

@@ -18,10 +18,16 @@ module.exports = downloadPdf = async (req, res, { directory, id }) => {
     await custom.generatePdf(
       modelName,
       { filename: modelName, format: 'A4' },
-      result.invoice ?? result,
+      result,
       async (fileLocation) => {
         return res.download(fileLocation, (err) => {
-          if (err) res.status(500).json({ success: false, message: "Couldn't find file" });
+          if (err)
+            res.status(500).json({
+              success: false,
+              result: null,
+              message: "Couldn't find file",
+              error: err.message,
+            });
         });
       }
     );
@@ -31,15 +37,15 @@ module.exports = downloadPdf = async (req, res, { directory, id }) => {
       return res.status(400).json({
         success: false,
         result: null,
-        error: err,
+        error: err.message,
         message: 'Required fields are not supplied',
       });
     } else if (err.name == 'BSONTypeError') {
       // If err is thrown by Mongoose due to invalid ID
       return res.status(400).json({
         success: false,
         result: null,
-        error: err,
+        error: err.message,
         message: 'Invalid ID',
       });
     } else {
@@ -48,7 +54,7 @@ module.exports = downloadPdf = async (req, res, { directory, id }) => {
       return res.status(500).json({
         success: false,
         result: null,
-        error: err,
+        error: err.message,
         message: 'Oops there is an Error',
       });
     }

backend/routes/coreRoutes/coreDownloadRouter.js

@@ -1,24 +1,36 @@
 const downloadPdf = require('@/handlers/downloadHandler/downloadPdf');
 const express = require('express');
-
+const path = require('path');
 const router = express.Router();
 const { hasPermission } = require('@/middlewares/permission');
 
-router.route('/:subPath/:directory/:id').get(function (req, res) {
-  const { subPath, directory, id } = req.params;
+// router.route('/:directory/:file').get(function (req, res) {
+//   const { directory, file } = req.params;
 
-  // Handle the /payment/* route
-  if (subPath == 'payment' && directory == 'invoice') {
-    downloadPdf(req, res, { directory: 'Payment', id });
-  } else {
-    downloadPdf(req, res, { directory, id });
-  }
-});
+//   // Handle the /payment/* route
 
-// router.route('/:directory/:id').get(function (req, res) {
-//   const { directory, id } = req.params;
+//   const options = {
+//     root: path.join(__dirname, `../../public/download/${directory}`),
+//     dotfiles: 'deny',
+//     headers: {
+//       'Content-type': 'application/pdf',
+//       'Content-disposition': 'inline; filename="' + file + '"',
+//     },
+//   };
 
-//   downloadPdf(req, res, { directory, id });
+//   res.status(200).sendFile(file, options, function (err) {
+//     if (err) {
+//       const id = file.slice(directory.length + 1).slice(0, -4); // extract id from file name
+//       downloadPdf(req, res, { directory, id });
+//     }
+//   });
 // });
 
+router.route('/:directory/:file').get(function (req, res) {
+  const { directory, file } = req.params;
+
+  const id = file.slice(directory.length + 1).slice(0, -4); // extract id from file name
+  downloadPdf(req, res, { directory, id });
+});
+
 module.exports = router;