Staging

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14
+FROM node:20
 MAINTAINER [email protected]
 
 ENV NAME fw-exports

app/src/routes/v3/answers.router.js

@@ -125,7 +125,7 @@ class AnswerRouter {
       ctx.throw(400, "File type must be pdf or zip");
     }
 
-    const answer = await AnswerService.getAnswer({
+    const answer = await AnswerService.getAnswerWithUrl({
       reportid: answerId,
       templateid: answerId
     });
@@ -159,10 +159,19 @@ class AnswerRouter {
       let imageUrls = imageResponse.value ?? [];
       if (typeof imageUrls === "string") {
         imageUrls = [imageUrls];
+      } else if (Array.isArray(imageUrls)) {
+        imageUrls = imageUrls.map(url => (typeof url === "object" ? url.url : url));
+      } else if (typeof imageUrls === "object") {
+        imageUrls = [imageUrls.url];
       }
 
       for (const url of imageUrls) {
-        imagePromises.push(axios.get(url, { responseType: "arraybuffer" }).then(res => ({ data: res.data, url })));
+        const urlToDownload = typeof url === "object" ? url.url : url;
+        imagePromises.push(
+          axios
+            .get(urlToDownload, { responseType: "arraybuffer" })
+            .then(res => ({ data: res.data, url: urlToDownload }))
+        );
       }
     }
     const imageBuffers = await Promise.all(imagePromises);
@@ -183,8 +192,7 @@ class AnswerRouter {
     if (fileType === "pdf") {
       const imagesPdfInput = [];
       for (const buffer of imageBuffers) {
-        const fileExt = buffer.url.split("/").pop().split(".").pop();
-
+        const fileExt = buffer.url.split("/").pop().split(".").pop().split("?")[0];
         // Rotate images if they are in the wrong orientation (only for jpeg) as pdfgen does not do this
         if (fileExt === "jpeg" || fileExt === "jpg") {
           try {

app/src/services/answers.service.js

@@ -57,6 +57,33 @@ export class AnswerService {
     }
   }
 
+  /**
+   * Returns the answer for a given id
+   * @param {{templateid: string, reportid: string}} params The id for the answer to fetch as well as the parent report of the answer
+   * @returns The answer object with the id
+   */
+  static async getAnswerWithUrl(params) {
+    const { templateid, reportid } = params;
+    logger.info(`Getting answer with id ${reportid} of template id ${templateid}`);
+    try {
+      const baseURL = config.get("coreAPI.url");
+      const response = await axios.default({
+        baseURL,
+        url: `/templates/${templateid}/answers/imageExports/${reportid}`,
+        method: "GET",
+        headers: {
+          authorization: loggedInUserService.token
+        }
+      });
+      const answer = response.data;
+      logger.info("Got answer", answer);
+      return answer && answer.data;
+    } catch (e) {
+      logger.error("Error while fetching answer", e);
+      return null; // log the error but still return
+    }
+  }
+
   static async getAllAnswers() {
     logger.info(`Getting all answers`);
     try {

app/src/services/reportFile.service.js

@@ -92,7 +92,7 @@ class ReportFileService {
         const fileDownloadPromises = fileUrls.map(url => {
           if (url)
             return axios({
-              url: url,
+              url: typeof url === "object" ? url.url : url,
               responseType: "stream",
               responseEncoding: "utf-8"
             });
@@ -214,7 +214,7 @@ class ReportFileService {
           const fileDownloadPromises = fileUrls.map(url => {
             if (url)
               return axios({
-                url: url,
+                url: typeof url === "object" ? url.url : url,
                 responseType: "stream",
                 responseEncoding: "utf-8"
               });
@@ -552,10 +552,13 @@ class ReportFileService {
           questions.push(question);
         }
         let files = [];
+
         // check if the answer is a file
         if (["blob", "audio"].includes(question.type)) {
           files = Array.isArray(response.value) ? response.value : [response.value];
-          responseToShow = `File(s) found at: \n${files.join("\n")}`;
+          responseToShow = `File(s) found at: \n${files
+            .map(file => (typeof file === "object" ? file.url : file))
+            .join("\n")}`;
         } else responseToShow = response.value;
 
         doc
@@ -565,7 +568,13 @@ class ReportFileService {
         doc.moveDown(0.5);
         if (files.length > 0)
           files.forEach(file => {
-            doc.font("Regular").fontSize(11).text(file, 50, doc.y, { link: file, underline: true }); //, lineY + 30 + 50 * i);
+            doc
+              .font("Regular")
+              .fontSize(11)
+              .text(typeof file === "object" ? file.url : file, 50, doc.y, {
+                link: typeof file === "object" ? file.url : file,
+                underline: true
+              }); //, lineY + 30 + 50 * i);
             doc.moveDown(1);
           });
         else {

package.json

@@ -73,6 +73,6 @@
   },
   "prettier": "@3sidedcube/prettier-config",
   "engines": {
-    "node": "~14"
+    "node": "~20"
   }
-}
+}