refactor validation checks to common dir

Author: francisco-videira-nhs

sandbox/src/routes/common/validationUtil.js

@@ -0,0 +1,17 @@
+/**
+ * @file validationUtil.js
+ * @description Provides utility functions.
+ */
+
+function isValidUuid(string) {
+    return /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i.test(string);
+  }
+
+function hasLegacyPrefix(string) {
+    return string.startsWith('att-');
+}
+
+module.exports = {
+    isValidUuid,
+    hasLegacyPrefix,
+};

sandbox/src/routes/r4/retrieveAttachment.js

@@ -1,4 +1,5 @@
 const businessFunctionValidator = require('../../services/businessFunctionValidator')
+const validationUtil = require('../common/validationUtil')
 
 module.exports = [
   /**
@@ -20,11 +21,8 @@ module.exports = [
       const url = request.url.href;
       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(binaryId) || attPattern.test(binaryId)) && request.method === 'get') {
+      if ((validationUtil.hasLegacyPrefix(binaryId) || validationUtil.isValidUuid(binaryId)) && request.method === 'get') {
         const response = h.response().code(307);
         response.headers["Location"] = location;
         return response;

sandbox/src/routes/stu3/services/mockResponseProvider.js

@@ -1,4 +1,4 @@
-
+const validationUtil = require('../../common/validationUtil')
 const fs = require('fs')
 const lodash = require('lodash')
 
@@ -170,22 +170,18 @@ module.exports = {
 
     if (attachmentId) {
 
-      if (attachmentId.startsWith('att-')) {
+      if (validationUtil.hasLegacyPrefix(attachmentId)) {
         return { responsePath: 'stu3/retrieveAttachment/responses/example_attachment.pdf', filename: 'example_attachment.pdf', responseCode: 200 };
       }
 
-      if (this.isvalidUuid(attachmentId)) {
+      if (validationUtil.isValidUuid(attachmentId)) {
         return { responsePath: 'stu3/retrieveAttachment/responses/example_attachment.pdf', filename: 'example_attachment.pdf', responseCode: 200 };
       }
     }
 
     return {};
   },
 
-  isvalidUuid: function(string) {
-    return /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i.test(string);
-  },
-
   getExampleResponseForRetrieveReferralRequest: function (request) {
     const ubrn = request.params.ubrn;
     const version = request.params.version

sandbox/src/services/businessFunctionValidator.js

@@ -13,7 +13,6 @@ module.exports = {
       if (requestedBusinessFunction === 'SERVICE_PROVIDER_CLINICIAN_ADMIN') {
         if (!oboUserId) {
           return h.response('SANDBOX_ERROR: When this endpoint is accessed using the e-RS SERVICE_PROVIDER_CLINICIAN_ADMIN Business Function then an On-Behalf-Of User ID must be provided').code(403)
-.code(403)
         }
       }
       else {

tests/sandbox/stu3/test_a006_get_attachment.py

@@ -103,4 +103,4 @@ def test_failure_not_a_uuid(
         response = call_endpoint_url_with_pathParams(
             actor, {"attachmentLogicalID": "f1bb2b1-30db-48f9-8906-8b703adca5fb"}
         )
-        asserts.assert_status_code(404, response.status_code)
+        asserts.assert_status_code(422, response.status_code)