darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-11 18:38:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'data' from the json being returned.

Browse Source
This commit is contained in:
Rebecca Law
2017-10-19 13:59:22 +01:00
parent cee916c68a
commit 2193afe9a3
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/service/rest.py
+4 -4
View File
@@ -641,7 +641,7 @@ def add_service_sms_sender(service_id):
is_default=form['is_default'], is_default=form['is_default'],
inbound_number_id=inbound_number_id inbound_number_id=inbound_number_id
) )
return jsonify(data=new_sms_sender.serialize()), 201 return jsonify(new_sms_sender.serialize()), 201
@service_blueprint.route('/<uuid:service_id>/sms-sender/<uuid:sms_sender_id>', methods=['POST']) @service_blueprint.route('/<uuid:service_id>/sms-sender/<uuid:sms_sender_id>', methods=['POST'])
@@ -659,20 +659,20 @@ def update_service_sms_sender(service_id, sms_sender_id):
is_default=form['is_default'], is_default=form['is_default'],
sms_sender=form['sms_sender'] sms_sender=form['sms_sender']
) )
return jsonify(data=new_sms_sender.serialize()), 200 return jsonify(new_sms_sender.serialize()), 200
@service_blueprint.route('/<uuid:service_id>/sms-sender/<uuid:sms_sender_id>', methods=['GET']) @service_blueprint.route('/<uuid:service_id>/sms-sender/<uuid:sms_sender_id>', methods=['GET'])
def get_service_sms_sender_by_id(service_id, sms_sender_id): def get_service_sms_sender_by_id(service_id, sms_sender_id):
sms_sender = dao_get_service_sms_senders_by_id(service_id=service_id, sms_sender = dao_get_service_sms_senders_by_id(service_id=service_id,
service_sms_sender_id=sms_sender_id) service_sms_sender_id=sms_sender_id)
return jsonify(data=sms_sender.serialize()), 200 return jsonify(sms_sender.serialize()), 200
@service_blueprint.route('/<uuid:service_id>/sms-sender', methods=['GET']) @service_blueprint.route('/<uuid:service_id>/sms-sender', methods=['GET'])
def get_service_sms_senders_for_service(service_id): def get_service_sms_senders_for_service(service_id):
sms_senders = dao_get_sms_senders_by_service_id(service_id=service_id) sms_senders = dao_get_sms_senders_by_service_id(service_id=service_id)
return jsonify(data=[sms_sender.serialize() for sms_sender in sms_senders]), 200 return jsonify([sms_sender.serialize() for sms_sender in sms_senders]), 200
@service_blueprint.route('/unique', methods=["GET"]) @service_blueprint.route('/unique', methods=["GET"])
tests/app/service/test_rest.py
+8 -9
View File
@@ -2584,7 +2584,7 @@ def test_add_service_sms_sender_can_add_multiple_senders(client, notify_db_sessi
headers=[('Content-Type', 'application/json'), create_authorization_header()] headers=[('Content-Type', 'application/json'), create_authorization_header()]
) )
assert response.status_code == 201 assert response.status_code == 201
resp_json = json.loads(response.get_data(as_text=True))['data'] resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['sms_sender'] == 'second' assert resp_json['sms_sender'] == 'second'
assert not resp_json['is_default'] assert not resp_json['is_default']
senders = ServiceSmsSender.query.all() senders = ServiceSmsSender.query.all()
@@ -2606,7 +2606,7 @@ def test_add_service_sms_sender_when_it_is_an_inbound_number(client, notify_db_s
assert response.status_code == 201 assert response.status_code == 201
updated_number = InboundNumber.query.get(inbound_number.id) updated_number = InboundNumber.query.get(inbound_number.id)
assert updated_number.service_id == service.id assert updated_number.service_id == service.id
resp_json = json.loads(response.get_data(as_text=True))['data'] resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['sms_sender'] == inbound_number.number assert resp_json['sms_sender'] == inbound_number.number
assert resp_json['inbound_number_id'] == str(inbound_number.id) assert resp_json['inbound_number_id'] == str(inbound_number.id)
assert not resp_json['is_default'] assert not resp_json['is_default']
@@ -2623,7 +2623,7 @@ def test_add_service_sms_sender_switches_default(client, notify_db_session):
headers=[('Content-Type', 'application/json'), create_authorization_header()] headers=[('Content-Type', 'application/json'), create_authorization_header()]
) )
assert response.status_code == 201 assert response.status_code == 201
resp_json = json.loads(response.get_data(as_text=True))['data'] resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['sms_sender'] == 'second' assert resp_json['sms_sender'] == 'second'
assert not resp_json['inbound_number_id'] assert not resp_json['inbound_number_id']
assert resp_json['is_default'] assert resp_json['is_default']
@@ -2658,7 +2658,7 @@ def test_update_service_sms_sender(client, notify_db_session):
headers=[('Content-Type', 'application/json'), create_authorization_header()] headers=[('Content-Type', 'application/json'), create_authorization_header()]
) )
assert response.status_code == 200 assert response.status_code == 200
resp_json = json.loads(response.get_data(as_text=True))['data'] resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['sms_sender'] == 'second' assert resp_json['sms_sender'] == 'second'
assert not resp_json['inbound_number_id'] assert not resp_json['inbound_number_id']
assert not resp_json['is_default'] assert not resp_json['is_default']
@@ -2676,9 +2676,8 @@ def test_update_service_sms_sender_switches_default(client, notify_db_session):
headers=[('Content-Type', 'application/json'), create_authorization_header()] headers=[('Content-Type', 'application/json'), create_authorization_header()]
) )
assert response.status_code == 200 assert response.status_code == 200
resp_json = json.loads(response.get_data(as_text=True))['data'] resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['sms_sender'] == 'second' assert resp_json['sms_sender'] == 'second'
print(resp_json)
assert not resp_json['inbound_number_id'] assert not resp_json['inbound_number_id']
assert resp_json['is_default'] assert resp_json['is_default']
sms_senders = ServiceSmsSender.query.filter_by(sms_sender='first').first() sms_senders = ServiceSmsSender.query.filter_by(sms_sender='first').first()
@@ -2727,7 +2726,7 @@ def test_get_service_sms_sender_by_id(client, notify_db_session):
headers=[('Content-Type', 'application/json'), create_authorization_header()] headers=[('Content-Type', 'application/json'), create_authorization_header()]
) )
assert response.status_code == 200 assert response.status_code == 200
assert json.loads(response.get_data(as_text=True))['data'] == service_sms_sender.serialize() assert json.loads(response.get_data(as_text=True)) == service_sms_sender.serialize()
def test_get_service_sms_sender_by_id_returns_404_when_service_does_not_exist(client, notify_db_session): def test_get_service_sms_sender_by_id_returns_404_when_service_does_not_exist(client, notify_db_session):
@@ -2758,7 +2757,7 @@ def test_get_service_sms_senders_for_service(client, notify_db_session):
headers=[('Content-Type', 'application/json'), create_authorization_header()] headers=[('Content-Type', 'application/json'), create_authorization_header()]
) )
assert response.status_code == 200 assert response.status_code == 200
json_resp = json.loads(response.get_data(as_text=True))['data'] json_resp = json.loads(response.get_data(as_text=True))
assert len(json_resp) == 2 assert len(json_resp) == 2
assert json_resp[0]['is_default'] assert json_resp[0]['is_default']
assert json_resp[0]['sms_sender'] == 'first' assert json_resp[0]['sms_sender'] == 'first'
@@ -2771,4 +2770,4 @@ def test_get_service_sms_senders_for_service_returns_empty_list_when_service_doe
headers=[('Content-Type', 'application/json'), create_authorization_header()] headers=[('Content-Type', 'application/json'), create_authorization_header()]
) )
assert response.status_code == 200 assert response.status_code == 200
assert json.loads(response.get_data(as_text=True))['data'] == [] assert json.loads(response.get_data(as_text=True)) == []