Remove json_submission_enabled feature flag

stephencdaly · stephencdaly · commit 74163676180a · 2025-12-01T11:05:17.000Z
This feature has been released, so remove the flag and the code for
when it was disabled.
diff --git a/.review_apps/ecs_task_definition.tf b/.review_apps/ecs_task_definition.tf
@@ -25,7 +25,6 @@ locals {
     { 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__JSON_SUBMISSION_ENABLED", value = "true" }
   ]
 }
 
diff --git a/app/controllers/forms/submission_attachments_controller.rb b/app/controllers/forms/submission_attachments_controller.rb
@@ -1,6 +1,6 @@
 module Forms
   class SubmissionAttachmentsController < WebController
-    before_action :json_submission_enabled?, :submission_type_email?
+    before_action :submission_type_email?
     after_action :verify_authorized
 
     def new
@@ -25,10 +25,6 @@ def submission_attachments_input_params
       params.require(:forms_submission_attachments_input).permit(submission_format: []).merge(form: current_form)
     end
 
-    def json_submission_enabled?
-      redirect_to error_404_path unless Settings.features.json_submission_enabled
-    end
-
     def submission_type_email?
       redirect_to error_404_path unless current_form.email?
     end
diff --git a/app/services/form_task_list_service.rb b/app/services/form_task_list_service.rb
@@ -104,33 +104,18 @@ def email_address_section_tasks
   end
 
   def submission_attachments_subsection
-    if FeatureService.enabled?(:json_submission_enabled)
-      {
-        title: I18n.t("forms.task_list_#{create_or_edit}.submission_attachments_subsection.title"),
-        section_number: nil,
-        subsection: true,
-        rows: [
-          {
-            task_name: I18n.t("forms.task_list_#{create_or_edit}.submission_attachments_subsection.task_name"),
-            path: submission_attachments_path(@form.id),
-            status: @task_statuses[:submission_attachments_status],
-          },
-        ],
-      }
-    else
-      {
-        title: I18n.t("forms.task_list_#{create_or_edit}.receive_csv_subsection.title"),
-        section_number: nil,
-        subsection: true,
-        rows: [
-          {
-            task_name: I18n.t("forms.task_list_#{create_or_edit}.receive_csv_subsection.receive_csv"),
-            path: receive_csv_path(@form.id),
-            status: @task_statuses[:submission_attachments_status],
-          },
-        ],
-      }
-    end
+    {
+      title: I18n.t("forms.task_list_#{create_or_edit}.submission_attachments_subsection.title"),
+      section_number: nil,
+      subsection: true,
+      rows: [
+        {
+          task_name: I18n.t("forms.task_list_#{create_or_edit}.submission_attachments_subsection.task_name"),
+          path: submission_attachments_path(@form.id),
+          status: @task_statuses[:submission_attachments_status],
+        },
+      ],
+    }
   end
 
   def privacy_and_contact_details_section(section_number:)
diff --git a/app/views/forms/_made_live_form.html.erb b/app/views/forms/_made_live_form.html.erb
@@ -58,13 +58,8 @@
 
     <% if form_document.submission_type == "email" %>
       <% submission_format = ["email", *form_document.submission_format].join("_") %>
-      <% if FeatureService.enabled?(:json_submission_enabled) %>
-        <h4 class="govuk-heading-s"><%= t("made_live_form.csv_and_json") %></h4>
-        <p><%= t("made_live_form.submission_format.email.#{submission_format}_html") %></p>
-      <% else %>
-        <h4 class="govuk-heading-s"><%= t("made_live_form.csv") %></h4>
-        <p><%= t("made_live_form.submission_format.email.json_submissions_disabled.#{submission_format}") %></p>
-      <% end %>
+      <h4 class="govuk-heading-s"><%= t("made_live_form.csv_and_json") %></h4>
+      <p><%= t("made_live_form.submission_format.email.#{submission_format}_html") %></p>
     <% end %>
 
     <h3 class="govuk-heading-m"><%= t('made_live_form.privacy_policy_link') %></h3>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -446,9 +446,6 @@ en:
         contact_details: Provide contact details for support
         privacy_policy: Provide a link to privacy information for this form
         title: Provide privacy and contact details
-      receive_csv_subsection:
-        receive_csv: Get completed forms as CSV files
-        title: Optional task
       submission_attachments_subsection:
         task_name: Get a CSV or JSON file of each completed form
         title: Optional task
@@ -478,9 +475,6 @@ en:
         contact_details: Edit the contact details for support
         privacy_policy: Edit the link to privacy information for this form
         title: Privacy and contact details
-      receive_csv_subsection:
-        receive_csv: Get completed forms as CSV files
-        title: Optional task
       submission_attachments_subsection:
         task_name: Get a CSV or JSON file of each completed form
         title: Optional task
@@ -1041,7 +1035,6 @@ en:
   made_live_form:
     archive_this_form: Archive this form
     contact_details: Your form’s contact details for support
-    csv: CSV
     csv_and_json: CSV and JSON
     declaration: Declaration
     declaration_description: Your form’s declaration is shown to people when they have answered all the questions, just before they submit the form.
@@ -1067,11 +1060,6 @@ en:
         email_json_html: |
           Each completed form is also attached to the email as a JSON file.</br>
           You have not opted to get each completed form as a CSV file.
-        json_submissions_disabled:
-          email: You have not opted in to receive a CSV file with each completed form email.
-          email_csv: Each completed form is also attached to the email as a CSV file.
-          email_csv_json: Each completed form is also attached to the email as a CSV file and a JSON file.
-          email_json: Each completed form is also attached to the email as a JSON file.
     support_email: Email
     support_phone: Phone
     support_url: Support contact online
diff --git a/config/settings.yml b/config/settings.yml
@@ -4,7 +4,6 @@ features:
     enabled_by_group: true
   welsh:
     enabled_by_group: true
-  json_submission_enabled: true
 
 forms_api:
   # Authentication key to authenticate with forms-api
diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb
@@ -23,7 +23,6 @@
     features = settings[:features]
 
     include_examples expected_value_test, :welsh, features, { "enabled_by_group" => true }
-    include_examples expected_value_test, :json_submission_enabled, features, true
   end
 
   describe "forms_api" do
diff --git a/spec/requests/forms/submission_attachments_controller_spec.rb b/spec/requests/forms/submission_attachments_controller_spec.rb
@@ -9,152 +9,119 @@
   end
 
   describe "#new" do
-    context "when the json_submission_enabled feature flag is off" do
-      before do
-        allow(Settings.features).to receive(:json_submission_enabled).and_return(false)
-
-        get submission_attachments_path(form_id: form.id)
-      end
-
-      it "returns a 404 page" do
-        expect(response).to redirect_to :error_404
-      end
+    before do
+      get submission_attachments_path(form_id: form.id)
     end
 
-    context "when the json_submission_enabled feature flag is on" do
-      before do
-        allow(Settings.features).to receive(:json_submission_enabled).and_return(true)
-
-        get submission_attachments_path(form_id: form.id)
-      end
-
-      it "renders the submission attachments view" do
-        expect(response).to have_rendered :new
-      end
+    it "renders the submission attachments view" do
+      expect(response).to have_rendered :new
+    end
 
-      it "uses the form submission attachments input" do
-        expect(assigns).to include submission_attachments_input: an_instance_of(Forms::SubmissionAttachmentsInput)
-      end
+    it "uses the form submission attachments input" do
+      expect(assigns).to include submission_attachments_input: an_instance_of(Forms::SubmissionAttachmentsInput)
+    end
 
-      context "when the submission_type is s3" do
-        let(:form) { create(:form, submission_type: "s3") }
+    context "when the submission_type is s3" do
+      let(:form) { create(:form, submission_type: "s3") }
 
-        it "returns a 404 page" do
-          expect(response).to redirect_to :error_404
-        end
+      it "returns a 404 page" do
+        expect(response).to redirect_to :error_404
       end
     end
   end
 
   describe "#create" do
     let(:params) { { forms_submission_attachments_input: { submission_format: } } }
 
-    context "when the json_submission_enabled feature flag is off" do
-      before do
-        allow(Settings.features).to receive(:json_submission_enabled).and_return(false)
-      end
+    context "when params are valid" do
+      let(:submission_format) { %w[csv json] }
 
-      it "returns a 404 page" do
-        post submission_attachments_path(form_id: form.id)
-        expect(response).to redirect_to :error_404
+      it "updates the form submission format" do
+        expect {
+          post(submission_attachments_path(form_id: form.id), params:)
+        }.to change { form.reload.submission_format }.to(submission_format)
       end
-    end
 
-    context "when the json_submission_enabled feature flag is on" do
-      before do
-        allow(Settings.features).to receive(:json_submission_enabled).and_return(true)
+      it "redirects you to the form overview page" do
+        post(submission_attachments_path(form_id: form.id), params:)
+        expect(response).to redirect_to(form_path(form.id))
       end
 
-      context "when params are valid" do
-        let(:submission_format) { %w[csv json] }
-
-        it "updates the form submission format" do
-          expect {
-            post(submission_attachments_path(form_id: form.id), params:)
-          }.to change { form.reload.submission_format }.to(submission_format)
-        end
+      context "when submission format has changed to 'csv'" do
+        let(:submission_format) { %w[csv] }
 
-        it "redirects you to the form overview page" do
+        it "displays a success flash message" do
           post(submission_attachments_path(form_id: form.id), params:)
-          expect(response).to redirect_to(form_path(form.id))
+          expect(flash[:success]).to eq(I18n.t("banner.success.form.receive_csv_enabled"))
         end
+      end
 
-        context "when submission format has changed to 'csv'" do
-          let(:submission_format) { %w[csv] }
+      context "when submission format has changed to 'json'" do
+        let(:submission_format) { %w[json] }
 
-          it "displays a success flash message" do
-            post(submission_attachments_path(form_id: form.id), params:)
-            expect(flash[:success]).to eq(I18n.t("banner.success.form.receive_csv_enabled"))
-          end
+        it "displays a success flash message" do
+          post(submission_attachments_path(form_id: form.id), params:)
+          expect(flash[:success]).to eq(I18n.t("banner.success.form.receive_json_enabled"))
         end
+      end
 
-        context "when submission format has changed to 'json'" do
-          let(:submission_format) { %w[json] }
+      context "when submission format has changed to 'csv json'" do
+        let(:submission_format) { %w[csv json] }
 
-          it "displays a success flash message" do
-            post(submission_attachments_path(form_id: form.id), params:)
-            expect(flash[:success]).to eq(I18n.t("banner.success.form.receive_json_enabled"))
-          end
+        it "displays a success flash message" do
+          post(submission_attachments_path(form_id: form.id), params:)
+          expect(flash[:success]).to eq(I18n.t("banner.success.form.receive_csv_and_json_enabled"))
         end
+      end
 
-        context "when submission format has changed to 'csv json'" do
-          let(:submission_format) { %w[csv json] }
+      context "when submission format has changed to blank" do
+        let(:original_submission_format) { %w[csv json] }
+        let(:submission_format) { %w[] }
 
-          it "displays a success flash message" do
-            post(submission_attachments_path(form_id: form.id), params:)
-            expect(flash[:success]).to eq(I18n.t("banner.success.form.receive_csv_and_json_enabled"))
-          end
+        it "displays a success flash message" do
+          post(submission_attachments_path(form_id: form.id), params:)
+          expect(flash[:success]).to eq(I18n.t("banner.success.form.receive_no_attachments"))
         end
+      end
 
-        context "when submission format has changed to blank" do
-          let(:original_submission_format) { %w[csv json] }
-          let(:submission_format) { %w[] }
+      context "when submission format has not changed" do
+        let(:submission_format) { %w[] }
 
-          it "displays a success flash message" do
-            post(submission_attachments_path(form_id: form.id), params:)
-            expect(flash[:success]).to eq(I18n.t("banner.success.form.receive_no_attachments"))
-          end
+        it "does not display a flash message" do
+          post(submission_attachments_path(form_id: form.id), params:)
+          expect(flash[:success]).to be_nil
         end
+      end
+    end
 
-        context "when submission format has not changed" do
-          let(:submission_format) { %w[] }
+    context "when params are invalid" do
+      let(:submission_format) { %w[apple] }
 
-          it "does not display a flash message" do
-            post(submission_attachments_path(form_id: form.id), params:)
-            expect(flash[:success]).to be_nil
-          end
-        end
+      it "returns 422" do
+        post(submission_attachments_path(form_id: form.id), params:)
+        expect(response).to have_http_status(:unprocessable_content)
       end
 
-      context "when params are invalid" do
-        let(:submission_format) { %w[apple] }
-
-        it "returns 422" do
+      it "does not update the form" do
+        expect {
           post(submission_attachments_path(form_id: form.id), params:)
-          expect(response).to have_http_status(:unprocessable_content)
-        end
-
-        it "does not update the form" do
-          expect {
-            post(submission_attachments_path(form_id: form.id), params:)
-          }.not_to(change { form.reload.submission_format })
-        end
+        }.not_to(change { form.reload.submission_format })
+      end
 
-        it "re-renders the page with an error" do
-          post(submission_attachments_path(form_id: form.id), params:)
-          expect(response).to render_template("new")
-          expect(response.body).to include(I18n.t("activemodel.errors.models.forms/submission_attachments_input.invalid_submission_format"))
-        end
+      it "re-renders the page with an error" do
+        post(submission_attachments_path(form_id: form.id), params:)
+        expect(response).to render_template("new")
+        expect(response.body).to include(I18n.t("activemodel.errors.models.forms/submission_attachments_input.invalid_submission_format"))
       end
+    end
 
-      context "when the submission_type is s3" do
-        let(:form) { create(:form, submission_type: "s3") }
-        let(:submission_format) { %w[csv] }
+    context "when the submission_type is s3" do
+      let(:form) { create(:form, submission_type: "s3") }
+      let(:submission_format) { %w[csv] }
 
-        it "returns a 404 page" do
-          post(submission_attachments_path(form_id: form.id), params:)
-          expect(response).to redirect_to :error_404
-        end
+      it "returns a 404 page" do
+        post(submission_attachments_path(form_id: form.id), params:)
+        expect(response).to redirect_to :error_404
       end
     end
   end
diff --git a/spec/services/form_task_list_service_spec.rb b/spec/services/form_task_list_service_spec.rb
diff --git a/spec/views/forms/_made_live_form.html.erb_spec.rb b/spec/views/forms/_made_live_form.html.erb_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ locals {`
`25`	`25`	`{ name = "SETTINGS__AUTH_PROVIDER", value = "developer" },`
`26`	`26`	`{ name = "SETTINGS__FORMS_ENV", value = "review" },`
`27`	`27`	`{ name = "SETTINGS__FORMS_RUNNER__URL", value = "https://forms.service.gov.uk/" },`
`28`		`- { name = "SETTINGS__FEATURES__JSON_SUBMISSION_ENABLED", value = "true" }`
`29`	`28`	`]`
`30`	`29`	`}`
`31`	`30`