Fixed Dockerfile merge conflict (#16479)

.github/CODEOWNERS

@@ -664,6 +664,7 @@ config/form_profile_mappings/0873.yml @department-of-veterans-affairs/vfs-virtua
 config/form_profile_mappings/1010ez.yml @department-of-veterans-affairs/vfs-10-10 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 config/form_profile_mappings/10-10EZR.yml @department-of-veterans-affairs/vfs-10-10 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 config/form_profile_mappings/10182.yml @department-of-veterans-affairs/Benefits-Team-1 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
+config/form_profile_mappings/10-7959F-1.yml @department-of-veterans-affairs/champva-engineering @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 config/form_profile_mappings/20-0995.yml @department-of-veterans-affairs/Benefits-Team-1 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 config/form_profile_mappings/20-0996.yml @department-of-veterans-affairs/Benefits-Team-1 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
 config/form_profile_mappings/21-526EZ.yml @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group

app/models/form_profile.rb

@@ -101,7 +101,8 @@ class FormProfile
     vre_readiness: ['28-1900'],
     coe: ['26-1880'],
     adapted_housing: ['26-4555'],
-    intent_to_file: ['21-0966']
+    intent_to_file: ['21-0966'],
+    ivc_champva: ['10-7959F-1']
   }.freeze
 
   FORM_ID_TO_CLASS = {
@@ -138,7 +139,8 @@ class FormProfile
     '22-1990EZ' => ::FormProfiles::VA1990ez,
     '26-1880' => ::FormProfiles::VA261880,
     '26-4555' => ::FormProfiles::VA264555,
-    '21-0966' => ::FormProfiles::VA210966
+    '21-0966' => ::FormProfiles::VA210966,
+    '10-7959F-1' => ::FormProfiles::VA107959f1
   }.freeze
 
   APT_REGEX = /\S\s+((apt|apartment|unit|ste|suite).+)/i

app/models/form_profiles/va_107959f1.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class FormProfiles::VA107959f1 < FormProfile
+  FORM_ID = '10-7959F-1'
+
+  def metadata
+    {
+      version: 0,
+      prefill: true,
+      returnUrl: '/review-and-submit'
+    }
+  end
+end

config/form_profile_mappings/10-7959F-1.yml

@@ -0,0 +1,22 @@
+
+veteran:
+  date_of_birth: [identity_information, date_of_birth]
+  full_name: [identity_information, full_name]
+  first: [identity_information, first]
+  middle: [identity_information, middle]
+  last: [identity_information, last]
+physical_address:
+  country: [contact_information, country]
+  street: [contact_information, street]
+  city: [contact_information, city]
+  state: [contact_information, state]
+  postal_code: [contact_information, postal_code]
+mailing_address:
+  country: [contact_information, country]
+  street: [contact_information, street]
+  city: [contact_information, city]
+  state: [contact_information, state]
+  postal_code: [contact_information, postal_code]
+ssn: [identity_information, ssn]
+phone_number: [contact_information, us_phone]
+email_address: [contact_information, email]

config/settings.yml

@@ -407,6 +407,9 @@ adapted_housing:
 intent_to_file:
   prefill: true
 
+ivc_champva:
+  prefill: true
+
 # Settings for Expiry Scanner
 expiry_scanner:
   slack: