From 7812b1cef533830e1d1750993dae22c13fe67ef5 Mon Sep 17 00:00:00 2001
From: Andrew White <andrew.white@unboxedconsulting.com>
Date: Thu, 28 Apr 2016 16:44:12 +0100
Subject: [PATCH] Redirect to dashboard if this isn't the first service

There's no need to show the tour again if the user has previously
created a service so just redirect to the dashboard instead.
---
 app/main/views/add_service.py            |  7 ++++-
 tests/app/main/views/test_add_service.py | 37 ++++++++++++++++++++----
 tests/conftest.py                        | 12 ++++++++
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/app/main/views/add_service.py b/app/main/views/add_service.py
index e8610f822..44ede2ec0 100644
--- a/app/main/views/add_service.py
+++ b/app/main/views/add_service.py
@@ -43,7 +43,12 @@ def add_service():
                                                        user_id=session['user_id'],
                                                        email_from=email_from)
         session['service_id'] = service_id
-        return redirect(url_for('main.tour', page=1))
+
+        services = service_api_client.get_services({'user_id': session['user_id']}).get('data', [])
+        if (len(services) > 1):
+            return redirect(url_for('main.service_dashboard', service_id=service_id))
+        else:
+            return redirect(url_for('main.tour', page=1))
     else:
         return render_template(
             'views/add-service.html',
diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py
index bb6eb3f76..122fcd8d7 100644
--- a/tests/app/main/views/test_add_service.py
+++ b/tests/app/main/views/test_add_service.py
@@ -14,11 +14,36 @@ def test_get_should_render_add_service_template(app_,
             assert 'Which service do you want to set up notifications for?' in response.get_data(as_text=True)
 
 
-def test_should_add_service_and_redirect_to_next_page(app_,
-                                                      mocker,
-                                                      mock_create_service,
-                                                      mock_get_services,
-                                                      api_user_active):
+def test_should_add_service_and_redirect_to_tour_when_no_services(app_,
+                                                                  mocker,
+                                                                  mock_create_service,
+                                                                  mock_get_services_with_no_services,
+                                                                  api_user_active):
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            client.login(api_user_active, mocker)
+            response = client.post(
+                url_for('main.add_service'),
+                data={'name': 'testing the post'})
+            assert mock_get_services_with_no_services.called
+            mock_create_service.assert_called_once_with(
+                service_name='testing the post',
+                active=False,
+                message_limit=app_.config['DEFAULT_SERVICE_LIMIT'],
+                restricted=True,
+                user_id=api_user_active.id,
+                email_from='testing.the.post'
+            )
+            assert session['service_id'] == 101
+            assert response.status_code == 302
+            assert response.location == url_for('main.tour', page=1, _external=True)
+
+
+def test_should_add_service_and_redirect_to_dashboard_when_existing_service(app_,
+                                                                            mocker,
+                                                                            mock_create_service,
+                                                                            mock_get_services,
+                                                                            api_user_active):
     with app_.test_request_context():
         with app_.test_client() as client:
             client.login(api_user_active, mocker)
@@ -36,7 +61,7 @@ def test_should_add_service_and_redirect_to_next_page(app_,
             )
             assert session['service_id'] == 101
             assert response.status_code == 302
-            assert response.location == url_for('main.tour', page=1, _external=True)
+            assert response.location == url_for('main.service_dashboard', service_id=101, _external=True)
 
 
 def test_should_return_form_errors_when_service_name_is_empty(app_,
diff --git a/tests/conftest.py b/tests/conftest.py
index ce0037e68..7114697b0 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -147,6 +147,18 @@ def mock_get_services(mocker, fake_uuid, user=None):
         'app.service_api_client.get_services', side_effect=_create)
 
 
+@pytest.fixture(scope='function')
+def mock_get_services_with_no_services(mocker, fake_uuid, user=None):
+    if user is None:
+        user = active_user_with_permissions(fake_uuid)
+
+    def _create(user_id=None):
+        return {'data': []}
+
+    return mocker.patch(
+        'app.service_api_client.get_services', side_effect=_create)
+
+
 @pytest.fixture(scope='function')
 def mock_get_services_with_one_service(mocker, fake_uuid, user=None):
     if user is None: