API-39899-update-zip-first-five-validations-for-coa

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

@@ -156,12 +156,23 @@ def validate_form_526_change_of_address_state
 
       def validate_form_526_change_of_address_zip
         address = form_attributes['changeOfAddress'] || {}
-        if address['country'] == 'USA' && address['zipFirstFive'].blank?
+        validate_form_526_usa_coa_conditions(address) if address['country'] == 'USA'
+      end
+
+      def validate_form_526_usa_coa_conditions(address)
+        if address['zipFirstFive'].blank?
           collect_error_messages(
-            source: '/changeOfAddress/zipFirstFive',
+            source: '/changeOfAddress/',
             detail: 'The zipFirstFive is required if the country is USA.'
           )
-        elsif address['country'] == 'USA' && address['internationalPostalCode'].present?
+        end
+        if address['state'].blank?
+          collect_error_messages(
+            source: '/changeOfAddress/',
+            detail: 'The state is required if the country is USA.'
+          )
+        end
+        if address['internationalPostalCode'].present?
           collect_error_messages(
             source: '/changeOfAddress/internationalPostalCode',
             detail: 'The internationalPostalCode should not be provided if the country is USA.'

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

@@ -378,6 +378,36 @@ def current_error_array
       end
     end
 
+    context 'conditional validations when the country is USA' do
+      context 'zipfirstFive is not included' do
+        it 'returns an error array' do
+          subject.form_attributes['changeOfAddress']['zipFirstFive'] = ''
+          test_526_validation_instance.send(:validate_form_526_change_of_address_zip)
+          expect(current_error_array[0][:detail]).to eq('The zipFirstFive is required if the country is USA.')
+          expect(current_error_array[0][:source]).to eq('/changeOfAddress/')
+        end
+      end
+
+      context 'state is not included' do
+        it 'returns an error array' do
+          subject.form_attributes['changeOfAddress']['state'] = ''
+          test_526_validation_instance.send(:validate_form_526_change_of_address_zip)
+          expect(current_error_array[0][:detail]).to eq('The state is required if the country is USA.')
+          expect(current_error_array[0][:source]).to eq('/changeOfAddress/')
+        end
+      end
+
+      context 'internationalPostalCode is included' do
+        it 'returns an error array' do
+          subject.form_attributes['changeOfAddress']['internationalPostalCode'] = '333-444'
+          test_526_validation_instance.send(:validate_form_526_change_of_address_zip)
+          expect(current_error_array[0][:detail])
+            .to eq('The internationalPostalCode should not be provided if the country is USA.')
+          expect(current_error_array[0][:source]).to eq('/changeOfAddress/internationalPostalCode')
+        end
+      end
+    end
+
     context 'when the country is not provided' do
       it 'returns an error array' do
         subject.form_attributes['changeOfAddress']['country'] = ''