Fix all other dependant classes that are affected by the DAO / Service / Model changes

app/dao/users_dao.py

@@ -60,7 +60,7 @@ def delete_model_user(user):
 
 def get_model_users(user_id=None):
     if user_id:
-        return User.query.filter_by(id=user_id).one()
+        return User.query.filter_by(id=user_id).first()
     return User.query.filter_by().all()
 
 

app/user/rest.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from flask import (jsonify, request, abort, Blueprint, current_app)
 from sqlalchemy.exc import DataError
 from sqlalchemy.orm.exc import NoResultFound
-from app.dao.services_dao import get_model_services
+from app.dao.services_dao import dao_fetch_service_by_id_and_user
 from app.aws_sqs import add_notification_to_queue
 from app.dao.users_dao import (
     get_model_users,
@@ -40,29 +40,22 @@ def create_user():
     return jsonify(data=user_schema.dump(user).data), 201
 
 
-@user.route('/<int:user_id>', methods=['PUT', 'DELETE'])
+@user.route('/<int:user_id>', methods=['PUT'])
 def update_user(user_id):
-    try:
-        user = get_model_users(user_id=user_id)
-    except DataError:
-        return jsonify(result="error", message="Invalid user id"), 400
-    except NoResultFound:
+    user = get_model_users(user_id=user_id)
+    if not user:
         return jsonify(result="error", message="User not found"), 404
-    if request.method == 'DELETE':
-        status_code = 202
-        delete_model_user(user)
-    else:
-        req_json = request.get_json()
-        update_dct, errors = user_schema_load_json.load(req_json)
-        pwd = req_json.get('password', None)
-        # TODO password validation, it is already done on the admin app
-        # but would be good to have the same validation here.
-        if pwd is not None and not pwd:
-            errors.update({'password': ['Invalid data for field']})
-        if errors:
-            return jsonify(result="error", message=errors), 400
-        status_code = 200
-        save_model_user(user, update_dict=update_dct, pwd=pwd)
+    req_json = request.get_json()
+    update_dct, errors = user_schema_load_json.load(req_json)
+    pwd = req_json.get('password', None)
+    # TODO password validation, it is already done on the admin app
+    # but would be good to have the same validation here.
+    if pwd is not None and not pwd:
+        errors.update({'password': ['Invalid data for field']})
+    if errors:
+        return jsonify(result="error", message=errors), 400
+    status_code = 200
+    save_model_user(user, update_dict=update_dct, pwd=pwd)
     return jsonify(data=user_schema.dump(user).data), status_code
 
 
@@ -164,23 +157,3 @@ def get_user(user_id=None):
         return jsonify(result="error", message="User not found"), 404
     result = users_schema.dump(users) if isinstance(users, list) else user_schema.dump(users)
     return jsonify(data=result.data)
-
-
-@user.route('/<int:user_id>/service', methods=['GET'])
-@user.route('/<int:user_id>/service/<service_id>', methods=['GET'])
-def get_service_by_user_id(user_id, service_id=None):
-    try:
-        user = get_model_users(user_id=user_id)
-    except DataError:
-        return jsonify(result="error", message="Invalid user id"), 400
-    except NoResultFound:
-        return jsonify(result="error", message="User not found"), 404
-
-    try:
-        services = get_model_services(user_id=user.id, service_id=service_id)
-    except DataError:
-        return jsonify(result="error", message="Invalid service id"), 400
-    except NoResultFound:
-        return jsonify(result="error", message="Service not found"), 404
-    services, errors = services_schema.dump(services) if isinstance(services, list) else service_schema.dump(services)
-    return jsonify(data=services)