darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 09:51:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor tests to use admin_request

Browse Source
This commit is contained in:
Ken Tsang
2017-07-10 13:45:48 +01:00
parent 3b1f229384
commit af9091f207
3 changed files with 104 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/organisation/organisation_schema.py
View File

@@ -1,11 +1,23 @@
post_organisation_schema = {
post_create_organisation_schema = {
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "POST schema for getting organisation",
"type": "object",
"properties": {
"colour": {"type": ["string", "null"], "format": "string"},
"name": {"type": ["string", "null"], "minimum": 1},
"logo": {"type": ["string", "null"], "minimum": 1}
"colour": {"type": ["string", "null"]},
"name": {"type": ["string", "null"]},
"logo": {"type": ["string", "null"]}
},
"required": ["logo"]
}
post_update_organisation_schema = {
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "POST schema for getting organisation",
"type": "object",
"properties": {
"colour": {"type": ["string", "null"]},
"name": {"type": ["string", "null"]},
"logo": {"type": ["string", "null"]}
},
"required": []
}

21
app/organisation/rest.py
View File

@@ -2,12 +2,13 @@ from flask import Blueprint, jsonify, request
from app.dao.organisations_dao import (
dao_create_organisation,
dao_update_organisation,
dao_get_organisations,
dao_get_organisation_by_id,
)
from app.errors import register_errors
from app.models import Organisation
from app.organisation.organisation_schema import post_organisation_schema
from app.organisation.organisation_schema import post_create_organisation_schema, post_update_organisation_schema
from app.schema_validation import validate
organisation_blueprint = Blueprint('organisation', __name__)
@@ -27,12 +28,26 @@ def get_organisation_by_id(org_id):
@organisation_blueprint.route('', methods=['POST'])
def post_organisation():
def create_organisation():
data = request.get_json()
validate(data, post_organisation_schema)
validate(data, post_create_organisation_schema)
organisation = Organisation(**data)
dao_create_organisation(organisation)
return jsonify(data=organisation.serialize()), 201
@organisation_blueprint.route('/<uuid:organisation_id>', methods=['POST'])
def update_organisation(organisation_id):
fetched_organisation = dao_get_organisation_by_id(organisation_id)
data = request.get_json()
validate(data, post_update_organisation_schema)
for key in data.keys():
setattr(fetched_organisation, key, data[key])
return jsonify(data=fetched_organisation.serialize()), 200