Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from flask import Flask
from flask_cors import CORS

#see PEP396
# See PEP396.
__version__ = '2.0'

def create_app():
Expand All @@ -19,9 +19,10 @@ def create_app():
with app.app_context():
# Import routes.
from . import routes
#register api endpoints
app.register_blueprint(routes.rest_api_v1)
app.register_blueprint(routes.rest_api_v2)

# Register api endpoints.
app.register_blueprint(routes.api_v1)
app.register_blueprint(routes.api_v2)

# Return created app.
return app
9 changes: 4 additions & 5 deletions app/routes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from flask import redirect, current_app as app
from flask import Blueprint, redirect, current_app as app

#follow the import order to avoid circular dependency
from flask import Blueprint
rest_api_v1 = Blueprint("rest_api_v1", __name__, url_prefix="")
rest_api_v2 = Blueprint("rest_api_v2", __name__, url_prefix="/v2")
# Follow the import order to avoid circular dependency
api_v1 = Blueprint('api_v1', __name__, url_prefix='')
api_v2 = Blueprint('api_v2', __name__, url_prefix='/v2')

# API version 2.
from .v2 import locations, latest
Expand Down
4 changes: 2 additions & 2 deletions app/routes/v1/all.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from flask import jsonify
from flask import current_app as app
from ...routes import api_v1 as api
from ...services.location.jhu import get_category
from ...routes import rest_api_v1

@rest_api_v1.route('/all')
@api.route('/all')
def all():
# Get all the categories.
confirmed = get_category('confirmed')
Expand Down
4 changes: 2 additions & 2 deletions app/routes/v1/confirmed.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from flask import jsonify
from flask import current_app as app
from ...routes import api_v1 as api
from ...services.location.jhu import get_category
from ...routes import rest_api_v1

@rest_api_v1.route('/confirmed')
@api.route('/confirmed')
def confirmed():
return jsonify(get_category('confirmed'))
4 changes: 2 additions & 2 deletions app/routes/v1/deaths.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from flask import jsonify
from flask import current_app as app
from ...routes import api_v1 as api
from ...services.location.jhu import get_category
from ...routes import rest_api_v1

@rest_api_v1.route('/deaths')
@api.route('/deaths')
def deaths():
return jsonify(get_category('deaths'))
4 changes: 2 additions & 2 deletions app/routes/v1/recovered.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from flask import jsonify
from flask import current_app as app
from ...routes import api_v1 as api
from ...services.location.jhu import get_category
from ...routes import rest_api_v1

@rest_api_v1.route('/recovered')
@api.route('/recovered')
def recovered():
return jsonify(get_category('recovered'))
4 changes: 2 additions & 2 deletions app/routes/v2/latest.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from flask import jsonify, current_app as app
from ...routes import api_v2 as api
from ...services import jhu
from ...routes import rest_api_v2

@rest_api_v2.route('/latest')
@api.route('/latest')
def latest():
# Get the serialized version of all the locations.
locations = [ location.serialize() for location in jhu.get_all() ]
Expand Down
6 changes: 3 additions & 3 deletions app/routes/v2/locations.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from distutils.util import strtobool
from flask import jsonify, request, current_app as app
from ...routes import api_v2 as api
from ...services import jhu
from ...routes import rest_api_v2

@rest_api_v2.route('/locations')
@api.route('/locations')
def locations():
# Query parameters.
timelines = strtobool(request.args.get('timelines', default='0'))
Expand All @@ -23,7 +23,7 @@ def locations():
]
})

@rest_api_v2.route('/locations/<int:id>')
@api.route('/locations/<int:id>')
def location(id):
# Query parameters.
timelines = strtobool(request.args.get('timelines', default='1'))
Expand Down