More tests.

app/dao/services_dao.py

@@ -3,18 +3,28 @@ from datetime import datetime
 from sqlalchemy.orm import load_only
 from . import DAOException
 from app import db
-from app.models import Service
+from app.models import (Service, User)
 
 
 def save_model_service(service, update_dict=None):
     users_list = update_dict.get('users', []) if update_dict else getattr(service, 'users', [])
     if not users_list:
-        error_msg = {'users': 'Missing data for required attribute'}
+        error_msg = {'users': ['Missing data for required attribute']}
         raise DAOException(json.dumps(error_msg))
     if update_dict:
-        del update_dict['id']
-        del update_dict['users']
-        db.session.query(Service).filter_by(id=service.id).update(update_dict)
+        # Make sure the update_dict doesn't contain conflicting
+        update_dict.pop('id', None)
+        update_dict.pop('users', None)
+        # TODO optimize this algorithm
+        new_users = User.query.filter(User.id.in_(users_list)).all()
+        for x in service.users:
+            if x in new_users:
+                new_users.remove(x)
+            else:
+                service.users.remove(x)
+        for x in new_users:
+            service.users.append(x)
+        Service.query.filter_by(id=service.id).update(update_dict)
     else:
         db.session.add(service)
     db.session.commit()

app/service/views/rest.py

@@ -3,6 +3,7 @@ from sqlalchemy.exc import DataError
 from sqlalchemy.orm.exc import NoResultFound
 from app.dao.services_dao import (save_model_service, get_model_services)
 from app.dao.users_dao import get_model_users
+from app.dao import DAOException
 from .. import service
 from app import db
 from app.schemas import (services_schema, service_schema)
@@ -17,7 +18,10 @@ def create_service():
         return jsonify(result="error", message=errors), 400
     # I believe service is already added to the session but just needs a
     # db.session.commit
-    save_model_service(service)
+    try:
+        save_model_service(service)
+    except DAOException as e:
+        return jsonify(result="error", message=str(e)), 400
     return jsonify(data=service_schema.dump(service).data), 201
 
 
@@ -31,14 +35,17 @@ def update_service(service_id):
     except NoResultFound:
         return jsonify(result="error", message="Service not found"), 404
     # TODO there has got to be a better way to do the next three lines
-    update_service, errors = service_schema.load(request.get_json())
+    upd_serv, errors = service_schema.load(request.get_json())
     if errors:
         return jsonify(result="error", message=errors), 400
-    update_dict, errors = service_schema.dump(update_service)
+    update_dict, errors = service_schema.dump(upd_serv)
     # TODO FIX ME
     # Remove update_service model which is added to db.session
     db.session.rollback()
-    save_model_service(service, update_dict=update_dict)
+    try:
+        save_model_service(service, update_dict=update_dict)
+    except DAOException as e:
+        return jsonify(result="error", message=str(e)), 400
     return jsonify(data=service_schema.dump(service).data)