Refactor (#289)

* merge model modules

* Combine end router modules

move version 2 endpoint definitions to single module
move version 1 endpoint definitions to single module

* remove enum subpackage

* add back warning suppression

* fix module names

* add source info to log message

* tweak and fix logging to showup on Heroku

Author: Kilo59

app/__init__.py

@@ -3,5 +3,9 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~
 API for tracking the global coronavirus (COVID-19, SARS-CoV-2) outbreak.
 """
+import logging
+
 # See PEP396.
 __version__ = "2.0.3"
+
+logging.basicConfig(level=logging.INFO)

app/enums/sources.py

@@ -12,8 +12,7 @@
 from fastapi.responses import JSONResponse
 
 from .data import data_source
-from .router.v1 import V1
-from .router.v2 import V2
+from .routers import V1, V2
 from .utils.httputils import setup_client_session, teardown_client_session
 
 # ############
@@ -61,7 +60,7 @@ async def add_datasource(request: Request, call_next):
     request.state.source = source
 
     # Move on...
-    LOGGER.info(f"source provided: {source.__class__.__name__}")
+    LOGGER.debug(f"source provided: {source.__class__.__name__}")
     response = await call_next(request)
     return response
 

app/main.py

@@ -1,9 +1,44 @@
+"""app.models.py"""
 from typing import Dict, List
 
 from pydantic import BaseModel
 
-from .latest import Latest
-from .timeline import Timelines
+
+class Latest(BaseModel):
+    """
+    Latest model.
+    """
+
+    confirmed: int
+    deaths: int
+    recovered: int
+
+
+class LatestResponse(BaseModel):
+    """
+    Response for latest.
+    """
+
+    latest: Latest
+
+
+class Timeline(BaseModel):
+    """
+    Timeline model.
+    """
+
+    latest: int
+    timeline: Dict[str, int] = {}
+
+
+class Timelines(BaseModel):
+    """
+    Timelines model.
+    """
+
+    confirmed: Timeline
+    deaths: Timeline
+    recovered: Timeline
 
 
 class Location(BaseModel):