Merge pull request #425 from onc-healthit/fi-607-cache-ref-resolution

Fi 607 cache ref resolution

generator/uscore/uscore_generator.rb

@@ -682,8 +682,11 @@ def create_references_resolved_test(sequence)
               skip_if_known_not_supported(:#{sequence[:resource]}, [:search, :read])
               #{skip_if_not_found(sequence)}
 
+              validated_resources = Set.new
+              max_resolutions = 50
+
               #{resource_array}&.each do |resource|
-                validate_reference_resolutions(resource)
+                validate_reference_resolutions(resource, validated_resources, max_resolutions) if validated_resources.length < max_resolutions
               end)
         sequence[:tests] << test
       end

lib/app/models/testing_instance.rb

@@ -178,7 +178,13 @@ def patient_id=(patient_id)
 
         resource_references.destroy
 
-        self.patient_ids = patient_id
+        # For patient id list, don't clear it out but rather add it to the list of known
+        # patients to pull from.
+        self.patient_ids = if patient_ids.blank?
+                             patient_id
+                           else
+                             patient_ids.split(',').append(patient_id).uniq.join(',')
+                           end
 
         ResourceReference.create(
           resource_type: 'Patient',

lib/app/sequence_base.rb

@@ -651,11 +651,15 @@ def test_resources_against_profile(resource_type, specified_profile = nil, &bloc
         assert(errors.empty?, errors.join("<br/>\n"))
       end
 
-      def validate_reference_resolutions(resource)
+      # Set max_resolutions in a single sequence to a large number by default
+      def validate_reference_resolutions(resource, resolved_references = Set.new, max_resolutions = 1_000_000)
         problems = []
 
         walk_resource(resource) do |value, meta, path|
           next if meta['type'] != 'Reference'
+          next if value.reference.blank?
+          next if resolved_references.include?(value.reference)
+          break if resolved_references.length > max_resolutions
 
           begin
             # Should potentially update valid? method in fhir_dstu2_models
@@ -670,11 +674,14 @@ def validate_reference_resolutions(resource)
               end
             end
             value.read
+            resolved_references.add(value.reference)
           rescue ClientException => e
             problems << "#{path} did not resolve: #{e}"
           end
         end
 
+        Inferno.logger.info "Surpassed the maximum reference resolutions: #{max_resolutions}" if resolved_references.length > max_resolutions
+
         assert(problems.empty?, problems.join("<br/>\n"))
       end