Merge pull request #1863 from icanbwell/nn-ignt-70

IGNT-70 Add _includeHidden support

Author: nirbhaykumar1999

src/constants.js

@@ -204,6 +204,10 @@ module.exports = {
         SYSTEM: 'http://terminology.hl7.org/CodeSystem/v3-Confidentiality',
         CODE: 'R'
     },
+    RESOURCE_HIDDEN_TAG: {
+        SYSTEM: 'https://fhir.icanbwell.com/4_0_0/CodeSystem/server-behavior',
+        CODE: 'hidden'
+    },
     CONSENT_OF_LINKED_PERSON_INDEX: 'consent_of_linked_person',
     EXTERNAL_REQUEST_RETRY_COUNT: 3,
     DEFAULT_CACHE_MAX_COUNT: 25,

src/operations/everything/everythingHelper.js

@@ -500,7 +500,8 @@ class EverythingHelper {
 
                         const baseArgs = {
                             base_version: base_version,
-                            _debug: debug || explain
+                            _debug: debug || explain,
+                            _includeHidden: parsedArgs._includeHidden
                         };
 
                         // if explain query, don't break in chunks as will be limit to single resource later
@@ -831,12 +832,16 @@ class EverythingHelper {
             const relatedResourceParsedArgs = this.parseQueryStringIntoArgs(
                 {
                     resourceType: relatedResourceType,
-                    queryString: reverseFilterWithParentIds
+                    queryString: reverseFilterWithParentIds,
+                    commonArgs: {
+                        _includeHidden: parsedArgs._includeHidden
+                    }
                 }
             );
 
             const args = {};
             args.base_version = base_version;
+
             /**
              * @type {boolean}
              */
@@ -1141,10 +1146,12 @@ class EverythingHelper {
      * converts a query string into an args array
      * @param {string} resourceType
      * @param {string} queryString
+     * @param {object} commonArgs
      * @return {ParsedArgs}
      */
-    parseQueryStringIntoArgs({ resourceType, queryString }) {
-        const args = Object.fromEntries(new URLSearchParams(queryString));
+    parseQueryStringIntoArgs({ resourceType, queryString, commonArgs = {} }) {
+        const args = {};
+        Object.assign(args, commonArgs, Object.fromEntries(new URLSearchParams(queryString)));
         args.base_version = VERSIONS['4_0_0'];
         return this.r4ArgsParser.parseArgs(
             {

src/operations/graph/graphHelpers.js

@@ -268,6 +268,7 @@ class GraphHelper {
      * @param {string} property
      * @param {string | null} filterProperty (Optional) filter the sublist by this property
      * @param {*|null} filterValue (Optional) match filterProperty to this value
+     * @param {ParsedArgs} parseArgs
      * @param {boolean} [explain]
      * @param {boolean} [debug]
      * @param {boolean} supportLegacyId
@@ -281,6 +282,7 @@ class GraphHelper {
         property,
         filterProperty,
         filterValue,
+        parsedArgs,
         explain,
         debug,
         supportLegacyId = true,
@@ -332,7 +334,9 @@ class GraphHelper {
              */
             const useAccessIndex = this.configManager.useAccessIndex;
 
-            const args = Object.assign({ base_version }, { id: relatedReferenceIds.join(',') });
+            const args = Object.assign({
+                base_version, _includeHidden: parsedArgs._includeHidden
+            }, { id: relatedReferenceIds.join(',') });
             const childParseArgs = this.r4ArgsParser.parseArgs(
                 {
                     resourceType,
@@ -486,10 +490,12 @@ class GraphHelper {
      * converts a query string into an args array
      * @param {string} resourceType
      * @param {string} queryString
+     * @param {object} commonArgs
      * @return {ParsedArgs}
      */
-    parseQueryStringIntoArgs ({ resourceType, queryString }) {
-        const args = Object.fromEntries(new URLSearchParams(queryString));
+    parseQueryStringIntoArgs ({ resourceType, queryString, commonArgs = {}}) {
+        const args = {};
+        Object.assign(args, commonArgs, Object.fromEntries(new URLSearchParams(queryString)));
         args.base_version = VERSIONS['4_0_0'];
         return this.r4ArgsParser.parseArgs(
             {
@@ -513,6 +519,7 @@ class GraphHelper {
      * @param {boolean} [debug]
      * @param {boolean} supportLegacyId
      * @param {string[]} proxyPatientIds
+     * @param {ParsedArgs} parseArgs
      * @param {ResourceEntityAndContained[]} proxyPatientResources
      * @returns {QueryItem}
      */
@@ -527,6 +534,7 @@ class GraphHelper {
         reverse_filter,
         explain,
         debug,
+        parsedArgs,
         supportLegacyId = true,
         proxyPatientIds = [],
         proxyPatientResources = [],
@@ -595,11 +603,15 @@ class GraphHelper {
             const relatedResourceParsedArgs = this.parseQueryStringIntoArgs(
                 {
                     resourceType: relatedResourceType,
-                    queryString: reverseFilterWithParentIds
+                    queryString: reverseFilterWithParentIds,
+                    commonArgs: {
+                        _includeHidden: parsedArgs._includeHidden
+                    }
                 }
             );
             const args = {};
             args.base_version = base_version;
+
             const searchParameterName = reverse_filter.split('=')[0];
             /**
              * @type {boolean}
@@ -986,7 +998,8 @@ class GraphHelper {
                             explain,
                             debug,
                             supportLegacyId,
-                            getRaw
+                            getRaw,
+                            parsedArgs
                         }
                     );
                     if (queryItem) {
@@ -1048,6 +1061,7 @@ class GraphHelper {
                             supportLegacyId,
                             proxyPatientIds,
                             proxyPatientResources,
+                            parsedArgs,
                             getRaw
                         }
                     );
@@ -1394,7 +1408,8 @@ class GraphHelper {
                 const args = {
                     base_version: base_version,
                     id: Array.from(ids).join(','),
-                    _debug: debug
+                    _debug: debug,
+                    _includeHidden: parsedArgs._includeHidden
                 };
                 if (explain) {
                     args['_count'] = 1;

src/operations/query/r4.js

@@ -1,3 +1,4 @@
+const { OPERATIONS: { DELETE }, RESOURCE_HIDDEN_TAG } = require('../../constants');
 const { fhirFilterTypes } = require('./customQueries');
 const { FilterByString } = require('./filters/string');
 const { FilterByUri } = require('./filters/uri');
@@ -21,7 +22,6 @@ const { MongoQuerySimplifier } = require('../../utils/mongoQuerySimplifier');
 const { FilterParameters } = require('./filters/filterParameters');
 const { UrlParser } = require('../../utils/urlParser');
 const { FilterByQuantity } = require('./filters/quantity');
-const { OPERATIONS: { DELETE } } = require('../../constants');
 const { isTrue } = require('../../utils/isTrue');
 const { FilterByOfType } = require('./filters/ofType');
 const { FilterByNumber } = require('./filters/number');
@@ -156,7 +156,7 @@ class R4SearchQueryCreator {
         // Handling case of 'hidden' tag in meta
         if (
             !parsedArgs.id &&
-            (isUser || !isTrue(parsedArgs._includeHidden)) &&
+            !isTrue(parsedArgs._includeHidden) &&
             operation !== DELETE &&
             !useHistoryTable &&
             resourceType !== 'AuditEvent'
@@ -166,8 +166,8 @@ class R4SearchQueryCreator {
                 'meta.tag': {
                     $not: {
                         $elemMatch: {
-                            system: 'https://fhir.icanbwell.com/4_0_0/CodeSystem/server-behavior',
-                            code: 'hidden'
+                            system: RESOURCE_HIDDEN_TAG.SYSTEM,
+                            code: RESOURCE_HIDDEN_TAG.CODE
                         }
                     }
                 }