Put bulk upload controller checks behind feature flag (#1712)

app/controllers/bulk_upload_lettings_logs_controller.rb

@@ -25,9 +25,10 @@ class BulkUploadLettingsLogsController < ApplicationController
 private
 
   def validate_data_protection_agrement_signed!
-    unless @current_user.organisation.data_protection_confirmed?
+    return unless FeatureToggle.new_data_protection_confirmation?
-      redirect_to lettings_logs_path
+    return if @current_user.organisation.data_protection_confirmed?
-    end
+
+    redirect_to lettings_logs_path
   end
 
   def current_year

app/controllers/bulk_upload_sales_logs_controller.rb

@@ -25,9 +25,10 @@ class BulkUploadSalesLogsController < ApplicationController
 private
 
   def validate_data_protection_agrement_signed!
-    unless @current_user.organisation.data_protection_confirmed?
+    return unless FeatureToggle.new_data_protection_confirmation?
-      redirect_to sales_logs_path
+    return if @current_user.organisation.data_protection_confirmed?
-    end
+
+    redirect_to sales_logs_path
   end
 
   def current_year

spec/requests/bulk_upload_lettings_logs_controller_spec.rb

@@ -18,6 +18,18 @@ RSpec.describe BulkUploadLettingsLogsController, type: :request do
 
         expect(response).to redirect_to("/lettings-logs")
       end
+
+      context "when feature flag disabled" do
+        before do
+          allow(FeatureToggle).to receive(:new_data_protection_confirmation?).and_return(false)
+        end
+
+        it "does not redirect to lettings index page" do
+          get "/lettings-logs/bulk-upload-logs/start", params: {}
+
+          expect(response).not_to redirect_to("/lettings-logs")
+        end
+      end
     end
 
     context "when not in crossover period" do

spec/requests/bulk_upload_sales_logs_controller_spec.rb

@@ -18,6 +18,18 @@ RSpec.describe BulkUploadSalesLogsController, type: :request do
 
         expect(response).to redirect_to("/sales-logs")
       end
+
+      context "when feature flag disabled" do
+        before do
+          allow(FeatureToggle).to receive(:new_data_protection_confirmation?).and_return(false)
+        end
+
+        it "does not redirect to lettings index page" do
+          get "/lettings-logs/bulk-upload-logs/start", params: {}
+
+          expect(response).not_to redirect_to("/sales-logs")
+        end
+      end
     end
 
     context "when not in crossover period" do