Replace Deskpro ad-hoc requests with a client from utils

Moves the duplicated calls to Deskpro to notification_utils and
rewrites feedback and service go-live requests to use the shared
client.

app/main/views/feedback.py

@@ -1,12 +1,14 @@
-import requests
 import pytz
-from flask import render_template, url_for, redirect, current_app, abort, request, session
+from flask import render_template, url_for, redirect, abort, request, session
 from flask_login import current_user
-from app import convert_to_boolean, current_service, service_api_client
+from notifications_utils.clients import DeskproError
+
+from app import convert_to_boolean, current_service, service_api_client, deskpro_client
 from app.main import main
 from app.main.forms import SupportType, Feedback, Problem, Triage
 from datetime import datetime
 
+
 QUESTION_TICKET_TYPE = 'ask-question-give-feedback'
 PROBLEM_TICKET_TYPE = "report-problem"
 
@@ -113,31 +115,17 @@ def feedback(ticket_type):
             '' if user_email else '{} (no email address supplied)'.format(form.name.data),
             form.feedback.data
         )
-        data = {
-            'person_email': user_email or current_app.config.get('DESKPRO_PERSON_EMAIL'),
-            'person_name': user_name,
-            'department_id': current_app.config.get('DESKPRO_DEPT_ID'),
-            'agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
-            'subject': 'Notify feedback {}'.format(user_name),
-            'message': feedback_msg,
-            'label': ticket_type,
-            'urgency': 10 if urgent else 1,
-        }
-        headers = {
-            "X-DeskPRO-API-Key": current_app.config.get('DESKPRO_API_KEY'),
-            'Content-Type': "application/x-www-form-urlencoded"
-        }
-        resp = requests.post(
-            current_app.config.get('DESKPRO_API_HOST') + '/api/tickets',
-            data=data,
-            headers=headers)
-        if resp.status_code != 201:
-            current_app.logger.error(
-                "Deskpro create ticket request failed with {} '{}'".format(
-                    resp.status_code,
-                    resp.json()
-                )
+
+        try:
+            deskpro_client.create_ticket(
+                subject='Notify feedback {}'.format(user_name),
+                message=feedback_msg,
+                ticket_type=ticket_type,
+                urgency=10 if urgent else 1,
+                user_email=user_email,
+                user_name=user_name
             )
+        except DeskproError:
             abort(500, "Feedback submission failed")
         return redirect(url_for('.thanks', urgent=urgent, anonymous=anonymous))
 

app/main/views/service_settings.py

@@ -1,4 +1,3 @@
-import requests
 from flask import (
     render_template,
     redirect,
@@ -7,7 +6,6 @@ from flask import (
     session,
     flash,
     abort,
-    current_app
 )
 
 from flask_login import (
@@ -16,9 +14,10 @@ from flask_login import (
 )
 
 from notifications_utils.field import Field
+from notifications_utils.clients import DeskproError
 from notifications_python_client.errors import HTTPError
 
-from app import service_api_client
+from app import service_api_client, deskpro_client
 from app.main import main
 from app.utils import user_has_permissions, email_safe, get_cdn_domain
 from app.main.forms import (
@@ -153,56 +152,40 @@ def service_request_to_go_live(service_id):
     form = RequestToGoLiveForm()
 
     if form.validate_on_submit():
-        data = {
-            'person_email': current_user.email_address,
-            'person_name': current_user.name,
-            'department_id': current_app.config.get('DESKPRO_DEPT_ID'),
-            'agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'),
-            'subject': 'Request to go live - {}'.format(current_service['name']),
-            'message': (
-                'On behalf of {} ({})\n'
-                '\n---'
-                '\nOrganisation type: {}'
-                '\nMOU in place: {}'
-                '\nChannel: {}\nStart date: {}\nStart volume: {}'
-                '\nPeak volume: {}'
-                '\nFeatures: {}'
-            ).format(
-                current_service['name'],
-                url_for('main.service_dashboard', service_id=current_service['id'], _external=True),
-                current_service['organisation_type'],
-                form.mou.data,
-                formatted_list(filter(None, (
-                    'email' if form.channel_email.data else None,
-                    'text messages' if form.channel_sms.data else None,
-                    'letters' if form.channel_letter.data else None,
-                )), before_each='', after_each=''),
-                form.start_date.data,
-                form.start_volume.data,
-                form.peak_volume.data,
-                formatted_list(filter(None, (
-                    'one off' if form.method_one_off.data else None,
-                    'file upload' if form.method_upload.data else None,
-                    'API' if form.method_api.data else None,
-                )), before_each='', after_each='')
-
-            )
-        }
-        headers = {
-            "X-DeskPRO-API-Key": current_app.config.get('DESKPRO_API_KEY'),
-            'Content-Type': "application/x-www-form-urlencoded"
-        }
-        resp = requests.post(
-            current_app.config.get('DESKPRO_API_HOST') + '/api/tickets',
-            data=data,
-            headers=headers
-        )
-        if resp.status_code != 201:
-            current_app.logger.error(
-                "Deskpro create ticket request failed with {} '{}'".format(
-                    resp.status_code,
-                    resp.json())
+        try:
+            deskpro_client.create_ticket(
+                subject='Request to go live - {}'.format(current_service['name']),
+                message=(
+                    'On behalf of {} ({})\n'
+                    '\n---'
+                    '\nOrganisation type: {}'
+                    '\nMOU in place: {}'
+                    '\nChannel: {}\nStart date: {}\nStart volume: {}'
+                    '\nPeak volume: {}'
+                    '\nFeatures: {}'
+                ).format(
+                    current_service['name'],
+                    url_for('main.service_dashboard', service_id=current_service['id'], _external=True),
+                    current_service['organisation_type'],
+                    form.mou.data,
+                    formatted_list(filter(None, (
+                        'email' if form.channel_email.data else None,
+                        'text messages' if form.channel_sms.data else None,
+                        'letters' if form.channel_letter.data else None,
+                    )), before_each='', after_each=''),
+                    form.start_date.data,
+                    form.start_volume.data,
+                    form.peak_volume.data,
+                    formatted_list(filter(None, (
+                        'one off' if form.method_one_off.data else None,
+                        'file upload' if form.method_upload.data else None,
+                        'API' if form.method_api.data else None,
+                    )), before_each='', after_each='')
+                ),
+                user_email=current_user.email_address,
+                user_name=current_user.name
             )
+        except DeskproError:
             abort(500, "Request to go live submission failed")
 
         flash('We’ve received your request to go live', 'default')