From 0dd20abbb32cccb74a06240135b5b5aa0a4c9207 Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Thu, 28 Jan 2016 17:20:34 +0000
Subject: [PATCH] Replace Current service with chosen service name.

---
 app/main/views/add_service.py          | 1 +
 app/main/views/choose_service.py       | 3 ++-
 app/main/views/dashboard.py            | 3 ++-
 app/main/views/two_factor.py           | 2 +-
 app/templates/admin_template.html      | 2 +-
 tests/app/main/views/test_dashboard.py | 6 ++++--
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/main/views/add_service.py b/app/main/views/add_service.py
index 602a0afbe..5e5a7e50b 100644
--- a/app/main/views/add_service.py
+++ b/app/main/views/add_service.py
@@ -17,6 +17,7 @@ def add_service():
     if form.validate_on_submit():
         user = users_dao.get_user_by_id(session['user_id'])
         service_id = services_dao.insert_new_service(form.name.data, user.id)
+        session['service_name'] = form.name.data
         return redirect(url_for('main.service_dashboard', service_id=service_id))
     else:
         return render_template(
diff --git a/app/main/views/choose_service.py b/app/main/views/choose_service.py
index 2d53a8560..609050fac 100644
--- a/app/main/views/choose_service.py
+++ b/app/main/views/choose_service.py
@@ -1,4 +1,4 @@
-from flask import (render_template, redirect, url_for)
+from flask import (render_template, redirect, url_for, session)
 from flask_login import login_required, current_user
 from app.main.dao import services_dao
 from app.main import main
@@ -11,6 +11,7 @@ def choose_service():
     # If there is only one service redirect
     # to the service dashboard.
     if len(services['data']) == 1:
+        session['service_name'] = services['data'][0]['name']
         return redirect(url_for(
             'main.service_dashboard', service_id=services['data'][0]['id']))
     return render_template(
diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 419e2cca5..9776bb071 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -1,4 +1,4 @@
-from flask import (abort, render_template)
+from flask import (abort, render_template, session)
 from flask_login import login_required
 from app.main import main
 from app.main.dao.services_dao import get_service_by_id
@@ -11,6 +11,7 @@ from ._jobs import jobs
 def service_dashboard(service_id):
     try:
         service = get_service_by_id(service_id)
+        session['service_name'] = service['data']['name']
     except HTTPError as e:
         if e.status_code == 404:
             abort(404)
diff --git a/app/main/views/two_factor.py b/app/main/views/two_factor.py
index b7ef5bdac..84f55c8df 100644
--- a/app/main/views/two_factor.py
+++ b/app/main/views/two_factor.py
@@ -29,6 +29,6 @@ def two_factor():
             login_user(user)
         finally:
             del session['user_details']
-        return redirect(url_for('.choose_service'))
+        return redirect(url_for('main.choose_service'))
 
     return render_template('views/two-factor.html', form=form)
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index fca5c162c..bfaf44ffa 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -54,7 +54,7 @@
         <div class="column-half">
           <details class="dropdown">
             <summary class="dropdown-toggle">
-              Current service
+              {{ session['service_name'] }}
             </summary>
             <div>
               <a href="{{ url_for('main.choose_service') }}">Switch service</a>
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index a4036b103..e565f4ff0 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -1,4 +1,4 @@
-from flask import url_for
+from flask import url_for, session
 
 
 def test_should_show_recent_jobs_on_dashboard(app_,
@@ -14,4 +14,6 @@ def test_should_show_recent_jobs_on_dashboard(app_,
             response = client.get(url_for('main.service_dashboard', service_id=123))
 
         assert response.status_code == 200
-        assert 'You haven’t sent any text messages yet' in response.get_data(as_text=True)
+        text = response.get_data(as_text=True)
+        assert 'You haven’t sent any text messages yet' in text
+        assert 'Test Service' in text