Renamed DESKPRO_TEAM_ID to DESKPRO_DEPT_ID to match name of param in

api call. Added DESKPRO_ASSIGNED_AGENT_TEAM_ID so that tickets routed correctly.
alphagov · May 18, 2016 · e181940 · e181940
1 parent 0172797
commit e181940
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py
@@ -14,7 +14,8 @@ def feedback():
     if form.validate_on_submit():
         data = {
             'person_email': current_app.config.get('DESKPRO_PERSON_EMAIL'),
-            'department_id': current_app.config.get('DESKPRO_TEAM_ID'),
+            'department_id': current_app.config.get('DESKPRO_DEPT_ID'),
+            'assigned_agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
             'subject': 'Notify feedback',
             'message': 'Environment: {}\n\n{}\n{}\n{}'.format(
                 url_for('main.index', _external=True),

diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
@@ -101,7 +101,8 @@ def service_request_to_go_live(service_id):
 
         data = {
             'person_email': current_app.config.get('DESKPRO_PERSON_EMAIL'),
-            'department_id': current_app.config.get('DESKPRO_TEAM_ID'),
+            'department_id': current_app.config.get('DESKPRO_DEPT_ID'),
+            'assigned_agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
             'subject': 'Request to go live',
             'message': "From {} <{}> on behalf of {} ({})\n\nUsage estimate\n---\n\n{}".format(
                 current_user.name,

diff --git a/config.py b/config.py
@@ -37,7 +37,8 @@ class Config(object):
     DESKPRO_API_HOST = os.environ['DESKPRO_API_HOST']
     DESKPRO_API_KEY = os.environ['DESKPRO_API_KEY']
     DESKPRO_PERSON_EMAIL = os.environ['DESKPRO_PERSON_EMAIL']
-    DESKPRO_TEAM_ID = os.environ['DESKPRO_TEAM_ID']
+    DESKPRO_DEPT_ID = os.environ['DESKPRO_DEPT_ID']
+    DESKPRO_ASSIGNED_AGENT_TEAM_ID = os.environ['DESKPRO_ASSIGNED_AGENT_TEAM_ID']
     ACTIVITY_STATS_LIMIT_DAYS = 7
 
     EMAIL_DOMAIN_REGEXES = [

diff --git a/environment_test.sh b/environment_test.sh
@@ -7,4 +7,5 @@ export SECRET_KEY='dev-notify-secret-key'
 export DESKPRO_API_HOST=""
 export DESKPRO_API_KEY=""
 export DESKPRO_PERSON_EMAIL=""
-export DESKPRO_TEAM_ID=""
+export DESKPRO_DEPT_ID=""
+export DESKPRO_ASSIGNED_AGENT_TEAM_ID=""
diff --git a/tests/app/main/views/test_feedback.py b/tests/app/main/views/test_feedback.py
@@ -1,5 +1,5 @@
 import pytest
-from flask import (url_for, current_app)
+from flask import url_for
 from werkzeug.exceptions import InternalServerError
 from unittest.mock import Mock, ANY
 
@@ -48,6 +48,7 @@ def test_post_feedback_with_no_name_email(app_, mocker):
                 ANY,
                 data={
                     'department_id': ANY,
+                    'assigned_agent_team_id': ANY,
                     'subject': 'Notify feedback',
                     'message': 'Environment: http://localhost/\n\n\n\nblah',
                     'person_email': ANY},
@@ -69,6 +70,7 @@ def test_post_feedback_with_name_email(app_, mocker):
                 data={
                     'subject': 'Notify feedback',
                     'department_id': ANY,
+                    'assigned_agent_team_id': ANY,
                     'message': 'Environment: http://localhost/\n\nSteve Irwin\nrip@gmail.com\nblah',
                     'person_email': ANY},
                 headers=ANY)
@@ -94,6 +96,7 @@ def test_log_error_on_post(app_, mocker):
                 data={
                     'subject': 'Notify feedback',
                     'department_id': ANY,
+                    'assigned_agent_team_id': ANY,
                     'message': 'Environment: http://localhost/\n\nSteve Irwin\nrip@gmail.com\nblah',
                     'person_email': ANY},
                 headers=ANY)

diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
@@ -239,6 +239,7 @@ def test_should_redirect_after_request_to_go_live(
                 data={
                     'subject': 'Request to go live',
                     'department_id': ANY,
+                    'assigned_agent_team_id': ANY,
                     'message': 'From Test User <test@user.gov.uk> on behalf of Test Service (http://localhost/services/6ce466d0-fd6a-11e5-82f5-e0accb9d11a6/dashboard)\n\nUsage estimate\n---\n\nOne million messages',  # noqa
                     'person_email': ANY
                 },