Ksoskin/120379/claim date backup path bug take 2 (#24472)

* Adding date tests and pass through

* Rubocoping

* Adding in accidentially removed test

* Addressing copilot stuff

* let!

* Adding in a flipper

* rubocop

* Correcting flipper

* Rubocop

* trying again

* making better flage name

* Putting back

* Take 2

* Rubocop

* Adding in test to check/confirm transform matches schema

* Replicating so I dont need to instantiate the entire middleware for a test

* Adding clarifying comment (requested)

* Adding a rescue

* Contant adding

* Fixing linting

Author: kylesoskin

config/features.yml

@@ -793,6 +793,10 @@ features:
   disability_526_track_saved_claim_error:
     actor_type: user
     description: enables improved logging of SavedClaim::DisabilityCompensation::Form526AllClaim save failures
+  disability_526_add_claim_date_to_lighthouse:
+    actor_type: user
+    description: enables sending the claim date to Lighthouse when submitting a Form 526EZ when present
+    enable_in_development: true
   disability_526_block_banking_info_retrieval:
     actor_type: user
     description: disables call to Lighthouse Direct Deposit API to fill in banking information without Veteran consent

lib/disability_compensation/providers/generate_pdf/lighthouse_generate_pdf_provider.rb

@@ -16,7 +16,7 @@ def generate_526_pdf(form_content, transaction_id)
   end
 
   def transform_service
-    @transform_service ||= EVSS::DisabilityCompensationForm::Form526ToLighthouseTransform.new
+    @transform_service ||= EVSS::DisabilityCompensationForm::Form526ToLighthouseTransform.new(pdf_request: true)
   end
 
   def service

lib/disability_compensation/requests/form526_request_body.rb

@@ -299,4 +299,9 @@ class Form526
     attribute :direct_deposit, DirectDeposit
     attribute :claim_notes, String
   end
+
+  # Currently only used for the getPDF LH Claims API endpoint for backup 526 submissions
+  class Form526Pdf < Form526
+    attribute :claim_date, String, default: nil
+  end
 end

lib/evss/disability_compensation_form/form526_to_lighthouse_transform.rb

@@ -5,6 +5,8 @@
 module EVSS
   module DisabilityCompensationForm
     class Form526ToLighthouseTransform # rubocop:disable Metrics/ClassLength
+      VALID_LH_DATE_REGEX = /^(\d{4})-(\d{2})-(\d{2})$/
+
       TOXIC_EXPOSURE_CAUSE_MAP = {
         NEW: 'My condition was caused by an injury or exposure during my military service.',
         WORSENED: 'My condition existed before I served in the military, but it got worse because of my military ' \
@@ -77,21 +79,24 @@ class Form526ToLighthouseTransform # rubocop:disable Metrics/ClassLength
         hazard: 'hazard'
       }.freeze
 
+      def initialize(pdf_request: false)
+        @pdf_request = pdf_request
+      end
+
       # takes known EVSS Form526Submission format and converts it to a Lighthouse request body
       # @param evss_data will look like JSON.parse(form526_submission.form_data)
       # @return Requests::Form526
       def transform(evss_data)
         form526 = evss_data['form526']
-        lh_request_body = Requests::Form526.new
+        lh_request_body = choose_request_body(form526)
         lh_request_body.claimant_certification = true
         lh_request_body.claim_process_type = evss_claims_process_type(form526) # basic_info[:claim_process_type]
 
         transform_veteran_section(form526, lh_request_body)
 
-        service_information = form526['serviceInformation']
-        if service_information.present?
-          lh_request_body.service_information = transform_service_information(service_information)
-        end
+        service_info = form526['serviceInformation']
+
+        lh_request_body.service_information = transform_service_information(service_info) if service_info.present?
 
         transform_disabilities_section(form526, lh_request_body)
 
@@ -108,11 +113,40 @@ def transform(evss_data)
         lh_request_body.toxic_exposure = transform_toxic_exposure(toxic_exposure) if toxic_exposure.present?
 
         lh_request_body.claim_notes = form526['overflowText']
+
         lh_request_body
       end
 
       private
 
+      def valid_date_for_lighthouse?(date_string)
+        date_string =~ VALID_LH_DATE_REGEX
+      end
+
+      def claim_date_valid?(claim_date)
+        claim_date.present? && valid_date_for_lighthouse?(claim_date)
+      end
+
+      def choose_request_body(form526)
+        claim_date = form526['claimDate']
+        # if the request is for a PDF, and the claim date is present and valid, use the PDF request body
+        if Flipper.enabled?(:disability_526_add_claim_date_to_lighthouse) &&
+           @pdf_request &&
+           claim_date_valid?(claim_date)
+          lh_request_body = Requests::Form526Pdf.new
+          lh_request_body.claim_date = form526['claimDate']
+          lh_request_body
+        else
+          # if the request is not for a PDF, or the claim date is not present or invalid, use the standard request body
+          # that does not include claim_date, otherwise, it will error Lighthouse's validation
+          Requests::Form526.new
+        end
+      rescue => e
+        # If anything goes wrong, rescue to using the non-pdf request
+        Rails.logger.error("Error transforming Form526 to Lighthouse: #{e.message}")
+        Requests::Form526.new
+      end
+
       # returns "STANDARD_CLAIM_PROCESS", "BDD_PROGRAM", or "FDC_PROGRAM"
       # based off of a few attributes in the evss data
       def evss_claims_process_type(form526)

lib/sidekiq/form526_backup_submission_process/processor.rb

@@ -327,7 +327,7 @@ def write_to_tmp_file(content, ext = 'pdf')
 
       def get_form526_pdf
         headers = submission.auth_headers
-        submission_create_date = submission.created_at.iso8601
+        submission_create_date = submission.created_at.strftime('%Y-%m-%d')
         form_json = submission.form[FORM_526]
         form_json[FORM_526]['claimDate'] ||= submission_create_date
         form_json[FORM_526]['applicationExpirationDate'] = 365.days.from_now.iso8601 if @ignore_expiration

spec/lib/disability_compensation/requests/form526_requests_body_spec.rb

@@ -15,6 +15,11 @@
       expect(form).to respond_to(:claim_process_type)
     end
 
+    # this is the only difference between Form526 and Form526Pdf
+    it 'does not have claim_date attribute' do
+      expect(form).not_to respond_to(:claim_date)
+    end
+
     # TODO: revisit if LH adds it back to the request
     # it 'has claim_date attribute' do
     #   expect(form).to respond_to(:claim_date)
@@ -57,6 +62,59 @@
     end
   end
 
+  describe Requests::Form526Pdf do
+    let(:form) { Requests::Form526Pdf.new }
+
+    it 'has claimant_certification attribute' do
+      expect(form).to respond_to(:claimant_certification)
+    end
+
+    it 'has claim_process_type attribute' do
+      expect(form).to respond_to(:claim_process_type)
+    end
+
+    # this is the only difference between Form526 and Form526Pdf
+    it 'has claim_date attribute' do
+      expect(form).to respond_to(:claim_date)
+    end
+
+    it 'has veteran_identification attribute' do
+      expect(form).to respond_to(:veteran_identification)
+    end
+
+    it 'has change_of_address attribute' do
+      expect(form).to respond_to(:change_of_address)
+    end
+
+    it 'has homeless attribute' do
+      expect(form).to respond_to(:homeless)
+    end
+
+    it 'has toxic_exposure attribute' do
+      expect(form).to respond_to(:toxic_exposure)
+    end
+
+    it 'has disabilities attribute' do
+      expect(form).to respond_to(:disabilities)
+    end
+
+    it 'has treatments attribute' do
+      expect(form).to respond_to(:treatments)
+    end
+
+    it 'has service_information attribute' do
+      expect(form).to respond_to(:service_information)
+    end
+
+    it 'has service_pay attribute' do
+      expect(form).to respond_to(:service_pay)
+    end
+
+    it 'has direct_deposit attribute' do
+      expect(form).to respond_to(:direct_deposit)
+    end
+  end
+
   describe Requests::VeteranIdentification do
     let(:veteran) { Requests::VeteranIdentification.new }
 

spec/lib/evss/disability_compensation_form/form526_to_lighthouse_transform_spec.rb

@@ -1,10 +1,55 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'claims_api/form_schemas'
+require 'json_schema/json_api_missing_attribute'
 require 'evss/disability_compensation_form/form526_to_lighthouse_transform'
 
+LH_SCHEMA_KEY = 'GENERATE_PDF_526'
+
 RSpec.describe EVSS::DisabilityCompensationForm::Form526ToLighthouseTransform do
   let(:transformer) { subject }
+  let(:pdf_enabled_transformer) { EVSS::DisabilityCompensationForm::Form526ToLighthouseTransform.new(pdf_request: true) }
+  let(:pdf_disabled_transformer) { EVSS::DisabilityCompensationForm::Form526ToLighthouseTransform.new(pdf_request: false) }
+
+  def validate_lighthouse_schema(lh_request_body)
+    # This validation method mimics the same validation logic used in the actual controller
+    # https://github.com/department-of-veterans-affairs/vets-api/blob/master/modules/claims_api/app/controllers/claims_api/v2/veterans/base.rb#L18
+    validator = ClaimsApi::FormSchemas.new(schema_version: 'v2')
+
+    # Convert the Vets::Model object to a hash and transform keys using the exact same
+    # transformation as the actual controller pipeline (OliveBranch with VA key patch)
+    request_body_hash = lh_request_body.as_json
+    camelized_request_body = transform_with_olivebranch(request_body_hash)
+
+    validator.validate!(LH_SCHEMA_KEY, camelized_request_body)
+  end
+
+  private
+
+  # Use the exact same transformation as the controller pipeline:
+  # OliveBranch transformation with VA key patch applied using the actual middleware logic
+  def transform_with_olivebranch(data)
+    # Transform using OliveBranch (same as the actual controller)
+    camelized = OliveBranch::Transformations.transform(
+      data,
+      OliveBranch::Transformations.method(:camelize)
+    )
+
+    # Apply the VA key patch using the same regex and logic as the middleware
+    json_string = camelized.to_json
+    # Use the same VA_KEY_REGEX pattern and gsub logic as the middleware extension
+    json_string.gsub!(/("[^"]+VA[^"]*"):/) do
+      key = Regexp.last_match(1)
+      "#{key.gsub('VA', 'Va')}:"
+    end
+
+    JSON.parse(json_string)
+  end
+
+  def expect_no_lighthouse_errors(lh_request_body)
+    expect { validate_lighthouse_schema(lh_request_body) }.not_to raise_error
+  end
 
   describe '#transform' do
     let(:submission) { create(:form526_submission, :with_everything_toxic_exposure) }
@@ -13,6 +58,59 @@
     it 'sets claimant_certification to true in the Lighthouse request body' do
       lh_request_body = transformer.transform(data)
       expect(lh_request_body.claimant_certification).to be(true)
+      expect_no_lighthouse_errors(lh_request_body)
+    end
+
+    it 'adds claim_date to the Lighthouse request body if called as a pdf request' do
+      data['form526']['claimDate'] = '2023-07-19' # arbitrary date
+      lh_request_body = pdf_enabled_transformer.transform(data)
+      expect(lh_request_body.class).to eq(Requests::Form526Pdf)
+      expect(lh_request_body.claim_date).to eq('2023-07-19')
+      expect_no_lighthouse_errors(lh_request_body)
+    end
+
+    it 'does not add claim_date to the Lighthouse request body if called as a non-pdf request' do
+      data['form526']['claimDate'] = '2023-07-19' # arbitrary date
+      lh_request_body = pdf_disabled_transformer.transform(data)
+      expect(lh_request_body.class).to eq(Requests::Form526)
+      expect { lh_request_body.claim_date }.to raise_error(NoMethodError)
+      expect_no_lighthouse_errors(lh_request_body)
+    end
+
+    it 'does not add claim_date to the Lighthouse request body if called without a pdf flag' do
+      data['form526']['claimDate'] = '2023-07-19' # arbitrary date
+      lh_request_body = transformer.transform(data)
+      expect(lh_request_body.class).to eq(Requests::Form526)
+      expect { lh_request_body.claim_date }.to raise_error(NoMethodError)
+      expect_no_lighthouse_errors(lh_request_body)
+    end
+
+    it 'does not add claim_date attribute to the Lighthouse request body key if nil' do
+      data['form526']['claimDate'] = nil
+      lh_request_body = transformer.transform(data)
+      expect { lh_request_body.claim_date }.to raise_error(NoMethodError)
+      expect_no_lighthouse_errors(lh_request_body)
+    end
+
+    it 'does not add claim_date attribute to the Lighthouse request body if not provided at all' do
+      data['form526'].delete('claimDate')
+      lh_request_body = transformer.transform(data)
+      expect { lh_request_body.claim_date }.to raise_error(NoMethodError)
+      expect_no_lighthouse_errors(lh_request_body)
+    end
+
+    it 'does not add claim_date to the Lighthouse request body if blank' do
+      data['form526']['claimDate'] = ''
+      lh_request_body = transformer.transform(data)
+      expect { lh_request_body.claim_date }.to raise_error(NoMethodError)
+      expect_no_lighthouse_errors(lh_request_body)
+    end
+
+    it 'does not add claim_date attribute to the Lighthouse request body if malformed date' do
+      data['form526']['claimDate'] = 'invalid-date'
+      lh_request_body = transformer.transform(data)
+      expect { lh_request_body.claim_date }.to raise_error(NoMethodError)
+      expect_no_lighthouse_errors(lh_request_body)
     end
 
     # TODO: re-visit once we get clarification on whether claimDate needs to be restored to LH request
@@ -52,6 +150,7 @@
       expect(result.toxic_exposure.additional_hazard_exposures.class).to eq(Requests::AdditionalHazardExposures)
       expect(result.toxic_exposure.multiple_exposures.class).to eq(Array)
       expect(result.claim_notes).to eq('some overflow text')
+      expect_no_lighthouse_errors(result)
     end
 
     it 'sends uniq values in multiple exposures array' do
@@ -79,6 +178,7 @@
       result = transformer.transform(data)
       # since this is now a uniq list, it is now 12 items instead of 13
       expect(result.toxic_exposure.multiple_exposures.count).to eq(12)
+      expect_no_lighthouse_errors(result)
     end
   end
 
@@ -93,6 +193,7 @@
       expect(result.direct_deposit).to be_nil
       expect(result.treatments).to eq([])
       expect(result.service_pay).to be_nil
+      expect_no_lighthouse_errors(result)
     end
   end
 
@@ -128,6 +229,7 @@
         expect(result.toxic_exposure.multiple_exposures.first.hazard_exposed_to).to be_nil
         expect(result.toxic_exposure.multiple_exposures.last.exposure_location).to be_nil
         expect(result.toxic_exposure.multiple_exposures.last.hazard_exposed_to).to eq('specifyOtherExposures')
+        expect_no_lighthouse_errors(result)
       end
 
       it 'is not processed if missing descriptions' do
@@ -153,6 +255,7 @@
         # nothing should have been processed for MultipleExposures because
         # all of the details are missing and the descriptions are missing in the "other" objects
         expect(result.toxic_exposure.multiple_exposures).to eq([])
+        expect_no_lighthouse_errors(result)
       end
     end
   end