[Automated] Merged master into target preview_envs_k8s

department-of-veterans-affairs · Apr 26, 2024 · a90b28c · a90b28c
2 parents 5374aa9 + e76f788
commit a90b28c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 48 deletions.
diff --git a/modules/ask_va_api/app/lib/ask_va_api/base_retriever.rb b/modules/ask_va_api/app/lib/ask_va_api/base_retriever.rb
@@ -10,11 +10,7 @@ def initialize(user_mock_data:, entity_class:)
     end
 
     def call
-      if fetch_data.is_a?(Array)
-        fetch_data.map { |item| entity_class.new(item) }
-      else
-        entity_class.new(fetch_data)
-      end
+      fetch_data.map { |item| entity_class.new(item) }
     rescue => e
       ::ErrorHandler.handle_service_error(e)
     end

diff --git a/modules/ask_va_api/app/lib/ask_va_api/correspondences/retriever.rb b/modules/ask_va_api/app/lib/ask_va_api/correspondences/retriever.rb
@@ -43,7 +43,13 @@ def filter_data(data)
       end
 
       def handle_response_data(response)
-        response[:Data].presence || response
+        case response
+        when Hash
+          response[:Data]
+        else
+          error = JSON.parse(response.body, symbolize_names: true)
+          error[:Message]
+        end
       end
     end
   end

diff --git a/modules/ask_va_api/app/lib/ask_va_api/inquiries/retriever.rb b/modules/ask_va_api/app/lib/ask_va_api/inquiries/retriever.rb
@@ -45,7 +45,7 @@ def fetch_correspondences(inquiry_id:)
         ).call
 
         case correspondences
-        when Hash
+        when String
           []
         else
           correspondences
@@ -64,7 +64,13 @@ def filter_data(data, id = nil)
       end
 
       def handle_response_data(response)
-        response[:Data].presence || raise(InquiriesRetrieverError, response)
+        case response
+        when Hash
+          response[:Data]
+        else
+          error = JSON.parse(response.body, symbolize_names: true)
+          raise(InquiriesRetrieverError, error[:Message])
+        end
       end
     end
   end

diff --git a/modules/ask_va_api/spec/app/lib/ask_va_api/correspondences/retriever_spec.rb b/modules/ask_va_api/spec/app/lib/ask_va_api/correspondences/retriever_spec.rb
@@ -20,25 +20,20 @@
   describe '#call' do
     context 'when Crm raise an error' do
       let(:endpoint) { 'inquiries/1/replies' }
-      let(:response) do
-        { Data: [],
-          Message: 'Data Validation: No Inquiry Found',
-          ExceptionOccurred: true,
-          ExceptionMessage: 'Data Validation: No Inquiry Found',
-          MessageId: '2d746074-9e5c-4987-a894-e3f834b156b5' }
+      let(:body) do
+        '{"Data":[],"Message":"Data Validation: No Inquiry Found",' \
+          '"ExceptionOccurred":true,"ExceptionMessage":"Data Validation:' \
+          ' No Inquiry Found","MessageId":"95f9d1e7-d532-41d7-b43f-78ae9a3e778d"}'
       end
+      let(:failure) { Faraday::Response.new(response_body: body, status: 400) }
 
       before do
         allow_any_instance_of(Crm::CrmToken).to receive(:call).and_return('Token')
-        allow(service).to receive(:call).and_return(response)
+        allow(service).to receive(:call).and_return(failure)
       end
 
       it 'returns the error' do
-        expect(retriever.call).to eq({ Data: [],
-                                       Message: 'Data Validation: No Inquiry Found',
-                                       ExceptionOccurred: true,
-                                       ExceptionMessage: 'Data Validation: No Inquiry Found',
-                                       MessageId: '2d746074-9e5c-4987-a894-e3f834b156b5' })
+        expect(retriever.call).to eq('Data Validation: No Inquiry Found')
       end
     end
 

diff --git a/modules/ask_va_api/spec/app/lib/ask_va_api/inquiries/retriever_spec.rb b/modules/ask_va_api/spec/app/lib/ask_va_api/inquiries/retriever_spec.rb
@@ -7,6 +7,10 @@
     described_class.new(user_mock_data:, entity_class: AskVAApi::Inquiries::Entity, icn:)
   end
 
+  def mock_response(status:, body:)
+    instance_double(Faraday::Response, status:, body: body.to_json)
+  end
+
   let(:service) { instance_double(Crm::Service) }
   let(:icn) { nil }
   let(:error_message) { 'Some error occurred' }
@@ -25,21 +29,14 @@
           ',"ExceptionOccurred":true,"ExceptionMessage":"Data Validation: No Inquiries found by ' \
           'ID A-20240423-30709","MessageId":"ca5b990a-63fe-407d-a364-46caffce12c1"}'
       end
-      let(:failure) do
-        {
-          status: 400,
-          body:,
-          response_headers: nil,
-          url: nil
-        }
-      end
+      let(:failure) { Faraday::Response.new(response_body: body, status: 400) }
 
       before do
         allow_any_instance_of(Crm::CrmToken).to receive(:call).and_return('Token')
         allow(service).to receive(:call).and_return(failure)
       end
 
-      it 'raise CorrespondenceRetrieverrError' do
+      it 'raise InquiriesRetrieverrError' do
         expect { retriever.call }.to raise_error(ErrorHandler::ServiceError)
       end
     end
@@ -188,11 +185,7 @@
             allow_any_instance_of(Crm::CrmToken).to receive(:call).and_return('Token')
             allow(service).to receive(:call).and_return(response)
             allow_any_instance_of(AskVAApi::Correspondences::Retriever).to receive(:call)
-              .and_return({ Data: [],
-                            Message: 'Data Validation: No Inquiry Found',
-                            ExceptionOccurred: true,
-                            ExceptionMessage: 'Data Validation: No Inquiry Found',
-                            MessageId: '2d746074-9e5c-4987-a894-e3f834b156b5' })
+              .and_return('Data Validation: No Inquiry Found')
           end
 
           it 'returns correspondences as an empty array' do

diff --git a/modules/ask_va_api/spec/requests/v0/inquiries_spec.rb b/modules/ask_va_api/spec/requests/v0/inquiries_spec.rb
@@ -12,7 +12,7 @@
     JSON.parse(File.read('modules/ask_va_api/config/locales/get_inquiries_mock_data.json'))['Data']
   end
   let(:valid_id) { mock_inquiries.first['InquiryNumber'] }
-  let(:invalid_id) { 'invalid-id' }
+  let(:invalid_id) { 'A-20240423-30709' }
 
   before do
     allow(LogService).to receive(:new).and_return(logger)
@@ -212,14 +212,7 @@
             ',"ExceptionOccurred":true,"ExceptionMessage":"Data Validation: No Inquiries found by ' \
             'ID A-20240423-30709","MessageId":"ca5b990a-63fe-407d-a364-46caffce12c1"}'
         end
-        let(:failure) do
-          {
-            status: 400,
-            body:,
-            response_headers: nil,
-            url: nil
-          }
-        end
+        let(:failure) { Faraday::Response.new(response_body: body, status: 400) }
         let(:service) { instance_double(Crm::Service) }
 
         before do
@@ -234,11 +227,7 @@
 
         it_behaves_like 'common error handling', :unprocessable_entity, 'service_error',
                         'AskVAApi::Inquiries::InquiriesRetrieverError: ' \
-                        '{:status=>400, :body=>"{\"Data\":null,\"Message\":\"Data Validation: ' \
-                        'No Inquiries found by ID A-20240423-30709\",\"ExceptionOccurred\":' \
-                        'true,\"ExceptionMessage\":\"Data Validation: No Inquiries found by ID ' \
-                        'A-20240423-30709\",\"MessageId\":\"ca5b990a-63fe-407d-a364-46caffce12c1\"}",' \
-                        ' :response_headers=>nil, :url=>nil}'
+                        'Data Validation: No Inquiries found by ID A-20240423-30709'
       end
     end
   end