#90355 [10-10 Health Apps] Improve code quality for shared code

config/features.yml

@@ -1406,6 +1406,10 @@ features:
     actor_type: user
     description: Use the original veteran_x models to power Appoint a Rep entity search
     enable_in_development: true
+  va1010_forms_enrollment_system_service_enabled:
+    actor_type: user
+    description: Enables the VA1010Forms enrollment system service
+    enable_in_development: true
   va_notify_custom_errors:
     actor_type: user
     description: Custom error classes instead of the generic Common::Exceptions::BackendServiceException

lib/form1010_ezr/service.rb

@@ -6,6 +6,7 @@
 require 'hca/ezr_postfill'
 require 'va1010_forms/utils'
 require 'hca/overrides_parser'
+require 'va1010_forms/enrollment_system/service'
 
 module Form1010Ezr
   class Service < Common::Client::Base
@@ -38,23 +39,25 @@ def submit_async(parsed_form)
 
     def submit_sync(parsed_form)
       res = with_monitoring do
-        es_submit(parsed_form, HealthCareApplication.get_user_identifier(@user), FORM_ID)
+        if Flipper.enabled?(:va1010_forms_enrollment_system_service_enabled)
+          VA1010Forms::EnrollmentSystem::Service.new(
+            HealthCareApplication.get_user_identifier(@user)
+          ).submit(parsed_form, FORM_ID)
+        else
+          es_submit(parsed_form, HealthCareApplication.get_user_identifier(@user), FORM_ID)
+        end
       end
-
       # Log the 'formSubmissionId' for successful submissions
-      Rails.logger.info(
-        '1010EZR successfully submitted',
-        submission_id: res[:formSubmissionId],
-        veteran_initials: veteran_initials(parsed_form)
-      )
+      log_successful_submission(res[:formSubmissionId], veteran_initials(parsed_form))
 
       if parsed_form['attachments'].present?
         StatsD.increment("#{Form1010Ezr::Service::STATSD_KEY_PREFIX}.submission_with_attachment")
       end
 
       res
     rescue => e
-      log_and_raise_error(e, parsed_form)
+      log_submission_failure(parsed_form)
+      raise e
     end
 
     # @param [HashWithIndifferentAccess] parsed_form JSON form data
@@ -66,7 +69,8 @@ def submit_form(parsed_form)
 
       submit_async(parsed_form)
     rescue => e
-      log_and_raise_error(e, parsed_form)
+      log_submission_failure(parsed_form)
+      raise e
     end
 
     def log_submission_failure(parsed_form)
@@ -107,11 +111,8 @@ def validate_form(parsed_form)
           )
         end
 
-        log_validation_errors(parsed_form)
+        log_validation_errors(validation_errors, parsed_form)
 
-        Rails.logger.error(
-          "10-10EZR form validation failed. Form does not match schema. Error list: #{validation_errors}"
-        )
         raise Common::Exceptions::SchemaValidationErrors, validation_errors
       end
     end
@@ -168,19 +169,26 @@ def add_financial_flag(parsed_form)
       end
     end
 
-    def log_validation_errors(parsed_form)
+    # @param [Hash] errors
+    def log_validation_errors(errors, parsed_form)
       StatsD.increment("#{Form1010Ezr::Service::STATSD_KEY_PREFIX}.validation_error")
 
+      Rails.logger.error(
+        "10-10EZR form validation failed. Form does not match schema. Error list: #{errors}"
+      )
+
       PersonalInformationLog.create(
         data: parsed_form,
         error_class: 'Form1010Ezr ValidationError'
       )
     end
 
-    def log_and_raise_error(error, form)
-      log_submission_failure(form)
-      Rails.logger.error "10-10EZR form submission failed: #{error.message}"
-      raise error
+    def log_successful_submission(submission_id, veteran_initials)
+      Rails.logger.info(
+        '1010EZR successfully submitted',
+        submission_id:,
+        veteran_initials:
+      )
     end
   end
 end

lib/hca/service.rb

@@ -4,6 +4,7 @@
 require 'hca/enrollment_system'
 require 'hca/configuration'
 require 'va1010_forms/utils'
+require 'va1010_forms/enrollment_system/service'
 
 module HCA
   class Service < Common::Client::Base
@@ -24,7 +25,11 @@ def submit_form(form)
       is_short_form = HealthCareApplication.new(form: form.to_json).short_form?
 
       with_monitoring do
-        es_submit(form, @user, '10-10EZ')
+        if Flipper.enabled?(:va1010_forms_enrollment_system_service_enabled)
+          VA1010Forms::EnrollmentSystem::Service.new(@user).submit(form, '10-10EZ')
+        else
+          es_submit(form, @user, '10-10EZ')
+        end
       rescue => e
         increment_failure('submit_form_short_form', e) if is_short_form
         raise e