diff --git a/app/service/callback_rest.py b/app/service/callback_rest.py index 2b824620f..ca52a7814 100644 --- a/app/service/callback_rest.py +++ b/app/service/callback_rest.py @@ -68,7 +68,7 @@ def fetch_service_inbound_api(service_id, inbound_api_id): return jsonify(data=inbound_api.serialize()), 200 -@service_callback_blueprint.route('/service-callback-api', methods=['POST']) +@service_callback_blueprint.route('/delivery-receipt-api', methods=['POST']) def create_service_callback_api(service_id): data = request.get_json() validate(data, create_service_callback_api_schema) @@ -82,7 +82,7 @@ def create_service_callback_api(service_id): return jsonify(data=callback_api.serialize()), 201 -@service_callback_blueprint.route('/service-callback-api/', methods=['POST']) +@service_callback_blueprint.route('/delivery-receipt-api/', methods=['POST']) def update_service_callback_api(service_id, callback_api_id): data = request.get_json() validate(data, update_service_callback_api_schema) @@ -96,7 +96,7 @@ def update_service_callback_api(service_id, callback_api_id): return jsonify(data=to_update.serialize()), 200 -@service_callback_blueprint.route('/service-callback-api/', methods=["GET"]) +@service_callback_blueprint.route('/delivery-receipt-api/', methods=["GET"]) def fetch_service_callback_api(service_id, callback_api_id): callback_api = get_service_callback_api(callback_api_id, service_id) diff --git a/tests/app/service/test_callback_rest.py b/tests/app/service/test_callback_rest.py index a0e8c8722..bd2dcf223 100644 --- a/tests/app/service/test_callback_rest.py +++ b/tests/app/service/test_callback_rest.py @@ -89,12 +89,12 @@ def test_fetch_service_inbound_api(client, sample_service): def test_create_service_callback_api(client, sample_service): data = { - "url": "https://some_service/callback-endpoint", + "url": "https://some_service/delivery-receipt-endpoint", "bearer_token": "some-unique-string", "updated_by_id": str(sample_service.users[0].id) } response = client.post( - '/service/{}/service-callback-api'.format(sample_service.id), + '/service/{}/delivery-receipt-api'.format(sample_service.id), data=json.dumps(data), headers=[('Content-Type', 'application/json'), create_authorization_header()] ) @@ -103,7 +103,7 @@ def test_create_service_callback_api(client, sample_service): resp_json = json.loads(response.get_data(as_text=True))["data"] assert resp_json["id"] assert resp_json["service_id"] == str(sample_service.id) - assert resp_json["url"] == "https://some_service/callback-endpoint" + assert resp_json["url"] == "https://some_service/delivery-receipt-endpoint" assert resp_json["updated_by_id"] == str(sample_service.users[0].id) assert resp_json["created_at"] assert not resp_json["updated_at"] @@ -111,12 +111,12 @@ def test_create_service_callback_api(client, sample_service): def test_set_service_callback_api_raises_404_when_service_does_not_exist(client, notify_db_session): data = { - "url": "https://some_service/service-callback-endpoint", + "url": "https://some_service/delivery-receipt-endpoint", "bearer_token": "some-unique-string", "updated_by_id": str(uuid.uuid4()) } response = client.post( - '/service/{}/service-callback-api'.format(uuid.uuid4()), + '/service/{}/delivery-receipt-api'.format(uuid.uuid4()), data=json.dumps(data), headers=[('Content-Type', 'application/json'), create_authorization_header()] ) @@ -132,7 +132,7 @@ def test_update_service_callback_api_updates_url(client, sample_service): "url": "https://another_url.com", "updated_by_id": str(sample_service.users[0].id) } - response = client.post("/service/{}/service-callback-api/{}".format(sample_service.id, service_callback_api.id), + response = client.post("/service/{}/delivery-receipt-api/{}".format(sample_service.id, service_callback_api.id), data=json.dumps(data), headers=[('Content-Type', 'application/json'), create_authorization_header()]) assert response.status_code == 200 @@ -148,7 +148,7 @@ def test_update_service_callback_api_updates_bearer_token(client, sample_service "bearer_token": "different_token", "updated_by_id": str(sample_service.users[0].id) } - response = client.post("/service/{}/service-callback-api/{}".format(sample_service.id, service_callback_api.id), + response = client.post("/service/{}/delivery-receipt-api/{}".format(sample_service.id, service_callback_api.id), data=json.dumps(data), headers=[('Content-Type', 'application/json'), create_authorization_header()]) assert response.status_code == 200 @@ -158,7 +158,7 @@ def test_update_service_callback_api_updates_bearer_token(client, sample_service def test_fetch_service_callback_api(client, sample_service): service_callback_api = create_service_callback_api(service=sample_service) - response = client.get("/service/{}/service-callback-api/{}".format(sample_service.id, service_callback_api.id), + response = client.get("/service/{}/delivery-receipt-api/{}".format(sample_service.id, service_callback_api.id), headers=[create_authorization_header()]) assert response.status_code == 200