mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-03 18:01:08 -05:00
All four http methods working now for user and service restful apis.
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
from flask import (jsonify, request)
|
||||
from sqlalchemy.exc import DataError
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
from app.dao.services_dao import (create_model_service, get_model_services)
|
||||
from app.dao.services_dao import (save_model_service, get_model_services)
|
||||
from app.dao.users_dao import get_model_users
|
||||
from .. import service
|
||||
from app import db
|
||||
from app.schemas import (services_schema, service_schema)
|
||||
|
||||
|
||||
@@ -11,17 +12,29 @@ from app.schemas import (services_schema, service_schema)
|
||||
@service.route('/', methods=['POST'])
|
||||
def create_service():
|
||||
# TODO what exceptions get passed from schema parsing?
|
||||
service = service_schema.load(request.get_json()).data
|
||||
print(service_schema.dump(service).data)
|
||||
# Some magic here, it automatically creates the service object.
|
||||
# Cool but need to understand how this works.
|
||||
service, errors = service_schema.load(request.get_json())
|
||||
# I believe service is already added to the session but just needs a
|
||||
# db.session.commit
|
||||
save_model_service(service)
|
||||
return jsonify(data=service_schema.dump(service).data), 201
|
||||
|
||||
|
||||
# TODO auth to be added
|
||||
@service.route('/<int:service_id>', methods=['PUT'])
|
||||
def update_service(service_id):
|
||||
service = get_services(service_id=service_id)
|
||||
try:
|
||||
service = get_model_services(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
|
||||
# TODO there has got to be a better way to do the next three lines
|
||||
update_service, errors = service_schema.load(request.get_json())
|
||||
update_dict, errors = service_schema.dump(update_service)
|
||||
# TODO FIX ME
|
||||
# Remove update_service model which is added to db.session
|
||||
db.session.rollback()
|
||||
save_model_service(service, update_dict=update_dict)
|
||||
return jsonify(data=service_schema.dump(service).data)
|
||||
|
||||
|
||||
@@ -34,6 +47,6 @@ def get_service(service_id=None):
|
||||
except DataError:
|
||||
return jsonify(result="error", message="Invalid service id"), 400
|
||||
except NoResultFound:
|
||||
return jsonify(result="error", message="Service doesn't exist"), 404
|
||||
result = services_schema.dump(services) if isinstance(services, list) else service_schema.dump(services)
|
||||
return jsonify(data=result.data)
|
||||
return jsonify(result="error", message="Service not found"), 404
|
||||
data, errors = services_schema.dump(services) if isinstance(services, list) else service_schema.dump(services)
|
||||
return jsonify(data=data)
|
||||
|
||||
Reference in New Issue
Block a user