Api 43135 poa updated notification dependent

modules/claims_api/app/controllers/claims_api/v2/veterans/power_of_attorney/base_controller.rb

@@ -111,11 +111,9 @@ def submit_power_of_attorney(poa_code, form_number)
         def set_auth_headers
           headers = auth_headers.merge!({ VA_NOTIFY_KEY => icn_for_vanotify })
 
-          if allow_dependent_claimant?
-            add_dependent_to_auth_headers(headers)
-          else
-            auth_headers
-          end
+          add_dependent_to_auth_headers(headers) if allow_dependent_claimant?
+
+          headers
         end
 
         def add_dependent_to_auth_headers(headers)
@@ -228,11 +226,11 @@ def user_profile
         end
 
         def icn_for_vanotify
-          params[:veteranId]
+          dependent_claimant_icn = claimant_icn
+          dependent_claimant_icn.presence || params[:veteranId]
         end
 
         def fetch_claimant
-          claimant_icn = form_attributes.dig('claimant', 'claimantId')
           if claimant_icn.present?
             mpi_profile = mpi_service.find_profile_by_identifier(identifier: claimant_icn,
                                                                  identifier_type: MPI::Constants::ICN)
@@ -241,6 +239,10 @@ def fetch_claimant
           mpi_profile
         end
 
+        def claimant_icn
+          @claimant_icn ||= form_attributes.dig('claimant', 'claimantId')
+        end
+
         def disable_jobs?
           Settings.claims_api&.poa_v2&.disable_jobs
         end

modules/claims_api/app/sidekiq/claims_api/poa_assign_dependent_claimant_job.rb

@@ -4,7 +4,7 @@ module ClaimsApi
   class PoaAssignDependentClaimantJob < ClaimsApi::ServiceBase
     LOG_TAG = 'poa_assign_dependent_claimant_job'
 
-    def perform(poa_id)
+    def perform(poa_id, rep_id)
       poa = ClaimsApi::PowerOfAttorney.find(poa_id)
 
       service = dependent_claimant_poa_assignment_service(
@@ -29,6 +29,8 @@ def perform(poa_id)
         poa.id,
         'POA assigned for dependent'
       )
+
+      ClaimsApi::VANotifyAcceptedJob.perform_async(poa.id, rep_id) if vanotify?(poa.auth_headers, rep_id)
     end
 
     private

modules/claims_api/app/sidekiq/claims_api/poa_updater.rb

@@ -6,7 +6,7 @@
 
 module ClaimsApi
   class PoaUpdater < ClaimsApi::ServiceBase
-    def perform(power_of_attorney_id, rep = nil)
+    def perform(power_of_attorney_id, rep_id = nil)
       poa_form = ClaimsApi::PowerOfAttorney.find(power_of_attorney_id)
 
       ssn = poa_form.auth_headers['va_eauth_pnid']
@@ -23,7 +23,7 @@ def perform(power_of_attorney_id, rep = nil)
 
         ClaimsApi::Logger.log('poa', poa_id: poa_form.id, detail: 'BIRLS Success')
 
-        ClaimsApi::VANotifyAcceptedJob.perform_async(poa_form.id, rep) if vanotify?(poa_form.auth_headers, rep)
+        ClaimsApi::VANotifyAcceptedJob.perform_async(poa_form.id, rep_id) if vanotify?(poa_form.auth_headers, rep_id)
 
         ClaimsApi::PoaVBMSUpdater.perform_async(poa_form.id)
       else
@@ -37,14 +37,6 @@ def perform(power_of_attorney_id, rep = nil)
 
     private
 
-    def vanotify?(auth_headers, rep)
-      if Flipper.enabled?(:lighthouse_claims_api_v2_poa_va_notify)
-        auth_headers.key?(ClaimsApi::V2::Veterans::PowerOfAttorney::BaseController::VA_NOTIFY_KEY) && rep.present?
-      else
-        false
-      end
-    end
-
     def bgs_ext_service(poa_form)
       BGS::Services.new(
         external_uid: poa_form.external_uid,

modules/claims_api/app/sidekiq/claims_api/service_base.rb

@@ -227,6 +227,12 @@ def extract_poa_code(poa_form_data)
       end
     end
 
+    def vanotify?(auth_headers, rep_id)
+      rep = ::Veteran::Service::Representative.where(representative_id: rep_id).order(created_at: :desc).first
+      Flipper.enabled?(:lighthouse_claims_api_v2_poa_va_notify) &&
+        auth_headers.key?(ClaimsApi::V2::Veterans::PowerOfAttorney::BaseController::VA_NOTIFY_KEY) && rep.present?
+    end
+
     def evss_mapper_service(auto_claim)
       ClaimsApi::V2::DisabilityCompensationEvssMapper.new(auto_claim)
     end

modules/claims_api/app/sidekiq/claims_api/v2/poa_form_builder_job.rb

@@ -32,9 +32,9 @@ def perform(power_of_attorney_id, form_number, rep_id, action)
         end
 
         if dependent_filing?(power_of_attorney)
-          ClaimsApi::PoaAssignDependentClaimantJob.perform_async(power_of_attorney.id)
+          ClaimsApi::PoaAssignDependentClaimantJob.perform_async(power_of_attorney.id, rep_id)
         else
-          ClaimsApi::PoaUpdater.perform_async(power_of_attorney.id, rep)
+          ClaimsApi::PoaUpdater.perform_async(power_of_attorney.id, rep_id)
         end
       rescue VBMS::Unknown
         rescue_vbms_error(power_of_attorney)

modules/claims_api/app/sidekiq/claims_api/va_notify_accepted_job.rb

@@ -4,7 +4,7 @@ module ClaimsApi
   class VANotifyAcceptedJob < ClaimsApi::ServiceBase
     LOG_TAG = 'va_notify_accepted_job'
 
-    def perform(poa_id, rep)
+    def perform(poa_id, rep_id)
       return if skip_notification_email?
 
       poa = ClaimsApi::PowerOfAttorney.find(poa_id)
@@ -14,10 +14,12 @@ def perform(poa_id, rep)
           detail: "Could not find Power of Attorney with id: #{poa_id}"
         )
       end
+
       if organization_filing?(poa.form_data)
         org = find_org(poa, '2122')
         res = send_organization_notification(poa, org)
       else
+        rep = ::Veteran::Service::Representative.where(representative_id: rep_id).order(created_at: :desc).first
         poa_code_from_form('2122a', poa)
         res = send_representative_notification(poa, rep)
       end
@@ -173,7 +175,7 @@ def build_address(line1, line2, line3)
     end
 
     def claimant_first_name(poa)
-      poa.auth_headers['va_eauth_firstName']
+      poa.form_data.dig('claimant', 'firstName').presence || poa.auth_headers['va_eauth_firstName']
     end
 
     def organization_filing?(form_data)

modules/claims_api/spec/sidekiq/poa_assign_dependent_claimant_job_spec.rb

@@ -68,10 +68,61 @@
         )
 
       expect(poa.status).to eq(ClaimsApi::PowerOfAttorney::SUBMITTED)
-      described_class.new.perform(poa.id)
+      described_class.new.perform(poa.id, 'Rep Data')
 
       poa.reload
       expect(poa.status).to eq(ClaimsApi::PowerOfAttorney::UPDATED)
     end
   end
+
+  context 'Sending the VA Notify email' do
+    before do
+      create_mock_lighthouse_service
+      allow(Flipper).to receive(:enabled?).with(:lighthouse_claims_api_v2_poa_va_notify).and_return true
+    end
+
+    let(:poa) do
+      FactoryBot.create(:power_of_attorney,
+                        auth_headers: auth_headers,
+                        form_data: claimant_form_data,
+                        status: ClaimsApi::PowerOfAttorney::SUBMITTED)
+    end
+    let(:header_key) { ClaimsApi::V2::Veterans::PowerOfAttorney::BaseController::VA_NOTIFY_KEY }
+
+    context 'when the header key and rep are present' do
+      it 'sends the vanotify job' do
+        poa.auth_headers.merge!({
+                                  header_key => 'this_value'
+                                })
+        poa.save!
+        allow_any_instance_of(ClaimsApi::DependentClaimantPoaAssignmentService).to receive(:assign_poa_to_dependent!)
+          .and_return(nil)
+        allow_any_instance_of(ClaimsApi::ServiceBase).to receive(:vanotify?).and_return true
+        expect(ClaimsApi::VANotifyAcceptedJob).to receive(:perform_async)
+
+        described_class.new.perform(poa.id, '12345678')
+      end
+    end
+
+    context 'when the flipper is off' do
+      it 'does not send the vanotify job' do
+        allow(Flipper).to receive(:enabled?).with(:lighthouse_claims_api_v2_poa_va_notify).and_return false
+        poa.auth_headers.merge!({
+                                  header_key => 'this_value'
+                                })
+        poa.save!
+        allow_any_instance_of(ClaimsApi::DependentClaimantPoaAssignmentService).to receive(:assign_poa_to_dependent!)
+          .and_return(nil)
+        expect(ClaimsApi::VANotifyAcceptedJob).not_to receive(:perform_async)
+
+        described_class.new.perform(poa.id, '12345678')
+      end
+    end
+  end
+
+  def create_mock_lighthouse_service
+    allow_any_instance_of(ClaimsApi::StandardDataWebService).to receive(:find_poas)
+      .and_return([{ legacy_poa_cd: '002', nm: "MAINE VETERANS' SERVICES", org_type_nm: 'POA State Organization',
+                     ptcpnt_id: '46004' }])
+  end
 end

modules/claims_api/spec/sidekiq/poa_updater_spec.rb

@@ -99,13 +99,14 @@
                                 })
         poa.save!
 
+        allow_any_instance_of(ClaimsApi::ServiceBase).to receive(:vanotify?).and_return true
         expect(ClaimsApi::VANotifyAcceptedJob).to receive(:perform_async)
 
         subject.new.perform(poa.id, 'Rep Data')
       end
     end
 
-    context 'when the flipper is on' do
+    context 'when the flipper is off' do
       it 'does not send the vanotify job' do
         allow(Flipper).to receive(:enabled?).with(:lighthouse_claims_api_v2_poa_va_notify).and_return false
         Flipper.disable(:lighthouse_claims_api_v2_poa_va_notify)