Working service integration.

app/main/dao/services_dao.py

@@ -16,6 +16,16 @@ def insert_new_service(service_name, user_id):
     return resp['data']['id']
 
 
+def update_service(service):
+    return notifications_api_client.update_service(
+        service['id'],
+        service['name'],
+        service['active'],
+        service['limit'],
+        service['restricted'],
+        service['users'])
+
+
 def get_service_by_id(id_):
     return notifications_api_client.get_service(id_)
 

app/main/forms.py

@@ -169,8 +169,8 @@ class AddServiceForm(Form):
     name = StringField('Service Name', validators=[
         DataRequired(message='Service name can not be empty')])
 
-    def validate_service_name(self, a):
-        if self.service_name.data in self._names_func():
+    def validate_name(self, a):
+        if a.data in self._names_func():
             raise ValidationError('Service name already exists')
 
 

app/main/views/add_service.py

@@ -12,7 +12,7 @@ def add_service():
     form = AddServiceForm(services_dao.find_all_service_names)
     if form.validate_on_submit():
         user = users_dao.get_user_by_id(session['user_id'])
-        service_id = services_dao.insert_new_service(form.service_name.data, user)
+        service_id = services_dao.insert_new_service(form.name.data, user)
         return redirect(url_for('main.service_dashboard', service_id=service_id))
     else:
         return render_template('views/add-service.html', form=form)

app/main/views/service_settings.py

@@ -1,8 +1,10 @@
-from flask import render_template, redirect, request, url_for, abort
+from flask import (
+    render_template, redirect, request, url_for, abort, session)
 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.dao.services_dao import (
+    get_service_by_id, delete_service, update_service)
 from app.main.forms import ConfirmPasswordForm, ServiceNameForm
 from client.errors import HTTPError
 
@@ -28,7 +30,7 @@ def service_settings(service_id):
 @login_required
 def service_name_change(service_id):
     try:
-        service = get_service_by_id(service_id)
+        service = get_service_by_id(service_id)['data']
     except HTTPError as e:
         if e.status_code == 404:
             abort(404)
@@ -38,20 +40,21 @@ def service_name_change(service_id):
     form = ServiceNameForm()
 
     if form.validate_on_submit():
+        session['service_name_change'] = form.name.data
         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)
+        'views/service-settings/name.html',
+        service=service,
+        form=form,
+        service_id=service_id)
 
 
 @main.route("/services/<int:service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
 @login_required
 def service_name_change_confirm(service_id):
     try:
-        service = get_service_by_id(service_id)
+        service = get_service_by_id(service_id)['data']
     except HTTPError as e:
         if e.status_code == 404:
             abort(404)
@@ -61,20 +64,21 @@ def service_name_change_confirm(service_id):
     form = ConfirmPasswordForm()
 
     if form.validate_on_submit():
-        # TODO send call to API
+        service['name'] = session['service_name_change']
+        update_service(service)
         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)        
+        'views/service-settings/confirm.html',
+        heading='Change your service name',
+        form=form,
+        service_id=service_id)
 
 
 @main.route("/services/<int:service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
 @login_required
 def service_request_to_go_live(service_id):
     try:
-        service = get_service_by_id(service_id)
+        service = get_service_by_id(service_id)['data']
     except HTTPError as e:
         if e.status_code == 404:
             abort(404)
@@ -87,7 +91,8 @@ def service_request_to_go_live(service_id):
             service_id=service_id
         )
     elif request.method == 'POST':
-        # TODO send call to API
+        service['restricted']
+        update_service(service)
         return redirect(url_for('.service_settings', service_id=service_id))
 
 
@@ -95,7 +100,7 @@ def service_request_to_go_live(service_id):
 @login_required
 def service_status_change(service_id):
     try:
-        service = get_service_by_id(service_id)
+        service = get_service_by_id(service_id)['data']
     except HTTPError as e:
         if e.status_code == 404:
             abort(404)
@@ -109,7 +114,6 @@ def service_status_change(service_id):
             service_id=service_id
         )
     elif request.method == 'POST':
-        # TODO send call to API
         return redirect(url_for('.service_status_change_confirm', service_id=service_id))
 
 
@@ -117,7 +121,7 @@ def service_status_change(service_id):
 @login_required
 def service_status_change_confirm(service_id):
     try:
-        service = get_service_by_id(service_id)
+        service = get_service_by_id(service_id)['data']
     except HTTPError as e:
         if e.status_code == 404:
             abort(404)
@@ -129,20 +133,22 @@ def service_status_change_confirm(service_id):
     form = ConfirmPasswordForm()
 
     if form.validate_on_submit():
+        service['active'] = True
+        update_service(service)
         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)
+        'views/service-settings/confirm.html',
+        heading='Turn off all outgoing notifications',
+        destructive=True,
+        form=form,
+        service_id=service_id)
 
 
 @main.route("/services/<int:service_id>/service-settings/delete", methods=['GET', 'POST'])
 @login_required
 def service_delete(service_id):
     try:
-        service = get_service_by_id(service_id)
+        service = get_service_by_id(service_id)['data']
     except HTTPError as e:
         if e.status_code == 404:
             abort(404)
@@ -163,7 +169,7 @@ def service_delete(service_id):
 @login_required
 def service_delete_confirm(service_id):
     try:
-        service = get_service_by_id(service_id)
+        service = get_service_by_id(service_id)['data']
     except HTTPError as e:
         if e.status_code == 404:
             abort(404)