[Disability Benefits] #108835- fix special chars in 0781V2 PDF (#22224)

Co-authored-by: Alison Jones <1816769+ajones446@users.noreply.github.com>

Author: tommasina-va

lib/pdf_fill/filler.rb

@@ -156,8 +156,9 @@ def process_form(form_id, form_data, form_class, file_name_extension, fill_optio
 
       has_template = form_class.const_defined?(:TEMPLATE)
       template_path = has_template ? form_class::TEMPLATE : "lib/pdf_fill/forms/pdfs/#{form_id}.pdf"
-
-      (form_id == SavedClaim::CaregiversAssistanceClaim::FORM ? UNICODE_PDF_FORMS : PDF_FORMS).fill_form(
+      unicode_pdf_form_list = [SavedClaim::CaregiversAssistanceClaim::FORM,
+                               EVSS::DisabilityCompensationForm::SubmitForm0781::FORM_ID_0781V2]
+      (form_id.in?(unicode_pdf_form_list) ? UNICODE_PDF_FORMS : PDF_FORMS).fill_form(
         template_path, file_path, new_hash, flatten: Rails.env.production?
       )
 

spec/factories/va526ez.rb

@@ -8,4 +8,13 @@
       )['form526'].to_json
     }
   end
+
+  factory :va526ez_0781v2, class: 'SavedClaim::DisabilityCompensation::Form526AllClaim' do
+    # for Form 21-0781V2
+    form {
+      JSON.parse(
+        File.read('spec/support/disability_compensation_form/all_claims_with_0781v2_fe_submission.json')
+      )['form526'].to_json
+    }
+  end
 end

spec/fixtures/pdf_fill/21-0781V2/kitchen_sink.json

@@ -11,7 +11,7 @@
   "email": "testy.testerson@gmail.com",
   "veteranPhone": "2123456789",
   "veteranSecondaryPhone": "3133456789",
-  "additionalInformation": "Lorem ipsum dolor sit amet",
+  "additionalInformation": "Lorem ‒–—―‖‗‘’‚‛“”„‟′″‴á, é, í, ó, ú, Á, É, Í, Ó, Úñ, Ñ¿, ¡ipsum dolor sit amet",
   "eventTypes": {
     "combat": true,
     "mst": true,

spec/fixtures/pdf_fill/21-0781V2/kitchen_sink.pdf

@@ -24,7 +24,7 @@
     "third": "6789"
   },
   "veteranSecondaryPhone": "3133456789",
-  "additionalInformation": "Lorem ipsum dolor sit amet",
+  "additionalInformation": "Lorem ‒–—―‖‗‘’‚‛“”„‟′″‴á, é, í, ó, ú, Á, É, Í, Ó, Úñ, Ñ¿, ¡ipsum dolor sit amet",
   "eventTypes": {
     "combat": true,
     "mst": true,

spec/fixtures/pdf_fill/21-0781V2/merge_fields.json

@@ -109,6 +109,49 @@
     end
   end
 
+  describe '#fill_ancillary_form with form_id is 21-0781V2' do
+    context 'when form_id is 21-0781V2' do
+      let(:form_id) { '21-0781V2' }
+      let(:form_data) do
+        get_fixture('pdf_fill/21-0781V2/kitchen_sink')
+      end
+      let(:hash_converter) { PdfFill::HashConverter.new('%m/%d/%Y', extras_generator) }
+      let(:extras_generator) { instance_double(PdfFill::ExtrasGenerator) }
+      let(:merged_form_data) do
+        PdfFill::Forms::Va210781v2.new(form_data).merge_fields('signatureDate' => Time.now.utc.to_s)
+      end
+      let(:new_hash) do
+        hash_converter.transform_data(form_data: merged_form_data, pdftk_keys: PdfFill::Forms::Va210781v2::KEY)
+      end
+      let(:template_path) { 'lib/pdf_fill/forms/pdfs/21-0781V2.pdf' }
+      let(:file_path) { 'tmp/pdfs/21-0781V2_12346.pdf' }
+      let(:claim_id) { '12346' }
+
+      it 'uses UNICODE_PDF_FORMS to fill the form for form_id 21-0781V2' do
+        # Mock the hash converter and its behavior
+        allow(extras_generator).to receive(:text?).once.and_return(true)
+        allow(extras_generator).to receive(:add_text)
+        allow(hash_converter).to receive(:transform_data).and_return(new_hash)
+
+        # Mock UNICODE_PDF_FORMS and PDF_FORMS
+        allow(described_class::UNICODE_PDF_FORMS).to receive(:fill_form).and_call_original
+        allow(described_class::PDF_FORMS).to receive(:fill_form).and_call_original
+
+        generated_pdf_path = described_class.fill_ancillary_form(form_data, claim_id, form_id)
+        unicode_text = 'Lorem ‒–—―‖‗‘’‚‛“”„‟′″‴á, é, í, ó, ú, Á, É, Í, Ó, Úñ, Ñ¿, ¡ipsum dolor sit amet'
+        expect(File).to exist(generated_pdf_path)
+        expect(described_class::UNICODE_PDF_FORMS).to have_received(:fill_form).with(
+          template_path, generated_pdf_path, hash_including('F[0].#subform[5].Remarks_If_Any[0]' => unicode_text),
+          flatten: false
+        )
+
+        expect(described_class::PDF_FORMS).not_to have_received(:fill_form)
+
+        File.delete(file_path)
+      end
+    end
+  end
+
   describe '#stamp_form' do
     let(:file_path) { 'tmp/test.pdf' }
     let(:submit_date) { DateTime.new(2020, 12, 25, 14, 30, 0, '+0000') }

spec/lib/pdf_fill/filler_spec.rb

@@ -26,6 +26,8 @@
   let(:evss_claim_id) { 123_456_789 }
   let(:saved_claim) { create(:va526ez) }
   # contains 0781 and 0781a
+  let(:saved_claim_with_0781v2) { create(:va526ez_0781v2) }
+  # contains 0781V2
   let(:form0781) do
     File.read 'spec/support/disability_compensation_form/submissions/with_0781.json'
   end
@@ -103,7 +105,7 @@
         Form526Submission.create(user_uuid: user.uuid,
                                  user_account:,
                                  auth_headers_json: auth_headers.to_json,
-                                 saved_claim_id: saved_claim.id,
+                                 saved_claim_id: saved_claim_with_0781v2.id,
                                  form_json: form0781v2,
                                  submitted_claim_id: evss_claim_id)
       end
@@ -707,7 +709,7 @@
         Form526Submission.create(user_uuid: user.uuid,
                                  user_account:,
                                  auth_headers_json: auth_headers.to_json,
-                                 saved_claim_id: saved_claim.id,
+                                 saved_claim_id: saved_claim_with_0781v2.id,
                                  form_json: form0781v2,
                                  submitted_claim_id: evss_claim_id)
       end

spec/sidekiq/evss/disability_compensation_form/submit_form0781_spec.rb

@@ -46,7 +46,7 @@
       "name": "Jane Doe",
       "phoneNumber": "1231231231"
     },
-    "isVAEmployee": false,
+    "isVaEmployee": false,
     "militaryRetiredPayBranch": "Air Force",
     "needToLeaveHousing": true,
     "ratedDisabilities": [