add r4 download ITs and do other fixes

Author: francisco-videira-nhs

grep

@@ -1,6 +1,6 @@
 FROM node:18.3.0-alpine3.14
 
-ENV npm_config_cache /home/node/app/.npm
+ENV npm_config_cache=/home/node/app/.npm
 
 WORKDIR /app
 

sandbox/Dockerfile

@@ -42,8 +42,13 @@ const retrieveOboUsers = require('./r4/retrieveOboUsers')
 const retrieveHealthcareService = require('./r4/retrieveHealthcareService')
 const searchForHealthcareServices = require('./r4/searchForHealthcareServices')
 const searchServiceRequest = require('./r4/searchServiceRequest')
-const retrieveBinary = require('./r4/retrieveBinary')
-const retrieveBinaryHelper = require('./r4/retrieveBinaryHelper')
+const retrieveAttachmentR4 = require('./r4/retrieveAttachment')
+
+/**
+ * Services
+ */
+const objectStore = require('../services/objectStore')
+
 
 const routes = [].concat(
   getStatus,
@@ -83,8 +88,8 @@ const routes = [].concat(
   retrieveAdviceAndGuidanceOverviewPdf,
   searchServiceRequest,
   createAdviceAndGuidance,
-  retrieveBinary,
-  retrieveBinaryHelper
+  retrieveAttachmentR4,
+  objectStore
 )
 
 module.exports = routes

…rlForFileDownload/example_attachment.pdf …etrieveAttachment/example_attachment.pdfsandbox/src/mocks/r4/requestUrlForFileDownload/example_attachment.pdf renamed to sandbox/src/mocks/r4/retrieveAttachment/example_attachment.pdf sandbox/src/mocks/r4/requestUrlForFileDownload/example_attachment.pdf renamed to sandbox/src/mocks/r4/retrieveAttachment/example_attachment.pdf

@@ -2,34 +2,34 @@ const businessFunctionValidator = require('../../services/businessFunctionValida
 
 module.exports = [
   /**
-   * Sandbox implementation for retrieveBinary A042 (R4) endpoint
+   * Sandbox implementation for Retrieve attachment A042 (R4) endpoint
    */
   {
     method: 'GET',
-    path: '/FHIR/R4/Binary/{attachmentId}',
+    path: '/FHIR/R4/Binary/{binaryId}',
     handler: (request, h) => {
 
-      const allowedBusinessFunctions = ["REFERRING_CLINICIAN", "REFERRING_CLINICIAN_ADMIN", "SERVICE_PROVIDER_CLINICIAN", "SERVICE_PROVIDER_CLINICIAN_ADMIN"]
+      const allowedBusinessFunctions = ["REFERRING_CLINICIAN", "REFERRING_CLINICIAN_ADMIN", "SERVICE_PROVIDER_CLINICIAN", "SERVICE_PROVIDER_CLINICIAN_ADMIN"];
 
-      const validationResult = businessFunctionValidator.validateBusinessFunction(request, h, allowedBusinessFunctions)
+      const validationResult = businessFunctionValidator.validateBusinessFunction(request, h, allowedBusinessFunctions);
       if (validationResult) {
-        return validationResult
+        return validationResult;
       }
 
-      const attachmentId = request.params.attachmentId;
+      const binaryId = request.params.binaryId;
       const url = request.url.href;
-      const objectStore = "/ObjectStore/RetrieveBinary/d497bbe3-f88b-45f1-b3d4-9c563e4c0f5f";
+      const objectStore = "/ObjectStore/d497bbe3-f88b-45f1-b3d4-9c563e4c0f5f";
       const location = url.split('/FHIR')[0] + objectStore;
       const uuidPattern = /^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/i;
       const attPattern = /^att-\d+-\d+$/;
 
 
-      if ((uuidPattern.test(attachmentId) || attPattern.test(attachmentId)) && request.method === 'get') {
-        const response = h.response().code(307)
+      if ((uuidPattern.test(binaryId) || attPattern.test(binaryId)) && request.method === 'get') {
+        const response = h.response().code(307);
         response.headers["Location"] = location;
-        return response
+        return response;
       } else {
-        return h.file('./r4/R4-SandboxErrorOutcome.json').code(400);
+        return h.file('r4/R4-SandboxErrorOutcome.json').code(400);
       }
 
     }

sandbox/src/routes/index.js

@@ -16,7 +16,7 @@ module.exports = [
       }
 
       // this should never happen as we always get a valid response for this endpoint
-      return h.file('./r4/R4-SandboxErrorOutcome.json').code(400);
+      return h.file('r4/R4-SandboxErrorOutcome.json').code(400);
 
 
     }

sandbox/src/routes/r4/retrieveBinary.js …dbox/src/routes/r4/retrieveAttachment.jssandbox/src/routes/r4/retrieveBinary.js renamed to sandbox/src/routes/r4/retrieveAttachment.js sandbox/src/routes/r4/retrieveBinary.js renamed to sandbox/src/routes/r4/retrieveAttachment.js

@@ -12,7 +12,7 @@ module.exports = [
             // check that the query exists and is correct
             const query = request.query._query;
             if (query == undefined || query != "onBehalfOf") {
-                return h.file('./r4/R4-SandboxErrorOutcome.json').code(400);
+                return h.file('r4/R4-SandboxErrorOutcome.json').code(400);
             }
 
             if (request.headers["nhsd-ers-business-function"] !== "SERVICE_PROVIDER_CLINICIAN_ADMIN")
@@ -27,7 +27,7 @@ module.exports = [
             }
 
             // this should never happen as we always get a valid response for this endpoint
-            return h.file('./r4/R4-SandboxErrorOutcome.json').code(400);
+            return h.file('r4/R4-SandboxErrorOutcome.json').code(400);
 
 
         }

sandbox/src/routes/r4/retrieveBinaryHelper.js

@@ -23,7 +23,7 @@ module.exports = [
         return h.file(responsePath, { etagMethod: false }).code(200).type("application/fhir+json").etag("9", { weak: true })
       }
 
-      return h.file('STU3-SandboxErrorOutcome.json').code(422);
+      return h.file('stu3/STU3-SandboxErrorOutcome.json').code(422);
     }
   }
 ]

sandbox/src/routes/r4/retrieveBusinessFunctions.js

@@ -14,7 +14,7 @@ function retrieveAvailableActionsForUserList(request, h) {
     return h.file(responsePath, { etagMethod: false }).code(200).type("application/fhir+json")
   }
 
-  return h.file('STU3-SandboxErrorOutcome.json').code(400);
+  return h.file('stu3/STU3-SandboxErrorOutcome.json').code(400);
 }
 
 module.exports = [