Merge pull request #803 from DFE-Digital/feature/297-agent-login

Add redirect to case management for agents

Author: peterdavidhamilton

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog 1.0.0].
 ## [unreleased]
 
 - add ability to persist procurement, contract and savings data on cases [#ref](https://github.com/DFE-Digital/buy-for-your-school/pull/704)
+- add redirect to case management at login for agents [#ref](https://github.com/DFE-Digital/buy-for-your-school/pull/803)
 
 <!--
 - value added [#ref](https://github.com/DFE-Digital/buy-for-your-school/commit/<hash>)

app/controllers/sessions_controller.rb

@@ -13,8 +13,7 @@ def create
 
     case user
     when User
-      # TODO: alternative redirect for caseworkers
-      redirect_to entry_path
+      redirect_to entry_path(user)
     when :invalid
       redirect_to root_path, notice: "Access Denied"
     when :no_organisation
@@ -76,12 +75,18 @@ def find_framework_entrypoint?
     session[:faf_referer].present?
   end
 
-  # Logging whilst seeking support will send the user to their profile page
-  # to confirm the details before proceeding
+  # Routing logic for users after authentication
   #
   # @return [String]
-  def entry_path
-    find_framework_entrypoint? ? profile_path : dashboard_path
+  def entry_path(user)
+    if user.internal?
+      # proc ops / internal team members go to case management
+      support_root_path
+    else
+      # - default to the specify dashboard
+      # - support request journeys start from the profile page
+      find_framework_entrypoint? ? profile_path : dashboard_path
+    end
   end
 
   # @return [String]

app/controllers/support/pages_controller.rb

@@ -2,6 +2,8 @@ module Support
   class PagesController < ::Support::ApplicationController
     skip_before_action :authenticate_agent!
 
-    def start_page; end
+    def start_page
+      redirect_to support_cases_path if current_agent
+    end
   end
 end

app/models/user.rb

@@ -23,6 +23,13 @@ def guest?
     false
   end
 
+  # @see [SessionsController]
+  #
+  # @return [Boolean] user is an internal team member (or case worker)
+  def internal?
+    self.class.internal.include?(self)
+  end
+
   # @return [Boolean] user is an analyst
   def analyst?
     self.class.analysts.include?(self)

spec/features/self-serve/auth/supported_user_spec.rb

@@ -81,8 +81,6 @@
   end
 
   context "when the user is a caseworker" do
-    let(:user) { build(:user, :caseworker) }
-
     around do |example|
       ClimateControl.modify(PROC_OPS_TEAM: "DSI Caseworkers") do
         example.run
@@ -94,9 +92,25 @@
       click_start
     end
 
-    it "takes them to the dashboard" do
-      expect(page).to have_title "Specifications dashboard"
-      expect(page).to have_current_path "/dashboard"
+    context "when they new to the service" do
+      let(:user) { build(:user, :caseworker) }
+
+      it "takes them to the agent login page" do
+        expect(page).to have_title "Supported Buying Case Management"
+        expect(page).to have_current_path "/support"
+      end
+    end
+
+    xcontext "when they have logged in before" do
+      let(:user) { create(:user, :caseworker) }
+
+      before do
+        create(:support_agent, dsi_uid: user.dfe_sign_in_uid)
+      end
+
+      it "takes them to the case management dashboard" do
+        expect(page).to have_current_path "/support/cases"
+      end
     end
   end
 end

spec/models/self-serve/user/user_internal_spec.rb

@@ -1,32 +1,24 @@
 RSpec.describe User, type: :model do
   around do |example|
-    ClimateControl.modify(PROC_OPS_TEAM: "DfE Commercial Procurement Operations") { example.run }
+    ClimateControl.modify(PROC_OPS_TEAM: "DSI Caseworkers") do
+      example.run
+    end
   end
 
-  describe ".internal" do
-    before do
-      create(:user,
-             first_name: "test_proc_ops",
-             orgs: [
-               {
-                 "id": "23F20E54-79EA-4146-8E39-18197576F023",
-                 "name": "DfE Commercial Procurement Operations",
-               },
-             ])
-
-      create(:user,
-             first_name: "test_not_proc_ops",
-             orgs: [
-               {
-                 "id": "23F20E54-79EA-4146-8E39-18197576F023",
-                 "name": "Other organisation",
-               },
-             ])
-    end
+  let!(:caseworker) { create(:user, :caseworker) }
+  let!(:buyer) { create(:user, :one_supported_school) }
 
+  describe ".internal" do
     it "returns internal users only" do
       expect(described_class.internal.count).to eq 1
-      expect(described_class.internal[0].first_name).to eq "test_proc_ops"
+      expect(described_class.internal[0].first_name).to eq "Procurement"
+    end
+  end
+
+  describe "#internal?" do
+    it "is true for members of the 'Proc Ops' organisation" do
+      expect(caseworker.internal?).to be true
+      expect(buyer.internal?).to be false
     end
   end
 end