Merge pull request #3526 from alphagov/remove-reach

Remove support for Reach provider

app/__init__.py

@@ -36,7 +36,6 @@ from app.clients.email.aws_ses import AwsSesClient
 from app.clients.email.aws_ses_stub import AwsSesStubClient
 from app.clients.sms.firetext import FiretextClient
 from app.clients.sms.mmg import MMGClient
-from app.clients.sms.reach import ReachClient
 
 
 class SQLAlchemy(_SQLAlchemy):
@@ -57,7 +56,6 @@ ma = Marshmallow()
 notify_celery = NotifyCelery()
 firetext_client = FiretextClient()
 mmg_client = MMGClient()
-reach_client = ReachClient()
 aws_ses_client = AwsSesClient()
 aws_ses_stub_client = AwsSesStubClient()
 encryption = Encryption()
@@ -100,7 +98,6 @@ def create_app(application):
     logging.init_app(application, statsd_client)
     firetext_client.init_app(application, statsd_client=statsd_client)
     mmg_client.init_app(application, statsd_client=statsd_client)
-    reach_client.init_app(application, statsd_client=statsd_client)
 
     aws_ses_client.init_app(application.config['AWS_REGION'], statsd_client=statsd_client)
     aws_ses_stub_client.init_app(
@@ -111,7 +108,7 @@ def create_app(application):
     # If a stub url is provided for SES, then use the stub client rather than the real SES boto client
     email_clients = [aws_ses_stub_client] if application.config['SES_STUB_URL'] else [aws_ses_client]
     notification_provider_clients.init_app(
-        sms_clients=[firetext_client, mmg_client, reach_client],
+        sms_clients=[firetext_client, mmg_client],
         email_clients=email_clients
     )
 

app/celery/process_sms_client_response_tasks.py

@@ -8,7 +8,6 @@ from app import notify_celery, statsd_client
 from app.clients import ClientException
 from app.clients.sms.firetext import get_firetext_responses
 from app.clients.sms.mmg import get_mmg_responses
-from app.clients.sms.reach import get_reach_responses
 from app.dao import notifications_dao
 from app.dao.templates_dao import dao_get_template_by_id
 from app.models import NOTIFICATION_PENDING
@@ -19,7 +18,6 @@ from app.notifications.notifications_ses_callback import (
 sms_response_mapper = {
     'MMG': get_mmg_responses,
     'Firetext': get_firetext_responses,
-    'Reach': get_reach_responses
 }
 
 

app/clients/sms/reach.py

@@ -1,52 +0,0 @@
-import json
-
-from requests import RequestException, request
-
-from app.clients.sms import SmsClient, SmsClientResponseException
-
-
-def get_reach_responses(status, detailed_status_code=None):
-    if status == 'TODO-d':
-        return ("delivered", "TODO: Delivered")
-    elif status == 'TODO-tf':
-        return ("temporary-failure", "TODO: Temporary failure")
-    elif status == 'TODO-pf':
-        return ("permanent-failure", "TODO: Permanent failure")
-    else:
-        raise KeyError
-
-
-class ReachClient(SmsClient):
-    def init_app(self, *args, **kwargs):
-        super().init_app(*args, **kwargs)
-        self.url = self.current_app.config.get('REACH_URL')
-
-    @property
-    def name(self):
-        return 'reach'
-
-    def try_send_sms(self, to, content, reference, international, sender):
-        data = {
-            # TODO
-        }
-
-        try:
-            response = request(
-                "POST",
-                self.url,
-                data=json.dumps(data),
-                headers={
-                    'Content-Type': 'application/json',
-                },
-                timeout=60
-            )
-
-            response.raise_for_status()
-            try:
-                json.loads(response.text)
-            except (ValueError, AttributeError):
-                raise SmsClientResponseException("Invalid response JSON")
-        except RequestException:
-            raise SmsClientResponseException("Request failed")
-
-        return response

app/config.py

@@ -381,7 +381,6 @@ class Config(object):
     # these environment vars aren't defined in the manifest so to set them on paas use `cf set-env`
     MMG_URL = os.environ.get("MMG_URL", "https://api.mmg.co.uk/jsonv2a/api.php")
     FIRETEXT_URL = os.environ.get("FIRETEXT_URL", "https://www.firetext.co.uk/api/sendsms/json")
-    REACH_URL = os.environ.get("REACH_URL", "TODO")
     SES_STUB_URL = os.environ.get("SES_STUB_URL")
 
     AWS_REGION = 'eu-west-1'
@@ -485,7 +484,6 @@ class Test(Development):
 
     MMG_URL = 'https://example.com/mmg'
     FIRETEXT_URL = 'https://example.com/firetext'
-    REACH_URL = 'https://example.com/reach'
 
     CBC_PROXY_ENABLED = True
     DVLA_EMAIL_ADDRESSES = ['success@simulator.amazonses.com', 'success+2@simulator.amazonses.com']

app/notifications/notifications_sms_callback.py

@@ -54,28 +54,6 @@ def process_firetext_response():
     return jsonify(result='success'), 200
 
 
-@sms_callback_blueprint.route('/reach', methods=['POST'])
-def process_reach_response():
-    client_name = 'Reach'
-
-    # TODO: validate request
-    errors = None
-
-    if errors:
-        raise InvalidRequest(errors, status_code=400)
-
-    status = 'TODO-d'  # TODO
-    detailed_status_code = 'something'  # TODO
-    provider_reference = 'notification_id'  # TODO
-
-    process_sms_client_response.apply_async(
-        [status, provider_reference, client_name, detailed_status_code],
-        queue=QueueNames.SMS_CALLBACKS,
-    )
-
-    return jsonify(result='success'), 200
-
-
 def validate_callback_data(data, fields, client_name):
     errors = []
     for f in fields: