[DBEX] set indicator object from submitted string value

freeheeling · web-flow · commit c7a6b321f5b0 · 2025-01-03T08:50:16.000-07:00
diff --git a/lib/pdf_fill/forms/va210781v2.rb b/lib/pdf_fill/forms/va210781v2.rb
@@ -619,6 +619,7 @@ def merge_fields(_options = {})
 
         set_treatment_selection
         set_reports_selection
+        set_option_indicator
 
         format_other_behavior_details
         format_police_report_location
@@ -674,6 +675,16 @@ def set_reports_selection
         @form_data['otherReport'] = reports['other'] ? 4 : nil
       end
 
+      def set_option_indicator
+        selected_option = @form_data['optionIndicator']
+        valid_options = %w[yes no revoke notEnrolled]
+
+        return if selected_option.nil? || valid_options.exclude?(selected_option)
+
+        @form_data['optionIndicator'] = valid_options.index_with { |_option| false }
+        @form_data['optionIndicator'][selected_option] = true
+      end
+
       def format_other_behavior_details
         other_behavior = @form_data['behaviors']&.[]('otherBehavior')
         return if other_behavior.blank?
diff --git a/spec/fixtures/pdf_fill/21-0781V2/kitchen_sink.json b/spec/fixtures/pdf_fill/21-0781V2/kitchen_sink.json
@@ -115,11 +115,6 @@
       "noDates": true
     }
   ],
-  "optionIndicator": {
-    "yes": false,
-    "no": false,
-    "revoke": false,
-    "notEnrolled": true
-  },
+  "optionIndicator": "notEnrolled",
   "signatureDate": "2016-01-31"
 }
diff --git a/spec/fixtures/pdf_fill/21-0781V2/overflow.json b/spec/fixtures/pdf_fill/21-0781V2/overflow.json
@@ -144,11 +144,6 @@
       "noDates": true
     }
   ],
-  "optionIndicator": {
-    "yes": false,
-    "no": false,
-    "revoke": false,
-    "notEnrolled": true
-  },
+  "optionIndicator": "notEnrolled",
   "signatureDate": "2016-01-31"
 }
diff --git a/spec/support/disability_compensation_form/all_claims_with_0781v2_fe_submission.json b/spec/support/disability_compensation_form/all_claims_with_0781v2_fe_submission.json
@@ -241,9 +241,7 @@
             "noDates": true
           }
         ],
-        "optionIndicator": {
-          "notEnrolled": true
-        },
+        "optionIndicator": "notEnrolled",
         "additionalInformation": "Lorem ipsum dolor sit amet."
       }
     }
diff --git a/spec/support/disability_compensation_form/form_0781v2.json b/spec/support/disability_compensation_form/form_0781v2.json
@@ -116,9 +116,7 @@
         "noDates": true
       }
     ],
-    "optionIndicator": {
-      "notEnrolled": true
-    },
+    "optionIndicator": "notEnrolled",
     "additionalInformation": "Lorem ipsum dolor sit amet."
   }
 }
diff --git a/spec/support/disability_compensation_form/submissions/with_0781v2.json b/spec/support/disability_compensation_form/submissions/with_0781v2.json
@@ -421,9 +421,7 @@
           "noDates": true
         }
       ],
-      "optionIndicator": {
-        "notEnrolled": true
-      },
+      "optionIndicator": "notEnrolled",
       "additionalInformation": "Lorem ipsum dolor sit amet."
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -115,11 +115,6 @@`
`115`	`115`	`"noDates": true`
`116`	`116`	`}`
`117`	`117`	`],`
`118`		`- "optionIndicator": {`
`119`		`- "yes": false,`
`120`		`- "no": false,`
`121`		`- "revoke": false,`
`122`		`- "notEnrolled": true`
`123`		`- },`
	`118`	`+ "optionIndicator": "notEnrolled",`
`124`	`119`	`"signatureDate": "2016-01-31"`
`125`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,6 @@`
`144`	`144`	`"noDates": true`
`145`	`145`	`}`
`146`	`146`	`],`
`147`		`- "optionIndicator": {`
`148`		`- "yes": false,`
`149`		`- "no": false,`
`150`		`- "revoke": false,`
`151`		`- "notEnrolled": true`
`152`		`- },`
	`147`	`+ "optionIndicator": "notEnrolled",`
`153`	`148`	`"signatureDate": "2016-01-31"`
`154`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,9 +241,7 @@`
`241`	`241`	`"noDates": true`
`242`	`242`	`}`
`243`	`243`	`],`
`244`		`- "optionIndicator": {`
`245`		`- "notEnrolled": true`
`246`		`- },`
	`244`	`+ "optionIndicator": "notEnrolled",`
`247`	`245`	`"additionalInformation": "Lorem ipsum dolor sit amet."`
`248`	`246`	`}`
`249`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,7 @@`
`116`	`116`	`"noDates": true`
`117`	`117`	`}`
`118`	`118`	`],`
`119`		`- "optionIndicator": {`
`120`		`- "notEnrolled": true`
`121`		`- },`
	`119`	`+ "optionIndicator": "notEnrolled",`
`122`	`120`	`"additionalInformation": "Lorem ipsum dolor sit amet."`
`123`	`121`	`}`
`124`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -421,9 +421,7 @@`
`421`	`421`	`"noDates": true`
`422`	`422`	`}`
`423`	`423`	`],`
`424`		`- "optionIndicator": {`
`425`		`- "notEnrolled": true`
`426`		`- },`
	`424`	`+ "optionIndicator": "notEnrolled",`
`427`	`425`	`"additionalInformation": "Lorem ipsum dolor sit amet."`
`428`	`426`	`}`
`429`	`427`	`},`