Api 42322 extract org web service bean from local bgs

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

@@ -144,7 +144,7 @@ module IntentToFileWebService
       ##
       # OrgWebServiceBean
       #
-      module OrgWebService
+      module OrgWebServiceBean
         DEFINITION =
           Bean.new(
             path: 'OrgWebServiceBean',
@@ -155,6 +155,14 @@ module OrgWebService
           )
       end
 
+      module OrgWebService
+        DEFINITION =
+          Service.new(
+            bean: OrgWebServiceBean::DEFINITION,
+            path: 'OrgWebService'
+          )
+      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 header # rubocop:disable Metrics/MethodLength
       # Stock XML structure {{{
       header = 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: bean_name, action: 'findPoaHistoryByPtcpntId', body:,
+                   key: 'PoaHistory')
+    end
+  end
+end

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

@@ -14,7 +14,6 @@
   expected_instance_methods = {
     convert_nil_values: %i[options],
     find_poa_by_participant_id: %i[id],
-    find_poa_history_by_ptcpnt_id: %i[id],
     healthcheck: %i[endpoint],
     jrn: %i[],
     make_request: [endpoint: nil, action: nil, body: nil],

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

@@ -104,10 +104,6 @@
         end
 
         it 'returns the correct status when bgs org service is not healthy' do
-          allow_any_instance_of(ClaimsApi::LocalBGS).to receive(
-            :find_poa_history_by_ptcpnt_id
-          )
-            .and_return(Struct.new(:healthy?).new(false))
           get "/services/claims/#{version}/upstream_healthcheck"
           result = JSON.parse(response.body)
           expect(result['org_web_service']['success']).to eq(false)

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

modules/claims_api/spec/requests/v2/veterans/rswag_power_of_attorney_spec.rb

@@ -6,10 +6,12 @@
 require_relative '../../../rails_helper'
 require_relative '../../../support/swagger_shared_components/v2'
 require 'bgs_service/local_bgs'
+require 'bgs_service/org_web_service'
 
 describe 'PowerOfAttorney',
          openapi_spec: Rswag::TextHelpers.new.claims_api_docs do
   let(:local_bgs) { ClaimsApi::LocalBGS }
+  let(:org_web_service) { ClaimsApi::OrgWebService }
 
   claimant_data = {
     'claimantId' => '1013093331V548481',
@@ -61,7 +63,7 @@
 
           before do |example|
             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 })
             FactoryBot.create(:veteran_representative, representative_id: '12345',
                                                        poa_codes: [poa_code],
@@ -119,7 +121,7 @@
 
           before do |example|
             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 })
 
             FactoryBot.create(:veteran_representative, representative_id: '12345',
@@ -153,7 +155,7 @@
 
           before do |example|
             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 })
             FactoryBot.create(:veteran_representative, representative_id: '12345',
                                                        poa_codes: [poa_code],
@@ -262,7 +264,7 @@
 
           before do |example|
             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 })
             FactoryBot.create(:veteran_representative, representative_id: '999999999999',
                                                        poa_codes: [poa_code],
@@ -459,7 +461,7 @@
 
           before do |example|
             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 })
             FactoryBot.create(:veteran_organization, poa: organization_poa_code,
                                                      name: "#{organization_poa_code} - DISABLED AMERICAN VETERANS",
@@ -528,7 +530,7 @@
 
           before do |example|
             mock_ccg(scopes) do
-              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 })
               submit_request(example.metadata)
             end

modules/veteran/app/models/veteran/user.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'bgs_service/local_bgs'
+require 'bgs_service/org_web_service'
 
 # Veteran model
 module Veteran
@@ -32,7 +33,7 @@ def current_poa_information
     def previous_poa_code
       return @previous_poa_code if @previous_poa_code.present?
 
-      poa_history = local_bgs_service.find_poa_history_by_ptcpnt_id(@user.participant_id)
+      poa_history = bgs_org_service.find_poa_history_by_ptcpnt_id(@user.participant_id)
       return nil if poa_history[:person_poa_history].blank?
 
       # Sorts previous power of attorneys by begin date
@@ -44,9 +45,9 @@ def previous_poa_code
       @previous_poa_code = poa_codes.delete_if { |poa_code| poa_code == current_poa_code }.first
     end
 
-    def bgs_service
+    def bgs_org_service
       external_key = "#{@user.first_name} #{@user.last_name}"
-      @bgs_service ||= BGS::Services.new(
+      @bgs_itf_service ||= ClaimsApi::OrgWebService.new(
         external_uid: @user.mpi_icn,
         external_key: external_key.presence || @user.mpi_icn
       )