Api 42322 extract org web service bean from local bgs

modules/claims_api/app/clients/claims_api/bgs_client/definitions.rb

@@ -123,7 +123,7 @@ module IntentToFileWebService
       ##
       # OrgWebServiceBean
       #
-      module OrgWebServiceBean
+      module OrgWebService
         DEFINITION =
           Bean.new(
             path: 'OrgWebServiceBean',
@@ -134,23 +134,6 @@ module OrgWebServiceBean
           )
       end
 
-      module OrgWebService
-        DEFINITION =
-          Service.new(
-            bean: OrgWebServiceBean::DEFINITION,
-            path: 'OrgWebService'
-          )
-
-        module FindOrgBySSN
-          DEFINITION =
-            Action.new(
-              service: OrgWebService::DEFINITION,
-              name: 'findPoaHistoryByPtcpntId',
-              key: 'PoaHistory'
-            )
-        end
-      end
-
       ##
       # PersonWebServiceBean
       #

modules/claims_api/lib/bgs_service/local_bgs.rb

@@ -89,19 +89,6 @@ def find_poa_by_participant_id(id)
                    key: 'return')
     end
 
-    def find_poa_history_by_ptcpnt_id(id)
-      body = Nokogiri::XML::DocumentFragment.parse <<~EOXML
-        <ptcpntId />
-      EOXML
-
-      { ptcpntId: id }.each do |k, v|
-        body.xpath("./*[local-name()='#{k}']")[0].content = v
-      end
-
-      make_request(endpoint: 'OrgWebServiceBean/OrgWebService', action: 'findPoaHistoryByPtcpntId', body:,
-                   key: 'PoaHistory')
-    end
-
     def insert_intent_to_file(options)
       request_body = construct_itf_body(options)
       body = Nokogiri::XML::DocumentFragment.parse <<~EOXML

modules/claims_api/lib/bgs_service/org_web_service.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module ClaimsApi
+  class OrgWebService < ClaimsApi::LocalBGS
+    def bean_name
+      'OrgWebServiceBean/OrgWebService'
+    end
+
+    def find_poa_history_by_ptcpnt_id(id)
+      body = Nokogiri::XML::DocumentFragment.parse <<~EOXML
+        <ptcpntId />
+      EOXML
+
+      { ptcpntId: id }.each do |k, v|
+        body.xpath("./*[local-name()='#{k}']")[0].content = v
+      end
+
+      make_request(endpoint: 'OrgWebServiceBean/OrgWebService', action: 'findPoaHistoryByPtcpntId', body:,
+                   key: 'PoaHistory')
+    end
+  end
+end

modules/claims_api/spec/lib/claims_api/find_definition_spec.rb

@@ -16,21 +16,6 @@
         Flipper.enable(:lighthouse_claims_api_hardcode_wsdl)
       end
 
-      context 'OrgWebServiceBean' do
-        let(:endpoint) { 'OrgWebServiceBean/OrgWebService' }
-        let(:action) { 'findPoaHistoryByPtcpntId' }
-        let(:key) { 'PoaHistory' }
-
-        it 'response with the correct attributes for OrgWebServiceBean' do
-          result = subject.for_action(endpoint, action)
-          parsed_result = JSON.parse(result.to_json)
-
-          expect(parsed_result['service']['bean']['path']).to eq 'OrgWebServiceBean'
-          expect(parsed_result['service']['path']).to eq 'OrgWebService'
-          expect(parsed_result['service']['bean']['namespaces']['target']).to eq 'http://org.services.vetsnet.vba.va.gov/'
-        end
-      end
-
       # This one doesn't have `Bean` at the end
       context 'TrackedItemService' do
         let(:endpoint) { 'TrackedItemService/TrackedItemService' }
@@ -166,18 +151,6 @@
         Flipper.enable(:lighthouse_claims_api_hardcode_wsdl)
       end
 
-      context 'OrgWebService' do
-        let(:endpoint) { 'OrgWebServiceBean/OrgWebService' }
-
-        it 'response with the correct namespace' do
-          result = subject.for_service(endpoint)
-          parsed_result = JSON.parse(result.to_json)
-          expect(parsed_result['bean']['path']).to eq 'OrgWebServiceBean'
-          expect(parsed_result['path']).to eq 'OrgWebService'
-          expect(parsed_result['bean']['namespaces']['target']).to eq 'http://org.services.vetsnet.vba.va.gov/'
-        end
-      end
-
       context 'TrackedItemService' do
         let(:endpoint) { 'TrackedItemService/TrackedItemService' }
 

modules/claims_api/spec/lib/claims_api/local_bgs_proxy_spec.rb

@@ -16,7 +16,6 @@
     convert_nil_values: %i[options],
     find_intent_to_file_by_ptcpnt_id_itf_type_cd: %i[id type],
     find_poa_by_participant_id: %i[id],
-    find_poa_history_by_ptcpnt_id: %i[id],
     find_tracked_items: %i[id],
     healthcheck: %i[endpoint],
     insert_intent_to_file: %i[options],

modules/claims_api/spec/lib/claims_api/local_bgs_refactored_spec.rb

@@ -2,6 +2,7 @@
 
 require 'rails_helper'
 require 'bgs_service/local_bgs_proxy'
+require 'bgs_service/e_benefits_bnft_claim_status_web_service'
 
 describe ClaimsApi::EbenefitsBnftClaimStatusWebService do
   subject { described_class.new external_uid: 'xUid', external_key: 'xKey' }

modules/claims_api/spec/models/veteran/service/user_spec.rb

@@ -16,10 +16,11 @@
     end
 
     let(:ows) { ClaimsApi::LocalBGS }
+    let(:org_web_service) { ClaimsApi::OrgWebService }
 
     it 'initializes from a user' do
       VCR.use_cassette('claims_api/bgs/claimant_web_service/find_poa_by_participant_id') do
-        allow_any_instance_of(ows).to receive(:find_poa_history_by_ptcpnt_id)
+        allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
           .and_return({ person_poa_history: { person_poa: [{ begin_dt: Time.zone.now, legacy_poa_cd: '033' }] } })
         veteran = Veteran::User.new(user)
         expect(veteran.power_of_attorney.code).to eq('074')
@@ -29,7 +30,7 @@
 
     it 'does not bomb out if poa is missing' do
       VCR.use_cassette('claims_api/bgs/claimant_web_service/not_find_poa_by_participant_id') do
-        allow_any_instance_of(ows).to receive(:find_poa_history_by_ptcpnt_id)
+        allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
           .and_return({ person_poa_history: nil })
         veteran = Veteran::User.new(user)
         expect(veteran.power_of_attorney).to eq(nil)
@@ -39,7 +40,7 @@
 
     it 'provides most recent previous poa' do
       VCR.use_cassette('claims_api/bgs/claimant_web_service/find_poa_by_participant_id') do
-        allow_any_instance_of(ows).to receive(:find_poa_history_by_ptcpnt_id)
+        allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
           .and_return({
                         person_poa_history: {
                           person_poa: [
@@ -56,7 +57,7 @@
 
     it 'does not bomb out if poa history contains a single record' do
       VCR.use_cassette('claims_api/bgs/claimant_web_service/find_poa_by_participant_id') do
-        allow_any_instance_of(ows).to receive(:find_poa_history_by_ptcpnt_id)
+        allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
           .and_return({ person_poa_history: { person_poa: { begin_dt: Time.zone.now, legacy_poa_cd: '033' } } })
         veteran = Veteran::User.new(user)
         expect(veteran.power_of_attorney.code).to eq('074')

modules/claims_api/spec/requests/metadata_spec.rb

@@ -4,6 +4,7 @@
 require 'bgs/services'
 require 'mpi/service'
 require 'bgs_service/e_benefits_bnft_claim_status_web_service'
+require 'bgs_service/org_web_service'
 require 'bgs_service/person_web_service'
 
 RSpec.describe 'ClaimsApi::Metadata', type: :request do
@@ -56,8 +57,8 @@
           expect(result['mpi']['success']).to eq(false)
         end
 
-        local_bgs_services = %i[claimant org intenttofile trackeditem].freeze
-        local_bgs_methods = %i[find_poa_by_participant_id find_poa_history_by_ptcpnt_id
+        local_bgs_services = %i[claimant intenttofile trackeditem].freeze
+        local_bgs_methods = %i[find_poa_by_participant_id
                                insert_intent_to_file find_tracked_items].freeze
         local_bgs_services.each do |local_bgs_service|
           it "returns the correct status when the local bgs #{local_bgs_service} is not healthy" do
@@ -87,6 +88,19 @@
           end
         end
 
+        local_bgs_org_methods = %i[find_poa_history_by_ptcpnt_id]
+        it 'returns the correct status when the local bgs orgwebservice is not healthy' do
+          local_bgs_org_methods.each do |local_bgs_org_method|
+            allow_any_instance_of(ClaimsApi::OrgWebService).to receive(
+              local_bgs_org_method.to_sym
+            )
+              .and_return(Struct.new(:healthy?).new(false))
+            get "/services/claims/#{version}/upstream_healthcheck"
+            result = JSON.parse(response.body)
+            expect(result['localbgs-org']['success']).to eq(false)
+          end
+        end
+
         person_web_service = 'person'
         local_bgs_person_methods = %i[find_by_ssn]
         it "returns the correct status when the local bgs #{person_web_service} is not healthy" do

modules/claims_api/spec/requests/v2/veterans/power_of_attorney/2122_spec.rb

@@ -4,6 +4,7 @@
 require_relative '../../../../rails_helper'
 require 'token_validation/v2/client'
 require 'bgs_service/local_bgs'
+require 'bgs_service/org_web_service'
 
 RSpec.describe 'ClaimsApi::V1::PowerOfAttorney::2122', type: :request do
   let(:veteran_id) { '1013062086V794840' }
@@ -14,6 +15,7 @@
   let(:organization_poa_code) { '083' }
   let(:bgs_poa) { { person_org_name: "#{individual_poa_code} name-here" } }
   let(:local_bgs) { ClaimsApi::LocalBGS }
+  let(:org_web_service) { ClaimsApi::OrgWebService }
 
   describe 'PowerOfAttorney' do
     before do
@@ -55,7 +57,7 @@
               mock_ccg(scopes) do |auth_header|
                 expect_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id)
                   .and_return(bgs_poa)
-                allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                   .and_return({ person_poa_history: nil })
 
                 post appoint_organization_path, params: data.to_json, headers: auth_header
@@ -86,7 +88,7 @@
                   it 'returns a 422 when no zipCode is included in the veteran data' do
                     VCR.use_cassette('claims_api/mpi/find_candidate/valid_icn_full') do
                       mock_ccg(scopes) do |auth_header|
-                        allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                        allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                           .and_return({ person_poa_history: nil })
 
                         json = JSON.parse(request_body)
@@ -112,7 +114,7 @@
                       mock_ccg(scopes) do |auth_header|
                         expect_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id)
                           .and_return(bgs_poa)
-                        allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                        allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                           .and_return({ person_poa_history: nil })
 
                         json = JSON.parse(request_body)
@@ -284,7 +286,7 @@
               mock_ccg(scopes) do |auth_header|
                 expect_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id)
                   .and_return(bgs_poa)
-                allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                   .and_return({ person_poa_history: nil })
                 allow_any_instance_of(ClaimsApi::V2::ApplicationController)
                   .to receive(:target_veteran).and_return(no_first_name_target_veteran)
@@ -316,7 +318,7 @@
 
             it 'returns a 422' do
               mock_ccg(scopes) do |auth_header|
-                allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                   .and_return({ person_poa_history: nil })
                 allow_any_instance_of(ClaimsApi::V2::ApplicationController)
                   .to receive(:target_veteran).and_return(no_first_last_name_target_veteran)
@@ -356,7 +358,7 @@
               it 'returns a 422 with no zipCode' do
                 VCR.use_cassette('claims_api/mpi/find_candidate/valid_icn_full') do
                   mock_ccg(scopes) do |auth_header|
-                    allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                    allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                       .and_return({ person_poa_history: nil })
 
                     json = JSON.parse(request_body)
@@ -395,7 +397,7 @@
                   mock_ccg(scopes) do |auth_header|
                     expect_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id)
                       .and_return(bgs_poa)
-                    allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                    allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                       .and_return({ person_poa_history: nil })
 
                     json = JSON.parse(request_body)
@@ -418,7 +420,7 @@
                 mock_ccg(scopes) do |auth_header|
                   expect_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id)
                     .and_return(bgs_poa)
-                  allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                  allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                     .and_return({ person_poa_history: nil })
 
                   post appoint_organization_path, params: data.to_json, headers: auth_header
@@ -432,7 +434,7 @@
                 mock_ccg(scopes) do |auth_header|
                   expect_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id)
                     .and_return(bgs_poa)
-                  allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                  allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                     .and_return({ person_poa_history: nil })
 
                   post appoint_organization_path, params: data.to_json, headers: auth_header
@@ -490,7 +492,7 @@
             mock_ccg_for_fine_grained_scope(poa_scopes) do |auth_header|
               expect_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id)
                 .and_return(bgs_poa)
-              allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+              allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                 .and_return({ person_poa_history: nil })
 
               post appoint_organization_path, params: data.to_json, headers: auth_header
@@ -519,7 +521,7 @@
           mock_ccg(scopes) do |auth_header|
             expect_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id)
               .and_return(bgs_poa)
-            allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+            allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
               .and_return({ person_poa_history: nil })
             expect(ClaimsApi::V2::PoaFormBuilderJob).to receive(:perform_async) do |*args|
               expect(args[2]).to eq(rep_id)
@@ -605,7 +607,7 @@
 
               it 'returns an error response' do
                 mock_ccg(scopes) do |auth_header|
-                  allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                  allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                     .and_return({ person_poa_history: nil })
                   allow_any_instance_of(ClaimsApi::V2::ApplicationController)
                     .to receive(:target_veteran).and_return(no_first_last_name_target_veteran)

modules/claims_api/spec/requests/v2/veterans/power_of_attorney/2122a_spec.rb

@@ -4,6 +4,7 @@
 require_relative '../../../../rails_helper'
 require 'token_validation/v2/client'
 require 'bgs_service/local_bgs'
+require 'bgs_service/org_web_service'
 
 RSpec.describe 'ClaimsApi::V2::PowerOfAttorney::2122a', type: :request do
   let(:veteran_id) { '1013062086V794840' }
@@ -14,6 +15,7 @@
   let(:organization_poa_code) { '067' }
   let(:bgs_poa) { { person_org_name: "#{individual_poa_code} name-here" } }
   let(:local_bgs) { ClaimsApi::LocalBGS }
+  let(:org_web_service) { ClaimsApi::OrgWebService }
 
   describe 'PowerOfAttorney' do
     before do
@@ -113,7 +115,7 @@
                 mock_ccg(scopes) do |auth_header|
                   expect_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id)
                     .and_return(bgs_poa)
-                  allow_any_instance_of(local_bgs).to receive(:find_poa_history_by_ptcpnt_id)
+                  allow_any_instance_of(org_web_service).to receive(:find_poa_history_by_ptcpnt_id)
                     .and_return({ person_poa_history: nil })
 
                   post appoint_individual_path, params: data.to_json, headers: auth_header
@@ -312,7 +314,7 @@
                   claimant_data[:data][:attributes][:representative][:address][:zipCode] = ''
                   claimant_data[:data][:attributes][:representative][:address][:countryCode] = 'AL'
                   allow_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id).and_return(bgs_poa)
-                  allow_any_instance_of(local_bgs)
+                  allow_any_instance_of(org_web_service)
                     .to receive(:find_poa_history_by_ptcpnt_id).and_return({ person_poa_history: nil })
                   VCR.use_cassette('claims_api/mpi/find_candidate/valid_icn_full') do
                     post appoint_individual_path, params: claimant_data.to_json, headers: auth_header
@@ -327,7 +329,7 @@
             shared_context 'claimant data setup' do
               before do
                 allow_any_instance_of(local_bgs).to receive(:find_poa_by_participant_id).and_return(bgs_poa)
-                allow_any_instance_of(local_bgs)
+                allow_any_instance_of(org_web_service)
                   .to receive(:find_poa_history_by_ptcpnt_id).and_return({ person_poa_history: nil })
               end
             end