eselkin/Add uhd batch avs groups resourceTypes and selects Document and Encounter types (#27511)

* Fixes extraction response that is just 1 Bundle of various resourceTypes.

* Slight simplification to cut down on repeat functions.

* Add a test to make sure we cover that the group by works and selects correctly

* reduce lines

* repeated .body

* fix info to debug

* Not sure how that got there

Author: eselkin

lib/unified_health_data/service.rb

@@ -285,17 +285,25 @@ def get_immunizations
     end
 
     # Use of this is behind va_online_scheduling_uhd_avs_metadata flipper
-    def get_all_avs_metadata(start_date:, end_date:)
+    def get_all_avs_metadata(start_date:, end_date:) # rubocop:disable Metrics/MethodLength
+      validate_icn!
       with_monitoring do
         response = uhd_client.get_all_avs(patient_id: @user.icn, start_date:, end_date:)
-        # SCDF returns a bundle of bundles: DocumentReference bundle, Encounter bundle (and possibly a third).
-        document_reference_bundle, encounter_bundle = response.body&.dig('entry')
-        doc_ref_entries = extract_all_entries(document_reference_bundle)
-        encounter_entries = extract_all_entries(encounter_bundle)
+        # SCDF returns a bundle: DocumentReference, Encounter, and other types.
+        body = response.body
+        if body.nil? || !body.is_a?(Hash) || body['entry'].blank?
+          user_uuid = @user.user_account_uuid
+          Rails.logger.debug { "UHD: Missing or invalid response for AVS metadata request for user #{user_uuid}." }
+          return [[], []]
+        end
+        entries = extract_all_entries(body)
+        grouped = entries.group_by { |entry| entry['resourceType'] }
+        doc_ref_entries = grouped['DocumentReference'] || []
+        encounter_entries = grouped['Encounter'] || []
         if doc_ref_entries.empty? || encounter_entries.empty?
           user_uuid = @user.user_account_uuid
           to_log = "DocumentReference entries: #{doc_ref_entries.size}, Encounter entries: #{encounter_entries.size}"
-          Rails.logger.info("UHD: Missing expected bundles in AVS metadata response for user #{user_uuid}. #{to_log}")
+          Rails.logger.debug { "UHD: Missing data in AVS metadata response for user #{user_uuid}. #{to_log}" }
           return [[], []]
         end
         [doc_ref_entries, encounter_entries]

spec/lib/unified_health_data/service_spec.rb

@@ -1779,87 +1779,88 @@
   describe '#get_all_avs_metadata' do
     let(:all_avs_response) do
       {
+        'resourceType' => 'Bundle',
+        'type' => 'collection',
         'entry' => [
           {
             'resource' => {
-              'resourceType' => 'Bundle',
-              'entry' => [
-                {
-                  'resource' => {
-                    'resourceType' => 'DocumentReference',
-                    'id' => 'doc-1',
-                    'type' => {
-                      'coding' => [
-                        {
-                          'system' => 'https://fhir.cerner.com/codeSet/72',
-                          'code' => '4189669',
-                          'display' => 'Ambulatory Patient Summary',
-                          'userSelected' => true
-                        },
-                        {
-                          'system' => 'http://loinc.org',
-                          'code' => '96345-4',
-                          'display' => 'Ambulatory Patient Summary',
-                          'userSelected' => false
-                        }
-                      ]
-                    },
-                    'context' => {
-                      'encounter' => [
-                        { 'reference' => 'Encounter/enc-1' }
-                      ]
-                    }
+              'resourceType' => 'DocumentReference',
+              'id' => 'doc-1',
+              'type' => {
+                'coding' => [
+                  {
+                    'system' => 'https://fhir.cerner.com/codeSet/72',
+                    'code' => '4189669',
+                    'display' => 'Ambulatory Patient Summary',
+                    'userSelected' => true
+                  },
+                  {
+                    'system' => 'http://loinc.org',
+                    'code' => '96345-4',
+                    'display' => 'Ambulatory Patient Summary',
+                    'userSelected' => false
                   }
-                },
-                {
-                  'resource' => {
-                    'resourceType' => 'DocumentReference',
-                    'id' => 'doc-2',
-                    'type' => {
-                      'coding' => [
-                        {
-                          'system' => 'https://fhir.cerner.com/codeSet/72',
-                          'code' => '2820526',
-                          'display' => 'Primary Care Note',
-                          'userSelected' => true
-                        }
-                      ]
-                    },
-                    'context' => {
-                      'encounter' => [
-                        { 'reference' => 'Encounter/enc-2' }
-                      ]
-                    }
+                ]
+              },
+              'context' => {
+                'encounter' => [
+                  { 'reference' => 'Encounter/enc-1' }
+                ]
+              }
+            }
+          },
+          {
+            'resource' => {
+              'resourceType' => 'DocumentReference',
+              'id' => 'doc-2',
+              'type' => {
+                'coding' => [
+                  {
+                    'system' => 'https://fhir.cerner.com/codeSet/72',
+                    'code' => '2820526',
+                    'display' => 'Primary Care Note',
+                    'userSelected' => true
                   }
-                }
+                ]
+              },
+              'context' => {
+                'encounter' => [
+                  { 'reference' => 'Encounter/enc-2' }
+                ]
+              }
+            }
+          },
+          {
+            'resource' => {
+              'resourceType' => 'Encounter',
+              'id' => 'enc-1',
+              'appointment' => [
+                { 'reference' => 'Appointment/4818609' }
               ]
             }
           },
           {
             'resource' => {
-              'resourceType' => 'Bundle',
-              'entry' => [
-                {
-                  'resource' => {
-                    'resourceType' => 'Encounter',
-                    'id' => 'enc-1',
-                    'appointment' => [
-                      { 'reference' => 'Appointment/4818609' }
-                    ]
-                  }
-                },
-                {
-                  'resource' => {
-                    'resourceType' => 'Encounter',
-                    'id' => 'enc-2',
-                    'appointment' => [
-                      { 'reference' => 'Appointment/4818609' },
-                      { 'reference' => 'Appointment/9990001' }
-                    ]
-                  }
-                }
+              'resourceType' => 'Encounter',
+              'id' => 'enc-2',
+              'appointment' => [
+                { 'reference' => 'Appointment/4818609' },
+                { 'reference' => 'Appointment/9990001' }
               ]
             }
+          },
+          {
+            'resource' => {
+              'resourceType' => 'OperationOutcome',
+              'id' => 'oo-1',
+              'issue' => [{ 'severity' => 'information', 'code' => 'informational' }]
+            }
+          },
+          {
+            'resource' => {
+              'resourceType' => 'Appointment',
+              'id' => 'appt-1'
+            }
           }
         ]
       }
@@ -1882,6 +1883,15 @@
       expect(encounters.first['id']).to eq('enc-1')
       expect(encounters.last['id']).to eq('enc-2')
     end
+
+    it 'excludes non-DocumentReference and non-Encounter resource types' do
+      result = service.get_all_avs_metadata(start_date: '2025-01-01', end_date: '2025-12-31')
+
+      doc_refs, encounters = result
+      all_returned = doc_refs + encounters
+      returned_types = all_returned.map { |entry| entry['resourceType'] }.uniq
+      expect(returned_types).to contain_exactly('DocumentReference', 'Encounter')
+    end
   end
 
   describe '#get_appt_avs' do