History now returns a string-int pair and not string-string + some Cleanup

Author: ExpDev07

Pipfile.lock

@@ -1,15 +1,22 @@
 from flask import Flask
-from flask import json
 from flask_cors import CORS
-from app.settings import *
+from . import settings
 
-# Create the flask application.
-app = Flask(__name__)
-CORS(app)
+def create_app():
+    """
+    Construct the core application.
+    """
 
-# Import assets, models, routes, etc. 
-from . import routes
+    # Create flask app with CORS enabled.
+    app = Flask(__name__)
+    CORS(app)
 
-# Run the application (server).
-if __name__ == 'main':
-    app.run(port=PORT, threaded=True)
+    # Set app config from settings.
+    app.config.from_pyfile('settings.py');
+
+    with app.app_context():
+        # Import routes.
+        from . import routes
+
+        # Return created app.
+        return app

app/__init__.py

@@ -2,7 +2,7 @@
 import csv
 from datetime import datetime
 from cachetools import cached, TTLCache
-from app.utils import countrycodes, date as date_util
+from ..utils import countrycodes, date as date_util
 
 """
 Base URL for fetching data.
@@ -30,7 +30,10 @@ def get_data(category):
 
     for item in data:
         # Filter out all the dates.
-        history = dict(filter(lambda element: date_util.is_date(element[0]), item.items()))
+        dates = dict(filter(lambda element: date_util.is_date(element[0]), item.items()))
+
+        # Make location history from dates.
+        history = { date: int(amount or 0) for date, amount in dates.items() };
 
         # Country for this location.
         country = item['Country/Region']

app/data/__init__.py

@@ -0,0 +1,4 @@
+class Location():
+    """
+    A location in the world affected by the coronavirus.
+    """

app/models/location.py

@@ -1,6 +1,6 @@
 from flask import jsonify
-from app import app
-from app.data import get_data
+from flask import current_app as app
+from ..data import get_data
 
 @app.route('/all')
 def all():

app/routes/all.py

@@ -1,6 +1,6 @@
 from flask import jsonify
-from app import app
-from app.data import get_data
+from flask import current_app as app
+from ..data import get_data
 
 @app.route('/confirmed')
 def confirmed():

app/routes/confirmed.py

@@ -1,6 +1,6 @@
 from flask import jsonify
-from app import app
-from app.data import get_data
+from flask import current_app as app
+from ..data import get_data
 
 @app.route('/deaths')
 def deaths():

app/routes/deaths.py

@@ -1,6 +1,6 @@
 from flask import jsonify
-from app import app
-from app.data import get_data
+from flask import current_app as app
+from ..data import get_data
 
 @app.route('/recovered')
 def recovered():

app/routes/recovered.py

@@ -7,4 +7,4 @@
 """
 The port to serve the app application on.
 """
-PORT = int(os.getenv('port', 5000))
+PORT = int(os.getenv('PORT', 5000))