Api 55108 v2 val use claim date

modules/claims_api/app/controllers/concerns/claims_api/v2/alt_revised_disability_compensation_validation.rb

@@ -24,6 +24,8 @@ def alt_rev_validate_form_526_submission_values
         return if form_attributes.empty?
 
         alt_rev_validate_claim_process_type_bdd if bdd_claim?
+        # ensure 'claimDate', if provided, is not in the future
+        alt_rev_validate_form_526_claim_date
         # ensure mailing address country is valid
         alt_rev_validate_form_526_identification
         # ensure disabilities are valid
@@ -42,6 +44,15 @@ def alt_rev_validate_form_526_submission_values
 
       private
 
+      def alt_rev_validate_form_526_claim_date
+        return if claim_date <= Date.current
+
+        collect_error_messages(
+          source: '/claimDate',
+          detail: 'claimDate must not be in the future.'
+        )
+      end
+
       def alt_rev_validate_form_526_change_of_address
         return if form_attributes['changeOfAddress'].blank?
 

modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb

@@ -2,11 +2,13 @@
 
 require 'claims_api/v2/disability_compensation_shared_service_module'
 require 'claims_api/lighthouse_military_address_validator'
+require 'claims_api/disability_compensation_validations_helper'
 
 module ClaimsApi
   module V2
     module DisabilityCompensationValidation # rubocop:disable Metrics/ModuleLength
       include DisabilityCompensationSharedServiceModule
+      include ClaimsApi::DisabilityCompensationValidationsHelper
       include LighthouseMilitaryAddressValidator
 
       DATE_FORMATS = {
@@ -25,6 +27,8 @@ def validate_form_526_submission_values(target_veteran)
         return if form_attributes.empty?
 
         validate_claim_process_type_bdd if bdd_claim?
+        # ensure 'claimDate', if provided, is not in the future
+        validate_form_526_claim_date
         # ensure 'claimantCertification' is true
         validate_form_526_claimant_certification
         # ensure mailing address country is valid
@@ -51,12 +55,13 @@ def validate_form_526_submission_values(target_veteran)
 
       private
 
-      def claim_date
-        @claim_date = if date_is_valid?(form_attributes['claimDate'], 'claimDate', true)
-                        Date.parse(form_attributes['claimDate'])
-                      else
-                        Time.zone.today
-                      end
+      def validate_form_526_claim_date
+        return if claim_date <= Date.current
+
+        collect_error_messages(
+          source: '/claimDate',
+          detail: 'claimDate must not be in the future.'
+        )
       end
 
       def validate_form_526_change_of_address

modules/claims_api/spec/controllers/concerns/claims_api/v2/alt_revised_disability_compensation_validation_spec.rb

@@ -1487,5 +1487,20 @@ def validate_field(field_path, expected_detail, expected_source)
         expect(errors).to be_empty
       end
     end
+
+    context 'when claimDate is in the future' do
+      it 'collects an error with the correct message' do
+        future_date = (Date.current + 1.day).iso8601
+        test_526_validation_instance.form_attributes['claimDate'] = future_date
+        test_526_validation_instance.instance_variable_set(:@claim_date, nil)
+
+        test_526_validation_instance.send(:alt_rev_validate_form_526_claim_date)
+        errors = current_error_array
+
+        expect(errors).not_to be_empty
+        expect(errors[0][:detail]).to eq('claimDate must not be in the future.')
+        expect(errors[0][:source]).to eq('/claimDate')
+      end
+    end
   end
 end

modules/claims_api/spec/lib/claims_api/v2/disability_compensation_validation_spec.rb

@@ -578,7 +578,7 @@ def validate_field(field_path, expected_detail, expected_source)
         # Ensure claimDate is not set
         expect(subject.form_attributes).not_to have_key('claimDate')
 
-        expect(subject.send(:claim_date)).to eq(Time.zone.today)
+        expect(subject.send(:claim_date)).to eq(Date.current)
 
         errors = test_526_validation_instance.send(:error_collection)
 
@@ -591,11 +591,26 @@ def validate_field(field_path, expected_detail, expected_source)
         subject.form_attributes['claimDate'] = 'invalid-date'
         subject.instance_variable_set(:@claim_date, nil)
 
-        expect(subject.send(:claim_date)).to eq(Time.zone.today)
+        expect(subject.send(:claim_date)).to eq(Date.current)
         errors = test_526_validation_instance.send(:error_collection)
 
         expect(errors).to be_empty
       end
     end
+
+    context 'when claimDate is in the future' do
+      it 'collects an error with the correct message' do
+        future_date = (Date.current + 1.day).iso8601
+        subject.form_attributes['claimDate'] = future_date
+        subject.instance_variable_set(:@claim_date, nil)
+
+        test_526_validation_instance.send(:validate_form_526_claim_date)
+        errors = test_526_validation_instance.send(:error_collection)
+
+        expect(errors).not_to be_empty
+        expect(errors[0][:detail]).to eq('claimDate must not be in the future.')
+        expect(errors[0][:source]).to eq('/claimDate')
+      end
+    end
   end
 end