Remove weekly_submission_batch feature flag

Author: SamJamCul

.review_apps/ecs_task_definition.tf

@@ -24,8 +24,7 @@ locals {
     { name = "SETTINGS__ACT_AS_USER_ENABLED", value = "true" },
     { name = "SETTINGS__AUTH_PROVIDER", value = "developer" },
     { name = "SETTINGS__FORMS_ENV", value = "review" },
-    { name = "SETTINGS__FORMS_RUNNER__URL", value = "https://forms.service.gov.uk" },
-    { name = "SETTINGS__FEATURES__WEEKLY_SUBMISSION_EMAILS_ENABLED", value = "true" }
+    { name = "SETTINGS__FORMS_RUNNER__URL", value = "https://forms.service.gov.uk" }
   ]
 }
 

app/controllers/forms/batch_submissions_controller.rb

@@ -25,10 +25,6 @@ def batch_submissions_input_params
     def success_message(form)
       return nil unless form.send_daily_submission_batch_previously_changed? || form.send_weekly_submission_batch_previously_changed?
 
-      unless FeatureService.enabled?(:weekly_submission_emails_enabled)
-        return form.send_daily_submission_batch ? t("banner.success.form.daily_submission_batch_enabled") : t("banner.success.form.daily_submission_batch_disabled")
-      end
-
       if form.send_daily_submission_batch && form.send_weekly_submission_batch
         t("banner.success.form.batch_submissions.daily_and_weekly_enabled")
       elsif form.send_daily_submission_batch

app/services/form_task_list_service.rb

@@ -114,11 +114,8 @@ def submission_attachments_task
   end
 
   def batch_submissions_task
-    task_name = if FeatureService.enabled?(:weekly_submission_emails_enabled)
-                  I18n.t("forms.task_list_#{create_or_edit}.how_you_get_completed_forms_section.optional_subsection.batch_submissions")
-                else
-                  I18n.t("forms.task_list_#{create_or_edit}.how_you_get_completed_forms_section.optional_subsection.daily_submission_batch")
-                end
+    task_name = I18n.t("forms.task_list_#{create_or_edit}.how_you_get_completed_forms_section.optional_subsection.batch_submissions")
+
     {
       task_name:,
       path: batch_submissions_path(@form.id),

app/views/forms/_made_live_form.html.erb

@@ -151,24 +151,15 @@
       <p><%= t(".how_you_get_completed_forms.submission_format.email.#{submission_format}_html") %></p>
     <% end %>
 
-    <% if FeatureService.enabled?(:weekly_submission_emails_enabled) %>
-      <h4 class="govuk-heading-s"><%= t(".how_you_get_completed_forms.batch_submissions.title") %></h4>
-      <% if form_document.send_daily_submission_batch && form_document.send_weekly_submission_batch %>
-        <p><%= t(".how_you_get_completed_forms.batch_submissions.daily_and_weekly_enabled") %></p>
-      <% elsif form_document.send_daily_submission_batch %>
-        <p><%= t(".how_you_get_completed_forms.batch_submissions.daily_enabled") %></p>
-      <% elsif form_document.send_weekly_submission_batch %>
-        <p><%= t(".how_you_get_completed_forms.batch_submissions.weekly_enabled") %></p>
-      <% else %>
-        <p><%= t(".how_you_get_completed_forms.batch_submissions.disabled") %></p>
-      <% end %>
+    <h4 class="govuk-heading-s"><%= t(".how_you_get_completed_forms.batch_submissions.title") %></h4>
+    <% if form_document.send_daily_submission_batch && form_document.send_weekly_submission_batch %>
+      <p><%= t(".how_you_get_completed_forms.batch_submissions.daily_and_weekly_enabled") %></p>
+    <% elsif form_document.send_daily_submission_batch %>
+      <p><%= t(".how_you_get_completed_forms.batch_submissions.daily_enabled") %></p>
+    <% elsif form_document.send_weekly_submission_batch %>
+      <p><%= t(".how_you_get_completed_forms.batch_submissions.weekly_enabled") %></p>
     <% else %>
-      <h4 class="govuk-heading-s"><%= t(".how_you_get_completed_forms.daily_csv.title") %></h4>
-      <% if form_document.send_daily_submission_batch %>
-        <p><%= t(".how_you_get_completed_forms.daily_csv.enabled") %></p>
-      <% else %>
-        <p><%= t(".how_you_get_completed_forms.daily_csv.disabled") %></p>
-      <% end %>
+      <p><%= t(".how_you_get_completed_forms.batch_submissions.disabled") %></p>
     <% end %>
 
     <% if form_document.has_welsh_translation? %>

app/views/forms/batch_submissions/new.html.erb

@@ -1,5 +1,4 @@
-<% weekly_enabled = FeatureService.enabled?(:weekly_submission_emails_enabled) %>
-<% page_title = weekly_enabled ? t("page_titles.submission_batches") : t("page_titles.daily_submission_batch") %>
+<% page_title = t("page_titles.submission_batches") %>
 <% set_page_title(title_with_error_prefix(page_title, @batch_submissions_input.errors.any?)) %>
 <% content_for :back_link, govuk_back_link_to(form_path(@batch_submissions_input.form.id), t("back_link.form_create")) %>
 
@@ -15,21 +14,11 @@
         <%= page_title %>
       </h1>
 
-      <% if weekly_enabled %>
-        <%= t(".body_html") %>
-      <% else %>
-        <%= t(".weekly_disabled_body_html") %>
-      <% end %>
+      <%= t(".body_html") %>
 
-      <% if weekly_enabled %>
-        <%= f.govuk_check_boxes_fieldset :batch_frequencies, legend: { tag: 'h2', size: 'm' } do %>
-          <%= f.govuk_check_box :batch_frequencies, "daily" %>
-          <%= f.govuk_check_box :batch_frequencies, "weekly" %>
-        <% end %>
-      <% else %>
-        <%= f.govuk_check_boxes_fieldset :batch_frequencies, legend: { tag: 'h2', size: 'm', text: t(".weekly_disabled_fieldset_legend") } do %>
-          <%= f.govuk_check_box :batch_frequencies, "daily", label: { text: t(".weekly_disabled_checkbox_label") } %>
-        <% end %>
+      <%= f.govuk_check_boxes_fieldset :batch_frequencies, legend: { tag: 'h2', size: 'm' } do %>
+        <%= f.govuk_check_box :batch_frequencies, "daily" %>
+        <%= f.govuk_check_box :batch_frequencies, "weekly" %>
       <% end %>
 
       <%= f.govuk_submit t("save_and_continue") %>

config/locales/en.yml

@@ -235,8 +235,6 @@ en:
           weekly_enabled: You’ll get a weekly batch of form submissions
         change_name: Your form name has been saved
         copied: Your form has been copied
-        daily_submission_batch_disabled: You will not get a daily CSV of the previous day’s completed forms
-        daily_submission_batch_enabled: You’ll get a daily CSV of the previous day’s completed forms
         declaration_saved: Your declaration has been saved
         declaration_saved_and_completed: Your declaration has been saved and marked as complete
         page_moved: "‘%{question_text}’ has moved %{direction} to number %{question_number}"
@@ -398,14 +396,6 @@ en:
           <p>The CSVs will include each submission’s answers in plain text separated by commas - plus the date and time of submission.</p>
           <p>If you make changes to the form such as adding, moving or deleting a question, the structure of the CSV will change. Forms completed before and after the change will be split into separate CSV files.</p>
           <p>You’ll continue to receive individual completed form submissions in the usual way. If your form has any file upload questions, the uploaded files will only be attached to the individual submissions.</p>
-        weekly_disabled_body_html: |
-          <p>You can get a daily email with all the answers from the previous day’s completed forms collected into a CSV file.</p>
-          <p>The CSV will list all the answers in plain text, separated by commas, with a row for each completed form.</p>
-          <p>We’ll send the email shortly after 2am with the completed forms from the previous day. It’ll be sent to the same email address you set for completed forms.</p>
-          <p>If you make changes to the form such as adding, moving or deleting a question, the structure of the CSV will change. Forms completed before and after the change will be split into separate CSV files.</p>
-          <p>You’ll continue to receive individual completed form emails. If your form has any file upload questions, the uploaded files will only be attached to the individual completed form emails.</p>
-        weekly_disabled_checkbox_label: Get a daily CSV of completed forms
-        weekly_disabled_fieldset_legend: Do you want to get a daily CSV of the previous day’s completed forms?
     delete_confirmation:
       delete:
         hint_for_archived_draft: Deleting this draft will not remove the archived form.
@@ -443,10 +433,6 @@ en:
           title: Daily and weekly CSVs
           weekly_enabled: You are getting a weekly batch of completed forms.
         csv_and_json: CSV and JSON
-        daily_csv:
-          disabled: You have not opted to get a daily CSV of the previous day’s completed forms.
-          enabled: You are getting a daily CSV of the previous day’s completed forms.
-          title: Daily CSV
         submission_email: Email
         submission_format:
           email:
@@ -515,7 +501,6 @@ en:
         hint_text_html: Completed forms will be sent to:<br> <span class="govuk-!-text-break-word">%{submission_email}</span>
         optional_subsection:
           batch_submissions: Get a daily or weekly batch of completed forms
-          daily_submission_batch: Get a daily CSV of the previous day’s completed forms
           submission_attachments: Get a CSV or JSON file of each completed form
         title: Set up how you get completed forms
       make_form_live_section:
@@ -561,7 +546,6 @@ en:
         hint_text_html: Completed forms will be sent to:<br> <span class="govuk-!-text-break-word">%{submission_email}</span>
         optional_subsection:
           batch_submissions: Get a daily or weekly batch of completed forms
-          daily_submission_batch: Get a daily CSV of the previous day’s completed forms
           submission_attachments: Get a CSV or JSON file of each completed form
         title: Change how you get completed forms
       make_form_live_section:
@@ -1462,7 +1446,6 @@ en:
     confirm_email_success: Email address confirmed
     contact_details: Provide contact details for support
     copy: What is the name of your form?
-    daily_submission_batch: Get a daily CSV of the previous day’s completed forms
     date_settings: Are you asking for someone’s date of birth?
     declaration: Add a declaration for people to agree to
     delete_secondary_skip: Are you sure you want to delete the route for any other answer?

spec/config/settings_spec.rb

@@ -22,7 +22,7 @@
   describe ".features" do
     features = settings[:features]
 
-    include_examples expected_value_test, :weekly_submission_emails_enabled, features, false
+    include_examples expected_value_test, :exit_pages, features, { "enabled_by_group" => true }
   end
 
   describe "forms_api" do

spec/requests/forms/batch_submissions_controller_spec.rb

@@ -37,93 +37,53 @@
   end
 
   describe "#create" do
-    let(:batch_frequencies) { %w[daily] }
     let(:params) { { forms_batch_submissions_input: { batch_frequencies: } } }
+    let(:batch_frequencies) { %w[daily weekly] }
 
-    context "when the weekly submission batch feature is disabled", feature_weekly_submission_emails_enabled: false do
-      context "when the daily batch checkbox is checked" do
-        it "updates the form send_daily_submission_batch flag to true" do
-          expect {
-            post(batch_submissions_create_path(form_id: form.id), params:)
-          }.to change { form.reload.send_daily_submission_batch }.to(true)
-        end
-
-        it "redirects to the form overview page" do
-          post(batch_submissions_create_path(form_id: form.id), params:)
-          expect(response).to redirect_to(form_path(form.id))
-        end
-
-        it "displays a success flash message" do
-          post(batch_submissions_create_path(form_id: form.id), params:)
-          expect(flash[:success]).to eq(I18n.t("banner.success.form.daily_submission_batch_enabled"))
-        end
-      end
-
-      context "when the daily batch checkbox is not checked" do
-        let(:send_daily_submission_batch) { true }
-        let(:batch_frequencies) { [] }
-
-        it "updates the form send_daily_submission_batch flag to false" do
-          expect {
-            post(batch_submissions_create_path(form_id: form.id), params:)
-          }.to change { form.reload.send_daily_submission_batch }.to(false)
-        end
-
-        it "displays a success flash message" do
-          post(batch_submissions_create_path(form_id: form.id), params:)
-          expect(flash[:success]).to eq(I18n.t("banner.success.form.daily_submission_batch_disabled"))
-        end
-      end
+    before do
+      post(batch_submissions_create_path(form_id: form.id), params:)
     end
 
-    context "when the weekly submission batch feature is enabled", :feature_weekly_submission_emails_enabled do
-      let(:batch_frequencies) { %w[daily weekly] }
-
-      before do
-        post(batch_submissions_create_path(form_id: form.id), params:)
-      end
-
-      it "updates the form" do
-        expect(form.reload.send_daily_submission_batch).to be true
-        expect(form.reload.send_weekly_submission_batch).to be true
-      end
+    it "updates the form" do
+      expect(form.reload.send_daily_submission_batch).to be true
+      expect(form.reload.send_weekly_submission_batch).to be true
+    end
 
-      it "redirects to the form overview page" do
-        expect(response).to redirect_to(form_path(form.id))
-      end
+    it "redirects to the form overview page" do
+      expect(response).to redirect_to(form_path(form.id))
+    end
 
-      context "when only the daily batch checkbox is checked" do
-        let(:batch_frequencies) { %w[daily] }
+    context "when only the daily batch checkbox is checked" do
+      let(:batch_frequencies) { %w[daily] }
 
-        it "displays a success flash message indicating that daily batch emails are enabled" do
-          expect(flash[:success]).to eq(I18n.t("banner.success.form.batch_submissions.daily_enabled"))
-        end
+      it "displays a success flash message indicating that daily batch emails are enabled" do
+        expect(flash[:success]).to eq(I18n.t("banner.success.form.batch_submissions.daily_enabled"))
       end
+    end
 
-      context "when only the weekly batch checkbox is checked" do
-        let(:batch_frequencies) { %w[weekly] }
+    context "when only the weekly batch checkbox is checked" do
+      let(:batch_frequencies) { %w[weekly] }
 
-        it "displays a success flash message indicating that weekly batch emails are enabled" do
-          expect(flash[:success]).to eq(I18n.t("banner.success.form.batch_submissions.weekly_enabled"))
-        end
+      it "displays a success flash message indicating that weekly batch emails are enabled" do
+        expect(flash[:success]).to eq(I18n.t("banner.success.form.batch_submissions.weekly_enabled"))
       end
+    end
 
-      context "when both the daily and weekly batch checkboxes are checked" do
-        let(:batch_frequencies) { %w[daily weekly] }
+    context "when both the daily and weekly batch checkboxes are checked" do
+      let(:batch_frequencies) { %w[daily weekly] }
 
-        it "displays a success flash message indicating that daily and weekly batch emails are enabled" do
-          expect(flash[:success]).to eq(I18n.t("banner.success.form.batch_submissions.daily_and_weekly_enabled"))
-        end
+      it "displays a success flash message indicating that daily and weekly batch emails are enabled" do
+        expect(flash[:success]).to eq(I18n.t("banner.success.form.batch_submissions.daily_and_weekly_enabled"))
       end
+    end
 
-      context "when daily and weekly batch checkboxes are unchecked" do
-        let(:send_daily_submission_batch) { true }
-        let(:send_weekly_submission_batch) { true }
-        let(:batch_frequencies) { [] }
+    context "when daily and weekly batch checkboxes are unchecked" do
+      let(:send_daily_submission_batch) { true }
+      let(:send_weekly_submission_batch) { true }
+      let(:batch_frequencies) { [] }
 
-        it "displays a success flash message indicating that batch emails are disabled" do
-          expect(flash[:success]).to eq(I18n.t("banner.success.form.batch_submissions.disabled"))
-        end
+      it "displays a success flash message indicating that batch emails are disabled" do
+        expect(flash[:success]).to eq(I18n.t("banner.success.form.batch_submissions.disabled"))
       end
     end
 

spec/services/form_task_list_service_spec.rb

@@ -289,18 +289,9 @@
         end
       end
 
-      context "when the weekly submission emails feature flag is disabled", feature_weekly_submission_emails_enabled: false do
-        it "has link to the daily submission batch page" do
-          expect(section_rows.second[:task_name]).to eq I18n.t("forms.task_list_create.how_you_get_completed_forms_section.optional_subsection.daily_submission_batch")
-          expect(section_rows.second[:path]).to eq "/forms/#{form.id}/batch-submissions"
-        end
-      end
-
-      context "when the weekly submission emails feature flag is enabled", :feature_weekly_submission_emails_enabled do
-        it "has link to the batch submissions page" do
-          expect(section_rows.second[:task_name]).to eq I18n.t("forms.task_list_create.how_you_get_completed_forms_section.optional_subsection.batch_submissions")
-          expect(section_rows.second[:path]).to eq "/forms/#{form.id}/batch-submissions"
-        end
+      it "has link to the batch submissions page" do
+        expect(section_rows.second[:task_name]).to eq I18n.t("forms.task_list_create.how_you_get_completed_forms_section.optional_subsection.batch_submissions")
+        expect(section_rows.second[:path]).to eq "/forms/#{form.id}/batch-submissions"
       end
     end