[Burials] Location of Death update

Gemfile.lock

@@ -74,10 +74,10 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/vets-json-schema
-  revision: bdd9c4e3b6fd786798b3254be7af341add314722
+  revision: 34b767b6cf27abc7f33213abbfcb13238afd58de
   branch: master
   specs:
-    vets_json_schema (24.7.5)
+    vets_json_schema (24.8.1)
       multi_json (~> 1.0)
       script_utils (= 0.0.4)
 

modules/burials/lib/pdf_fill/forms/va21p530ez.rb

@@ -638,12 +638,15 @@ def convert_location_of_death
           location_of_death = @form_data['locationOfDeath']
           return if location_of_death.blank?
 
-          if location_of_death[location_of_death['location']].present? && location_of_death['location'] != 'other'
-            options = location_of_death[location_of_death['location']]
+          location = location_of_death['location']
+          options = location_of_death[location] || @form_data[location]
+          if options.present? && location != 'other'
             location_of_death['placeAndLocation'] = "#{options['facilityName']} - #{options['facilityLocation']}"
           end
 
-          location_of_death['location'] = 'nursingHomeUnpaid' if location_of_death['location'] == 'atHome'
+          @form_data.delete(location)
+
+          location_of_death['location'] = 'nursingHomeUnpaid' if location == 'atHome'
 
           expand_checkbox_as_hash(@form_data['locationOfDeath'], 'location')
         end

modules/burials/spec/fixtures/pdf_fill/21P-530EZ/kitchen_sink.json

@@ -39,7 +39,8 @@
     "placeOfSeparation":"placeofentry56",
     "rank":"gradeofentry56",
     "unit":"unit"}],
- "locationOfDeath":{"location":"other", "other":"other place"},
+ "locationOfDeath":{"location":"nursingHomePaid"},
+ "nursingHomePaid":{"facilityName":"Best Nursing Home","facilityLocation":"portland, ME"},
  "deathDate":"2024-01-01",
  "burialDate":"2024-01-02",
  "veteranFullName":{"first":"veteran", "middle":"middle", "last":"lastname", "suffix":"Jr."},

modules/burials/spec/fixtures/pdf_fill/21P-530EZ/merge_fields.json

@@ -54,9 +54,9 @@
     ],
     "locationOfDeath":
         {
-            "location":"other",
-            "other":"other place",
-            "checkbox":{"other":"On"}
+            "location":"nursingHomePaid",
+            "placeAndLocation": "Best Nursing Home - portland, ME",
+            "checkbox":{"nursingHomePaid":"On"}
         },
     "deathDate":{"month":"01", "day":"01", "year":"2024"},
     "burialDate":{"month":"01", "day":"02", "year":"2024"},

modules/burials/spec/lib/pdf_fill/forms/va21p530ez_spec.rb

@@ -100,6 +100,26 @@ def class_form_data
       end
     end
 
+    context 'with a regular location of death in new format' do
+      let(:form_data) do
+        {
+          'locationOfDeath' => {
+            'location' => 'nursingHomeUnpaid'
+          },
+          'nursingHomeUnpaid' => {
+            'facilityName' => 'facility name',
+            'facilityLocation' => 'Washington, DC'
+          }
+        }
+      end
+
+      it 'returns the directly mapped location' do
+        subject
+        expect(class_form_data['locationOfDeath']['checkbox']).to eq({ 'nursingHomeUnpaid' => 'On' })
+        expect(class_form_data['locationOfDeath']['placeAndLocation']).to eq('facility name - Washington, DC')
+      end
+    end
+
     context 'with a location needed for translation' do
       let(:form_data) do
         {