Test add service completed.

app/main/forms.py

@@ -157,15 +157,20 @@ class TextNotReceivedForm(Form):
 
 
 class AddServiceForm(Form):
-    def __init__(self, service_names, *args, **kwargs):
-        self.service_names = service_names
+    def __init__(self, names_func, *args, **kwargs):
+        """
+        Keyword arguments:
+        names_func -- Returns a list of unique service_names already registered
+        on the system.
+        """
+        self._names_func = names_func
         super(AddServiceForm, self).__init__(*args, **kwargs)
 
     service_name = StringField(validators=[
         DataRequired(message='Service name can not be empty')])
 
     def validate_service_name(self, a):
-        if self.service_name.data in self.service_names:
+        if self.service_name.data in self._names_func():
             raise ValidationError('Service name already exists')
 
 

app/main/views/add_service.py

@@ -9,7 +9,7 @@ from app.main.forms import AddServiceForm
 @login_required
 def add_service():
 	# TODO fix up this 
-    form = AddServiceForm(services_dao.find_all_service_names())
+    form = AddServiceForm(services_dao.find_all_service_names)
     if form.validate_on_submit():
         user = users_dao.get_user_by_id(session['user_id'])
         services_dao.insert_new_service(form.service_name.data, user)

app/main/views/dashboard.py

@@ -1,18 +1,24 @@
-from flask import render_template
+from flask import (abort, render_template)
 from flask_login import login_required
 from app.main import main
-
-
+from app.main.dao.services_dao import get_service_by_id
+from client.errors import HTTPError
 from ._jobs import jobs
 
 
 @main.route("/services/<int:service_id>/dashboard")
 @login_required
 def dashboard(service_id):
+    try:
+        service = get_service_by_id(service_id)
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
     return render_template(
         'views/dashboard.html',
         jobs=jobs,
         free_text_messages_remaining=560,
         spent_this_month='0.00',
-        service_id=service_id
-    )
+        service_id=service_id)