Api 55108 v2 val use claim date

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 DisabilityCompensationValidationsHelper
       include LighthouseMilitaryAddressValidator
 
       DATE_FORMATS = {
@@ -51,14 +53,6 @@ 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
-      end
-
       def validate_form_526_change_of_address
         return if form_attributes['changeOfAddress'].blank?
 

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,7 +591,7 @@ 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