mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-22 16:31:15 -05:00
Added delete endpoint and tests.
This commit is contained in:
@@ -2,7 +2,8 @@ from flask import (jsonify, request)
|
||||
from sqlalchemy.exc import DataError
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
from app.dao.services_dao import get_model_services
|
||||
from app.dao.users_dao import (get_model_users, save_model_user)
|
||||
from app.dao.users_dao import (
|
||||
get_model_users, save_model_user, delete_model_user)
|
||||
from app.schemas import (
|
||||
user_schema, users_schema, service_schema, services_schema)
|
||||
from .. import user
|
||||
@@ -20,7 +21,7 @@ def create_user():
|
||||
|
||||
|
||||
# TODO auth to be added
|
||||
@user.route('/<int:user_id>', methods=['PUT'])
|
||||
@user.route('/<int:user_id>', methods=['PUT', 'DELETE'])
|
||||
def update_user(user_id):
|
||||
try:
|
||||
user = get_model_users(user_id=user_id)
|
||||
@@ -28,16 +29,21 @@ def update_user(user_id):
|
||||
return jsonify(result="error", message="Invalid user id"), 400
|
||||
except NoResultFound:
|
||||
return jsonify(result="error", message="User not found"), 404
|
||||
# TODO there has got to be a better way to do the next three lines
|
||||
update_user, errors = user_schema.load(request.get_json())
|
||||
if errors:
|
||||
return jsonify(result="error", message=errors), 400
|
||||
update_dict, errors = user_schema.dump(update_user)
|
||||
# TODO FIX ME
|
||||
# Remove update_service model which is added to db.session
|
||||
db.session.rollback()
|
||||
save_model_user(user, update_dict=update_dict)
|
||||
return jsonify(data=user_schema.dump(user).data)
|
||||
if request.method == 'DELETE':
|
||||
status_code = 202
|
||||
delete_model_user(user)
|
||||
else:
|
||||
status_code = 200
|
||||
# TODO there has got to be a better way to do the next three lines
|
||||
update_user, errors = user_schema.load(request.get_json())
|
||||
if errors:
|
||||
return jsonify(result="error", message=errors), 400
|
||||
update_dict, errors = user_schema.dump(update_user)
|
||||
# TODO FIX ME
|
||||
# Remove update_service model which is added to db.session
|
||||
db.session.rollback()
|
||||
save_model_user(user, update_dict=update_dict)
|
||||
return jsonify(data=user_schema.dump(user).data), status_code
|
||||
|
||||
|
||||
# TODO auth to be added.
|
||||
|
||||
Reference in New Issue
Block a user