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

rename service to service_blueprint

Browse Source 
it was causing a bug where a local variable service was not being
instantiated and we were trying to operate on the blueprint instead

it's being used in so few places it makes sense to rename it
This commit is contained in:
Leo Hemsted
2016-08-19 17:30:25 +01:00
parent 00d19f63f0
commit 2053ebd933
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/__init__.py
View File

@@ -58,7 +58,7 @@ def create_app(app_name=None):
encryption.init_app(application) encryption.init_app(application)
clients.init_app(sms_clients=[firetext_client, mmg_client, loadtest_client], email_clients=[aws_ses_client]) clients.init_app(sms_clients=[firetext_client, mmg_client, loadtest_client], email_clients=[aws_ses_client])
from app.service.rest import service as service_blueprint from app.service.rest import service_blueprint
from app.user.rest import user as user_blueprint from app.user.rest import user as user_blueprint
from app.template.rest import template as template_blueprint from app.template.rest import template as template_blueprint
from app.status.healthcheck import status as status_blueprint from app.status.healthcheck import status as status_blueprint

36
app/service/rest.py
View File

@@ -45,11 +45,11 @@ from app.errors import (
) )
from app.service import statistics from app.service import statistics
service = Blueprint('service', __name__) service_blueprint = Blueprint('service', __name__)
register_errors(service) register_errors(service_blueprint)
@service.route('', methods=['GET']) @service_blueprint.route('', methods=['GET'])
def get_services(): def get_services():
user_id = request.args.get('user_id', None) user_id = request.args.get('user_id', None)
if user_id: if user_id:
@@ -62,7 +62,7 @@ def get_services():
return jsonify(data=data) return jsonify(data=data)
@service.route('/<uuid:service_id>', methods=['GET']) @service_blueprint.route('/<uuid:service_id>', methods=['GET'])
def get_service_by_id(service_id): def get_service_by_id(service_id):
if request.args.get('detailed') == 'True': if request.args.get('detailed') == 'True':
return get_detailed_service(service_id, today_only=request.args.get('today_only') == 'True') return get_detailed_service(service_id, today_only=request.args.get('today_only') == 'True')
@@ -73,7 +73,7 @@ def get_service_by_id(service_id):
return jsonify(data=data) return jsonify(data=data)
@service.route('', methods=['POST']) @service_blueprint.route('', methods=['POST'])
def create_service(): def create_service():
data = request.get_json() data = request.get_json()
if not data.get('user_id', None): if not data.get('user_id', None):
@@ -87,7 +87,7 @@ def create_service():
return jsonify(data=service_schema.dump(valid_service).data), 201 return jsonify(data=service_schema.dump(valid_service).data), 201
@service.route('/<uuid:service_id>', methods=['POST']) @service_blueprint.route('/<uuid:service_id>', methods=['POST'])
def update_service(service_id): def update_service(service_id):
fetched_service = dao_fetch_service_by_id(service_id) fetched_service = dao_fetch_service_by_id(service_id)
current_data = dict(service_schema.dump(fetched_service).data.items()) current_data = dict(service_schema.dump(fetched_service).data.items())
@@ -97,7 +97,7 @@ def update_service(service_id):
return jsonify(data=service_schema.dump(fetched_service).data), 200 return jsonify(data=service_schema.dump(fetched_service).data), 200
@service.route('/<uuid:service_id>/api-key', methods=['POST']) @service_blueprint.route('/<uuid:service_id>/api-key', methods=['POST'])
def create_api_key(service_id=None): def create_api_key(service_id=None):
fetched_service = dao_fetch_service_by_id(service_id=service_id) fetched_service = dao_fetch_service_by_id(service_id=service_id)
valid_api_key = api_key_schema.load(request.get_json()).data valid_api_key = api_key_schema.load(request.get_json()).data
@@ -107,14 +107,14 @@ def create_api_key(service_id=None):
return jsonify(data=unsigned_api_key), 201 return jsonify(data=unsigned_api_key), 201
@service.route('/<uuid:service_id>/api-key/revoke/<uuid:api_key_id>', methods=['POST']) @service_blueprint.route('/<uuid:service_id>/api-key/revoke/<uuid:api_key_id>', methods=['POST'])
def revoke_api_key(service_id, api_key_id): def revoke_api_key(service_id, api_key_id):
expire_api_key(service_id=service_id, api_key_id=api_key_id) expire_api_key(service_id=service_id, api_key_id=api_key_id)
return jsonify(), 202 return jsonify(), 202
@service.route('/<uuid:service_id>/api-keys', methods=['GET']) @service_blueprint.route('/<uuid:service_id>/api-keys', methods=['GET'])
@service.route('/<uuid:service_id>/api-keys/<uuid:key_id>', methods=['GET']) @service_blueprint.route('/<uuid:service_id>/api-keys/<uuid:key_id>', methods=['GET'])
def get_api_keys(service_id, key_id=None): def get_api_keys(service_id, key_id=None):
dao_fetch_service_by_id(service_id=service_id) dao_fetch_service_by_id(service_id=service_id)
@@ -130,14 +130,14 @@ def get_api_keys(service_id, key_id=None):
return jsonify(apiKeys=api_key_schema.dump(api_keys, many=True).data), 200 return jsonify(apiKeys=api_key_schema.dump(api_keys, many=True).data), 200
@service.route('/<uuid:service_id>/users', methods=['GET']) @service_blueprint.route('/<uuid:service_id>/users', methods=['GET'])
def get_users_for_service(service_id): def get_users_for_service(service_id):
fetched = dao_fetch_service_by_id(service_id) fetched = dao_fetch_service_by_id(service_id)
result = user_schema.dump(fetched.users, many=True) result = user_schema.dump(fetched.users, many=True)
return jsonify(data=result.data) return jsonify(data=result.data)
@service.route('/<uuid:service_id>/users/<user_id>', methods=['POST']) @service_blueprint.route('/<uuid:service_id>/users/<user_id>', methods=['POST'])
def add_user_to_service(service_id, user_id): def add_user_to_service(service_id, user_id):
service = dao_fetch_service_by_id(service_id) service = dao_fetch_service_by_id(service_id)
user = get_model_users(user_id=user_id) user = get_model_users(user_id=user_id)
@@ -152,7 +152,7 @@ def add_user_to_service(service_id, user_id):
return jsonify(data=data), 201 return jsonify(data=data), 201
@service.route('/<uuid:service_id>/users/<user_id>', methods=['DELETE']) @service_blueprint.route('/<uuid:service_id>/users/<user_id>', methods=['DELETE'])
def remove_user_from_service(service_id, user_id): def remove_user_from_service(service_id, user_id):
service = dao_fetch_service_by_id(service_id) service = dao_fetch_service_by_id(service_id)
user = get_model_users(user_id=user_id) user = get_model_users(user_id=user_id)
@@ -168,7 +168,7 @@ def remove_user_from_service(service_id, user_id):
return jsonify({}), 204 return jsonify({}), 204
@service.route('/<uuid:service_id>/fragment/aggregate_statistics') @service_blueprint.route('/<uuid:service_id>/fragment/aggregate_statistics')
def get_service_provider_aggregate_statistics(service_id): def get_service_provider_aggregate_statistics(service_id):
return jsonify(data=get_fragment_count(service_id)) return jsonify(data=get_fragment_count(service_id))
@@ -176,7 +176,7 @@ def get_service_provider_aggregate_statistics(service_id):
# This is placeholder get method until more thought # This is placeholder get method until more thought
# goes into how we want to fetch and view various items in history # goes into how we want to fetch and view various items in history
# tables. This is so product owner can pass stories as done # tables. This is so product owner can pass stories as done
@service.route('/<uuid:service_id>/history', methods=['GET']) @service_blueprint.route('/<uuid:service_id>/history', methods=['GET'])
def get_service_history(service_id): def get_service_history(service_id):
from app.models import (Service, ApiKey, Template, TemplateHistory, Event) from app.models import (Service, ApiKey, Template, TemplateHistory, Event)
from app.schemas import ( from app.schemas import (
@@ -206,7 +206,7 @@ def get_service_history(service_id):
return jsonify(data=data) return jsonify(data=data)
@service.route('/<uuid:service_id>/notifications', methods=['GET']) @service_blueprint.route('/<uuid:service_id>/notifications', methods=['GET'])
def get_all_notifications_for_service(service_id): def get_all_notifications_for_service(service_id):
data = notifications_filter_schema.load(request.args).data data = notifications_filter_schema.load(request.args).data
page = data['page'] if 'page' in data else 1 page = data['page'] if 'page' in data else 1
@@ -233,7 +233,7 @@ def get_all_notifications_for_service(service_id):
), 200 ), 200
@service.route('/<uuid:service_id>/notifications/weekly', methods=['GET']) @service_blueprint.route('/<uuid:service_id>/notifications/weekly', methods=['GET'])
def get_weekly_notification_stats(service_id): def get_weekly_notification_stats(service_id):
service = dao_fetch_service_by_id(service_id) service = dao_fetch_service_by_id(service_id)
stats = dao_fetch_weekly_historical_stats_for_service(service_id) stats = dao_fetch_weekly_historical_stats_for_service(service_id)
@@ -259,5 +259,5 @@ def get_detailed_services():
for service_id, rows in itertools.groupby(stats, lambda x: x.service_id): for service_id, rows in itertools.groupby(stats, lambda x: x.service_id):
services[service_id].statistics = statistics.format_statistics(rows) services[service_id].statistics = statistics.format_statistics(rows)
data = detailed_service_schema.dump(service, many=True).data data = detailed_service_schema.dump(services, many=True).data
return jsonify(data=data) return jsonify(data=data)