Updated fhir.js with support for fetchAllWithReferences convenience m…

…ethod
VRZ78 · Feb 13, 2016 · 2223afe · 2223afe
1 parent ff796eb
commit 2223afe
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 10 deletions.
diff --git a/dist/fhir-client-angularjs.min.js b/dist/fhir-client-angularjs.min.js
diff --git a/dist/fhir-client-jquery.min.js b/dist/fhir-client-jquery.min.js
diff --git a/dist/fhir-client.js b/dist/fhir-client.js
@@ -1169,6 +1169,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	            }, function(err) {
 	                fail(err);
 	            });
+	        }, function(err) {
+	            fail(err);
 	        });
 	    };
 
@@ -1185,17 +1187,76 @@ return /******/ (function(modules) { // webpackBootstrap
 	            },
 	            function () {
 	                ret.resolve(results);
+	            },
+	            function (err) {
+	                ret.reject(err);
 	            }
 	        );
 
 	        return ret.promise;
 	    };
+
+	    function fetchAllWithReferences (searchParams, resolveParams) {
+	        var ret = adapter.defer();
+
+	        fhirAPI.search(searchParams)
+	            .then(function(results){
+
+	                var resolvedReferences = {};
+
+	                var queue = [function() {ret.resolve(results, resolvedReferences);}];
+
+	                function enqueue (bundle,resource,reference) {
+	                  queue.push(function() {resolveReference(bundle,resource,reference)});
+	                }
+
+	                function next() {
+	                  (queue.pop())();
+	                }
+
+	                function resolveReference (bundle,resource,reference) {
+	                    var referenceID = reference.reference;
+	                    fhirAPI.resolve({'bundle': bundle, 'resource': resource, 'reference':reference}).then(function(res){
+	                      var referencedObject = res.data || res.content;
+	                      resolvedReferences[referenceID] = referencedObject;
+	                      next();
+	                    });
+	                }
+
+	                var bundle = results.data;
+
+	                bundle.entry && bundle.entry.forEach(function(element){
+	                  var resource = element.resource;
+	                  var type = resource.resourceType;
+	                  resolveParams && resolveParams.forEach(function(resolveParam){
+	                    var param = resolveParam.split('.');
+	                    var targetType = param[0];
+	                    var targetElement = param[1];
+	                    var reference = resource[targetElement];
+	                    if (type === targetType && reference) {
+	                      var referenceID = reference.reference;
+	                      if (!resolvedReferences[referenceID]) {
+	                        enqueue(bundle,resource,reference);
+	                      }
+	                    }
+	                  });
+	                });
+
+	                next();
+
+	            }, function(){
+	                ret.reject("Could not fetch search results");
+	            });
+
+	        return ret.promise;
+	    };
 
 	    function decorate (client, newAdapter) {
 	        fhirAPI = client;
 	        adapter = newAdapter;
 	        client["drain"] = drain;
 	        client["fetchAll"] = fetchAll;
+	        client["fetchAllWithReferences"] = fetchAllWithReferences;
 	        return client;
 	    }
 

diff --git a/dist/fhir-client.min.js b/dist/fhir-client.min.js
diff --git a/lib/jqFhir.js b/lib/jqFhir.js
@@ -1194,12 +1194,68 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        return ret.promise;
 	    };
+
+	    function fetchAllWithReferences (searchParams, resolveParams) {
+	        var ret = adapter.defer();
+
+	        fhirAPI.search(searchParams)
+	            .then(function(results){
+
+	                var resolvedReferences = {};
+
+	                var queue = [function() {ret.resolve(results, resolvedReferences);}];
+
+	                function enqueue (bundle,resource,reference) {
+	                  queue.push(function() {resolveReference(bundle,resource,reference)});
+	                }
+
+	                function next() {
+	                  (queue.pop())();
+	                }
+
+	                function resolveReference (bundle,resource,reference) {
+	                    var referenceID = reference.reference;
+	                    fhirAPI.resolve({'bundle': bundle, 'resource': resource, 'reference':reference}).then(function(res){
+	                      var referencedObject = res.data || res.content;
+	                      resolvedReferences[referenceID] = referencedObject;
+	                      next();
+	                    });
+	                }
+
+	                var bundle = results.data;
+
+	                bundle.entry && bundle.entry.forEach(function(element){
+	                  var resource = element.resource;
+	                  var type = resource.resourceType;
+	                  resolveParams && resolveParams.forEach(function(resolveParam){
+	                    var param = resolveParam.split('.');
+	                    var targetType = param[0];
+	                    var targetElement = param[1];
+	                    var reference = resource[targetElement];
+	                    if (type === targetType && reference) {
+	                      var referenceID = reference.reference;
+	                      if (!resolvedReferences[referenceID]) {
+	                        enqueue(bundle,resource,reference);
+	                      }
+	                    }
+	                  });
+	                });
+
+	                next();
+
+	            }, function(){
+	                ret.reject("Could not fetch search results");
+	            });
+
+	        return ret.promise;
+	    };
 
 	    function decorate (client, newAdapter) {
 	        fhirAPI = client;
 	        adapter = newAdapter;
 	        client["drain"] = drain;
 	        client["fetchAll"] = fetchAll;
+	        client["fetchAllWithReferences"] = fetchAllWithReferences;
 	        return client;
 	    }