Remove unneeded feature flags (#11876)

department-of-veterans-affairs · Feb 24, 2023 · 038d59e · 038d59e
1 parent f1a39f0
commit 038d59e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 38 deletions.
diff --git a/app/models/saved_claim/veteran_readiness_employment_claim.rb b/app/models/saved_claim/veteran_readiness_employment_claim.rb
@@ -174,7 +174,6 @@ def regional_office
   end
 
   def send_vbms_confirmation_email(user)
-    return unless Flipper.enabled?(:ch31_vbms_form_confirmation_email)
     return if user.va_profile_email.blank?
 
     VANotify::EmailJob.perform_async(
@@ -188,7 +187,6 @@ def send_vbms_confirmation_email(user)
   end
 
   def send_central_mail_confirmation_email(user)
-    return unless Flipper.enabled?(:ch31_central_mail_form_confirmation_email)
     return if user.va_profile_email.blank?
 
     VANotify::EmailJob.perform_async(

diff --git a/app/workers/bgs/submit_form674_job.rb b/app/workers/bgs/submit_form674_job.rb
@@ -44,7 +44,6 @@ def valid_claim_data(saved_claim_id, vet_info)
     end
 
     def send_confirmation_email(user)
-      return unless Flipper.enabled?(:form674_confirmation_email)
       return if user.va_profile_email.blank?
 
       VANotify::ConfirmationEmail.send(

diff --git a/app/workers/bgs/submit_form686c_job.rb b/app/workers/bgs/submit_form686c_job.rb
@@ -42,23 +42,12 @@ def valid_claim_data(saved_claim_id, vet_info)
     def send_confirmation_email(user)
       return if user.va_profile_email.blank?
 
-      if Flipper.enabled?(:form674_confirmation_email)
-        VANotify::ConfirmationEmail.send(
-          email_address: user.va_profile_email,
-          template_id: Settings.vanotify.services.va_gov.template_id.form686c_confirmation_email,
-          first_name: user&.first_name&.upcase,
-          user_uuid_and_form_id: "#{user.uuid}_#{FORM_ID}"
-        )
-      else
-        VANotify::EmailJob.perform_async(
-          user.va_profile_email,
-          Settings.vanotify.services.va_gov.template_id.form686c_confirmation_email,
-          {
-            'first_name' => user&.first_name&.upcase,
-            'date' => Time.now.in_time_zone('Eastern Time (US & Canada)').strftime('%B %d, %Y')
-          }
-        )
-      end
+      VANotify::ConfirmationEmail.send(
+        email_address: user.va_profile_email,
+        template_id: Settings.vanotify.services.va_gov.template_id.form686c_confirmation_email,
+        first_name: user&.first_name&.upcase,
+        user_uuid_and_form_id: "#{user.uuid}_#{FORM_ID}"
+      )
     end
   end
 end
diff --git a/app/workers/central_mail/submit_career_counseling_job.rb b/app/workers/central_mail/submit_career_counseling_job.rb
@@ -13,8 +13,6 @@ def perform(claim_id, user_uuid = nil)
     end
 
     def send_confirmation_email(user_uuid)
-      return unless Flipper.enabled?(:career_counseling_confirmation_email)
-
       email = if user_uuid.present? && (found_email = User.find(user_uuid)&.va_profile_email)
                 found_email
               else

diff --git a/config/features.yml b/config/features.yml
@@ -19,10 +19,6 @@ features:
   caregiver_use_facilities_API:
     actor_type: user
     description: Allow list of caregiver facilites to be fetched by way of the Facilities API.
-  career_counseling_confirmation_email:
-    actor_type: user
-    description: Enables Career Counseling claim email confirmation upon submission
-    enable_in_development: true
   hca_american_indian_enabled:
     actor_type: user
     description: Enables American Indian SIGI question page.
@@ -114,14 +110,6 @@ features:
     actor_type: user
     description: Enables updated appointment details presentation.
     enable_in_development: true
-  ch31_vbms_form_confirmation_email:
-    actor_type: user
-    description: Enables Ch31 form email submission confirmation after central mail
-    enable_in_development: true
-  ch31_central_mail_form_confirmation_email:
-    actor_type: user
-    description: Enables Ch31 form email submission confirmation after vbms
-    enable_in_development: true
   claim_letters_access:
     actor_type: user
     description: Enables users to access the claim letters page
@@ -358,10 +346,6 @@ features:
     actor_type: user
     description: Enables form 5490 email submission confirmation (VaNotify)
     enable_in_development: true
-  form674_confirmation_email:
-    actor_type: user
-    description: Form 674 - Email submission confirmation
-    enable_in_development: true
   fsr_confirmation_email:
     actor_type: user
     description: Enables notifications to be sent via email upon FSR submission