Added choose_service using services_dao.

app/main/dao/services_dao.py

@@ -59,6 +59,10 @@ def find_service_by_service_name(service_name):
     return retval
 
 
+def delete_service(id_):
+    return notifications_api_client.delete_service(id_)
+
+
 def find_all_service_names():
     resp = notifications_api_client.get_services()
     return [x['name'] for x in resp['data']]

app/main/forms.py

@@ -166,7 +166,7 @@ class AddServiceForm(Form):
         self._names_func = names_func
         super(AddServiceForm, self).__init__(*args, **kwargs)
 
-    service_name = StringField(validators=[
+    name = StringField('Service Name', validators=[
         DataRequired(message='Service name can not be empty')])
 
     def validate_service_name(self, a):
@@ -175,7 +175,7 @@ class AddServiceForm(Form):
 
 
 class ServiceNameForm(Form):
-    service_name = StringField(u'New name')
+    name = StringField(u'New name')
 
 
 class ConfirmPasswordForm(Form):

app/main/views/service_settings.py

@@ -2,18 +2,21 @@ from flask import render_template, redirect, request, url_for, abort
 from flask_login import login_required
 
 from app.main import main
+from app.main.dao.services_dao import (get_service_by_id, delete_service)
 from app.main.forms import ConfirmPasswordForm, ServiceNameForm
-
-service = {
-    'name': 'Service name',
-    'live': False,
-    'active': True
-}
+from client.errors import HTTPError
 
 
 @main.route("/services/<int:service_id>/service-settings")
 @login_required
 def service_settings(service_id):
+    try:
+        service = get_service_by_id(service_id)['data']
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
     return render_template(
         'views/service-settings.html',
         service=service,
@@ -23,42 +26,60 @@ def service_settings(service_id):
 
 @main.route("/services/<int:service_id>/service-settings/name", methods=['GET', 'POST'])
 @login_required
-def name(service_id):
+def service_name_change(service_id):
+    try:
+        service = get_service_by_id(service_id)
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
 
     form = ServiceNameForm()
-    form.service_name.data = 'Service name'
 
-    if request.method == 'GET':
-        return render_template(
+    if form.validate_on_submit():
+        return redirect(url_for('.service_name_change_confirm', service_id=service_id))
+
+    return render_template(
             'views/service-settings/name.html',
             service=service,
             form=form,
-            service_id=service_id
-        )
-    elif request.method == 'POST':
-        return redirect(url_for('.confirm_name_change', service_id=service_id))
+            service_id=service_id)
 
 
 @main.route("/services/<int:service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
 @login_required
-def confirm_name_change(service_id):
+def service_name_change_confirm(service_id):
+    try:
+        service = get_service_by_id(service_id)
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
 
     form = ConfirmPasswordForm()
 
-    if request.method == 'GET':
-        return render_template(
+    if form.validate_on_submit():
+        # TODO send call to API
+        return redirect(url_for('.service_settings', service_id=service_id))
+    return render_template(
             'views/service-settings/confirm.html',
             heading='Change your service name',
             form=form,
-            service_id=service_id
-        )
-    elif request.method == 'POST':
-        return redirect(url_for('.service_settings', service_id=service_id))
+            service_id=service_id)        
 
 
 @main.route("/services/<int:service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
 @login_required
-def request_to_go_live(service_id):
+def service_request_to_go_live(service_id):
+    try:
+        service = get_service_by_id(service_id)
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
     if request.method == 'GET':
         return render_template(
             'views/service-settings/request-to-go-live.html',
@@ -66,12 +87,21 @@ def request_to_go_live(service_id):
             service_id=service_id
         )
     elif request.method == 'POST':
+        # TODO send call to API
         return redirect(url_for('.service_settings', service_id=service_id))
 
 
 @main.route("/services/<int:service_id>/service-settings/status", methods=['GET', 'POST'])
 @login_required
-def status(service_id):
+def service_status_change(service_id):
+    try:
+        service = get_service_by_id(service_id)
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
+
     if request.method == 'GET':
         return render_template(
             'views/service-settings/status.html',
@@ -79,30 +109,46 @@ def status(service_id):
             service_id=service_id
         )
     elif request.method == 'POST':
-        return redirect(url_for('.confirm_status_change', service_id=service_id))
+        # TODO send call to API
+        return redirect(url_for('.service_status_change_confirm', service_id=service_id))
 
 
 @main.route("/services/<int:service_id>/service-settings/status/confirm", methods=['GET', 'POST'])
 @login_required
-def confirm_status_change(service_id):
+def service_status_change_confirm(service_id):
+    try:
+        service = get_service_by_id(service_id)
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
 
+    # TODO validate password, will leave until
+    # user management has been moved to the api.
     form = ConfirmPasswordForm()
 
-    if request.method == 'GET':
-        return render_template(
+    if form.validate_on_submit():
+        return redirect(url_for('.service_settings', service_id=service_id))
+    return render_template(
             'views/service-settings/confirm.html',
             heading='Turn off all outgoing notifications',
             destructive=True,
             form=form,
-            service_id=service_id
-        )
-    elif request.method == 'POST':
-        return redirect(url_for('.service_settings', service_id=service_id))
+            service_id=service_id)
 
 
 @main.route("/services/<int:service_id>/service-settings/delete", methods=['GET', 'POST'])
 @login_required
-def delete(service_id):
+def service_delete(service_id):
+    try:
+        service = get_service_by_id(service_id)
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
+
     if request.method == 'GET':
         return render_template(
             'views/service-settings/delete.html',
@@ -110,22 +156,36 @@ def delete(service_id):
             service_id=service_id
         )
     elif request.method == 'POST':
-        return redirect(url_for('.confirm_delete', service_id=service_id))
+        return redirect(url_for('.service_delete_confirm', service_id=service_id))
 
 
 @main.route("/services/<int:service_id>/service-settings/delete/confirm", methods=['GET', 'POST'])
 @login_required
-def confirm_delete(service_id):
-
+def service_delete_confirm(service_id):
+    try:
+        service = get_service_by_id(service_id)
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
+    # TODO validate password, will leave until
+    # user management has been moved to the api.
     form = ConfirmPasswordForm()
 
-    if request.method == 'GET':
-        return render_template(
-            'views/service-settings/confirm.html',
-            heading='Delete this service from Notify',
-            destructive=True,
-            form=form,
-            service_id=service_id
-        )
-    elif request.method == 'POST':
-        return redirect(url_for('.service_dashboard', service_id=service_id))
+    if form.validate_on_submit():
+        try:
+            service = delete_service(service_id)
+        except HTTPError as e:
+            if e.status_code == 404:
+                abort(404)
+            else:
+                raise e
+        return redirect(url_for('.choose_service'))
+
+    return render_template(
+        'views/service-settings/confirm.html',
+        heading='Delete this service from Notify',
+        destructive=True,
+        form=form,
+        service_id=service_id)

app/templates/views/service-settings.html

@@ -12,26 +12,26 @@
     {{ browse_list([
       {
         'title': 'Change your service name',
-        'link': url_for('.name', service_id=service_id),
+        'link': url_for('.service_name_change', service_id=service_id),
         'hint': 'Your service name ({}) is included in every sent notification'.format(service.name)
       },
       {
         'title': 'Request to go live and turn off sending restrictions',
-        'link': url_for('.request_to_go_live', service_id=service_id),
+        'link': url_for('.service_request_to_go_live', service_id=service_id),
         'hint': 'A live service can send notifications to any phone number or email address',
       } if not service.live else {
       },
       {
         'title': 'Turn off all outgoing notifications',
-        'link': url_for('.status', service_id=service_id),
+        'link': url_for('.service_status_change', service_id=service_id),
         'destructive': True
       } if service.active else {
         'title': 'Restart sending notifications',
-        'link': url_for('.status', service_id=service_id)
+        'link': url_for('.service_status_change', service_id=service_id)
       },
       {
         'title': 'Delete this service from Notify',
-        'link': url_for('.delete', service_id=service_id),
+        'link': url_for('.service_delete', service_id=service_id),
         'destructive': True
       },
     ]) }}

app/templates/views/service-settings/name.html

@@ -21,7 +21,7 @@ GOV.UK Notify | Service settings
       </ul>
 
       <form method="post">
-        {{ textbox(form.service_name) }}
+        {{ textbox(form.name) }}
         {{ page_footer(
           'Save',
           back_link=url_for('.service_settings', service_id=service_id)