Merge pull request #17 from ExpDev07/cleanup

various cleanups

Author: ExpDev07

app/__init__.py

@@ -10,21 +10,6 @@
 # Import assets, models, routes, etc. 
 from . import routes
 
-@app.after_request
-def set_source(response):
-    """
-    Attaches the source to the response.
-    """
-    body = response.get_json()
-
-    # Attach only if we're dealing with a dict.
-    if type(body) is dict:
-        body['source'] = 'https://github.com/ExpDev07/coronavirus-tracker-api'
-        response.data = json.dumps(body)
-    
-    # Finally, return the modified response.
-    return response
-
 # Run the application (server).
 if __name__ == 'main':
     app.run(port=PORT, threaded=True)

app/data/__init__.py

@@ -2,8 +2,7 @@
 import csv
 from cachetools import cached, TTLCache
 from app.utils import date as date_util
-
-from . import countrycodes as cc
+from app.utils import countrycodes
 
 """
 Base URL for fetching data.
@@ -43,7 +42,7 @@ def get_data(category):
         locations.append({
             # General info.
             'country':  country,
-            'country_code': cc.country_code(country),
+            'country_code': countrycodes.country_code(country),
             'province': item['Province/State'],
 
             # Coordinates.
@@ -65,5 +64,6 @@ def get_data(category):
     # Return the final data.
     return {
         'locations': locations,
-        'latest': latest
+        'latest': latest,
+        'source': 'https://github.com/ExpDev07/coronavirus-tracker-api',
     }

app/utils/__init__.py

@@ -1,4 +1,4 @@
 from . import date
-
+from . import countrycodes