feat: validate contained when validator disable

- Original, always validate contained property using mongoose scheme - When we have validator, it is unnecessary to validate contained property because validator will do that very well - So, move process of `validate contained` to else condition that mean validator being disable - Add `validateContainedList` to validate contained "Array" - Refactor `validateContained` to function
Chinlinlee · Nov 29, 2022 · 3cd87d5 · 3cd87d5
1 parent 519e1d6
commit 3cd87d5
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 27 deletions.
diff --git a/api/FHIRApiService/create.js b/api/FHIRApiService/create.js
@@ -3,7 +3,7 @@ const uuid = require('uuid');
 const _ = require('lodash');
 const { getNotExistReferenceList } = require('../apiService');
 const FHIR = require('fhir').Fhir;
-const validateContained = require('./validateContained');
+const { validateContainedList } = require('./validateContained');
 const { renameCollectionFieldName } = require("../apiService");
 const { logger } = require('../../utils/log');
 const path = require('path');
@@ -96,25 +96,20 @@ module.exports = async function(req, res , resourceType) {
     try {
         let insertData = req.body;
         let cloneInsertData = _.cloneDeep(insertData);
-        if (_.get(insertData, "contained")) {
-            let containedResources = _.get(insertData, "contained");
-            for (let index in containedResources) {
-                let resource = containedResources[index];
-                let validation = await validateContained(resource, index);
-                if (!validation.status) {
-                    let operationOutcomeError = handleError.processing(`The resource in contained error. ${validation.message}`);
-                    logger.error(`[Error: ${JSON.stringify(operationOutcomeError)}] [Resource Type: ${resourceType}]`);
-                    return doRes(400, operationOutcomeError);
-                }
-            }
-        }
 
         // Validate user request body
         if (process.env.ENABLE_VALIDATOR === "true") {
             let { validateResource } = require("../../utils/validator/processor");
             let validationResult = await validateResource(req.body);
 
             if (validationResult.isError) return doRes(422, validationResult.message);
+        } else {
+            let containedValidation = await validateContainedList(insertData);
+            if (!containedValidation.status) {
+                let operationOutcomeError = handleError.processing(`The resource in contained error. ${containedValidation.message}`);
+                logger.error(`[Error: ${JSON.stringify(operationOutcomeError)}] [Resource Type: ${resourceType}]`);
+                return doRes(422, operationOutcomeError);
+            }
         }
 
         let [status, doc] = await doInsertData(cloneInsertData, resourceType);

diff --git a/api/FHIRApiService/update.js b/api/FHIRApiService/update.js
@@ -1,7 +1,7 @@
 const mongodb = require('models/mongodb');
 const _ = require('lodash');
 const FHIR = require('fhir').Fhir;
-const validateContained = require('./validateContained');
+const { validateContainedList } = require('./validateContained');
 const { renameCollectionFieldName } = require("../apiService");
 const { logger } = require('../../utils/log');
 const path = require('path');
@@ -75,26 +75,23 @@ module.exports = async function (req, res, resourceType) {
             return doRes(operationOutcomeMessage.code , operationOutcomeMessage.msg);
         }
     };
+
     let updateData = req.body;
     let updateDataClone = _.cloneDeep(updateData);
-    if (_.get(updateData, "contained")) {
-        let containedResources = _.get(updateData, "contained");
-        for (let index in containedResources) {
-            let resource = containedResources[index];
-            let validation = await validateContained(resource, index);
-            if (!validation.status) {
-                let operationOutcomeError = handleError.processing(`The resource in contained error. ${validation.message}`);
-                return doRes(400, operationOutcomeError);
-            }
-        }
-    }
 
     // Validate user request body
     if (process.env.ENABLE_VALIDATOR === "true") {
         let { validateResource } = require("../../utils/validator/processor");
         let validationResult = await validateResource(req.body);
 
         if (validationResult.isError) return doRes(422, validationResult.message);
+    } else {
+        let containedValidation = await validateContainedList(updateData);
+        if (!containedValidation.status) {
+            let operationOutcomeError = handleError.processing(`The resource in contained error. ${containedValidation.message}`);
+            logger.error(`[Error: ${JSON.stringify(operationOutcomeError)}] [Resource Type: ${resourceType}]`);
+            return doRes(422, operationOutcomeError);
+        }
     }
 
     let dataExist = await isDocExist(req.params.id, resourceType);

diff --git a/api/FHIRApiService/validateContained.js b/api/FHIRApiService/validateContained.js
@@ -1,7 +1,7 @@
 const mongodb = require('../../models/mongodb');
 const _ = require('lodash');
 
-module.exports = async (resourceItem, index) => {
+async function validateContained(resourceItem, index) {
     try {
         let resourceType = _.get(resourceItem, "resourceType", false);
         if (!resourceType) {
@@ -35,4 +35,28 @@ module.exports = async (resourceItem, index) => {
             message: e
         };
     }
-};
+}
+
+async function validateContainedList(data) {
+    let cloneData = _.cloneDeep(data);
+    if (_.get(cloneData, "contained")) {
+        let containedResources = _.get(cloneData, "contained");
+        for (let index in containedResources) {
+            let resource = containedResources[index];
+            let validation = await validateContained(resource, index);
+            if (!validation.status) {
+                return {
+                    status: false,
+                    message: validation.message
+                };
+            }
+        }
+    }
+    return {
+        status: true,
+        message: "success"
+    };
+}
+
+module.exports.validateContained = validateContained;
+module.exports.validateContainedList = validateContainedList;