Api 24834 section 7 service pay validation (#12771)

* Incremental commit * Rubocop fixes * Test fixes & cleanup * Disable module length check * Update context descriptions for updated field names * Linting fix for quotes * Remove duplicate module declaration * Changes for review feedback * Add generated swagger
department-of-veterans-affairs · May 31, 2023 · 6fde0c3 · 6fde0c3
1 parent aa6c8d3
commit 6fde0c3
Show file tree

Hide file tree

Showing 5 changed files with 382 additions and 8 deletions.
diff --git a/...s/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb b/...s/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb
@@ -14,6 +14,8 @@ def validate_form_526_submission_values!
         validate_form_526_current_mailing_address_country!
         # ensure homeless information is valid
         validate_form_526_veteran_homelessness!
+        # ensure military service pay information is valid
+        validate_form_526_service_pay!
         # ensure treament centers information is valid
         validate_form_526_treatments!
         # ensure service information is valid
@@ -119,6 +121,50 @@ def missing_point_of_contact?
         homelessness_poc_attr.blank? && (currently_homeless_attr.present? || homelessness_risk_attr.present?)
       end
 
+      def validate_form_526_service_pay!
+        validate_form_526_military_retired_pay!
+        validate_form_526_future_military_retired_pay!
+        validate_form_526_separation_pay_received_date!
+      end
+
+      def validate_form_526_military_retired_pay!
+        receiving_attr = form_attributes.dig('servicePay', 'receivingMilitaryRetiredPay')
+        future_attr = form_attributes.dig('servicePay', 'futureMilitaryRetiredPay')
+
+        return if receiving_attr.nil? || future_attr.nil?
+        return unless receiving_attr == future_attr
+
+        # EVSS does not allow both attributes to be the same value (unless that value is nil)
+        raise ::Common::Exceptions::InvalidFieldValue.new(
+          'servicePay.militaryRetiredPay',
+          form_attributes['servicePay']['militaryRetiredPay']
+        )
+      end
+
+      def validate_form_526_future_military_retired_pay!
+        future_attr = form_attributes.dig('servicePay', 'futureMilitaryRetiredPay')
+        future_explanation_attr = form_attributes.dig('servicePay', 'futureMilitaryRetiredPayExplanation')
+        return if future_attr.nil?
+
+        if future_attr == true && future_explanation_attr.blank?
+          raise ::Common::Exceptions::UnprocessableEntity.new(
+            detail: "If 'servicePay.futureMilitaryRetiredPay' is true, then " \
+                    "'servicePay.futureMilitaryRetiredPayExplanation' is required"
+          )
+        end
+      end
+
+      def validate_form_526_separation_pay_received_date!
+        separation_pay_received_date = form_attributes.dig('servicePay', 'separationSeverancePay',
+                                                           'datePaymentReceived')
+        return if separation_pay_received_date.blank?
+
+        return if Date.parse(separation_pay_received_date) < Time.zone.today
+
+        raise ::Common::Exceptions::InvalidFieldValue.new('separationSeverancePay.datePaymentReceived',
+                                                          separation_pay_received_date)
+      end
+
       def validate_form_526_treatments!
         treatments = form_attributes['treatments']
         return if treatments.blank?

diff --git a/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json b/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json
@@ -3938,9 +3938,7 @@
                           "branchOfService": "Army",
                           "monthlyAmount": 840.75
                         },
-                        "retiredStatus": [
-
-                        ],
+                        "retiredStatus": "RETIRED",
                         "receivedSeparationOrSeverancePay": false,
                         "separationSeverancePay": {
                           "datePaymentReceived": "2018-07-31",
@@ -4594,8 +4592,8 @@
                     "id": "1",
                     "type": "intent_to_file",
                     "attributes": {
-                      "creationDate": "2023-05-24",
-                      "expirationDate": "2024-05-24",
+                      "creationDate": "2023-05-26",
+                      "expirationDate": "2024-05-26",
                       "type": "compensation",
                       "status": "active"
                     }

diff --git a/modules/claims_api/config/schemas/v2/request_bodies/disability_compensation/example.json b/modules/claims_api/config/schemas/v2/request_bodies/disability_compensation/example.json
@@ -184,7 +184,7 @@
             "branchOfService": "Army",
             "monthlyAmount": 840.75
         },
-        "retiredStatus": [],
+        "retiredStatus": "RETIRED",
         "receivedSeparationOrSeverancePay": false,
         "separationSeverancePay": {
           "datePaymentReceived": "2018-07-31",

diff --git a/modules/claims_api/spec/fixtures/v2/veterans/disability_compensation/form_526_json_api.json b/modules/claims_api/spec/fixtures/v2/veterans/disability_compensation/form_526_json_api.json
@@ -204,7 +204,7 @@
                 "retiredStatus": "RETIRED",
                 "receivedSeparationOrSeverancePay": false,
                 "separationSeverancePay": {
-                    "datePaymentReceived": "7169-07-31",
+                    "datePaymentReceived": "2022-03-01",
                     "branchOfService": "Naval Academy",
                     "preTaxAmountReceived": 379.25
                 }