WIP

Author: Hassanmir92

app/controllers/teacher_interface/other_england_work_histories_controller.rb

@@ -50,6 +50,17 @@ def index
         redirect_to school_teacher_interface_application_form_other_england_work_history_path(
                       work_history,
                     )
+      elsif (
+            work_history =
+              application_form
+                .work_histories
+                .other_england_educational_role
+                .order_by_user
+                .find(&:invalid_email_domain_for_contact?)
+          )
+        redirect_to contact_teacher_interface_application_form_other_england_work_history_path(
+                      work_history,
+                    )
       else
         redirect_to %i[
                       add_another

app/lib/application_form_section_status_updater.rb

@@ -191,7 +191,7 @@ def work_history_status
         if any_work_histories_with_invalid_contact_email_domain
           :update_needed
         else
-        :completed
+          :completed
         end
       else
         :in_progress
@@ -224,9 +224,21 @@ def other_england_work_history_status
       !other_england_work_histories.empty? &&
         other_england_work_histories.all?(&:complete?)
 
+    any_work_histories_with_invalid_contact_email_domain =
+      requires_private_email_for_referee? &&
+        other_england_work_histories.any?(&:invalid_email_domain_for_contact?)
+
     return :not_started if has_other_england_work_history.nil?
     if !has_other_england_work_history || all_work_histories_complete
-      return :completed
+      return(
+        (
+          if any_work_histories_with_invalid_contact_email_domain
+            :update_needed
+          else
+            :completed
+          end
+        )
+      )
     end
 
     :in_progress

spec/lib/application_form_section_status_updater_spec.rb

@@ -522,11 +522,33 @@
             :application_form,
             has_other_england_work_history: true,
           ).tap do |application_form|
-            create(:work_history, :other_england_role, application_form:)
+            create(
+              :work_history,
+              :other_england_role,
+              application_form:,
+              contact_email:,
+            )
           end
         end
+        let(:contact_email) { "test@gmail.com" }
 
         it { is_expected.to eq("in_progress") }
+
+        # TODO: Once all existing draft applications have gone through post release,
+        # we no longer need to do this check on any of the above. This would mean that
+        # all existing draft application have started_with_private_email_for_referee is true
+        context "when private email domain for referee feature is enabled" do
+          before do
+            FeatureFlags::FeatureFlag.activate(:email_domains_for_referees)
+            described_class.call(application_form:)
+          end
+
+          after do
+            FeatureFlags::FeatureFlag.deactivate(:email_domains_for_referees)
+          end
+
+          it { is_expected.to eq("in_progress") }
+        end
       end
 
       context "with a complete work history" do
@@ -540,11 +562,35 @@
               :other_england_role,
               :completed,
               application_form:,
+              contact_email:,
             )
           end
         end
+        let(:contact_email) { "test@gmail.com" }
 
         it { is_expected.to eq("completed") }
+
+        # TODO: Once all existing draft applications have gone through post release,
+        # we no longer need to do this check on any of the above. This would mean that
+        # all existing draft application have started_with_private_email_for_referee is true
+        context "when private email domain for referee feature is enabled" do
+          before do
+            FeatureFlags::FeatureFlag.activate(:email_domains_for_referees)
+            described_class.call(application_form:)
+          end
+
+          after do
+            FeatureFlags::FeatureFlag.deactivate(:email_domains_for_referees)
+          end
+
+          it { is_expected.to eq("update_needed") }
+
+          context "with contact email having a private email domain" do
+            let(:contact_email) { "test@private.com" }
+
+            it { is_expected.to eq("completed") }
+          end
+        end
       end
     end