moved models into different files

Author: ExpDev07

app/main.py

@@ -11,13 +11,16 @@
 import fastapi
 import pydantic
 import uvicorn
+
 from fastapi.middleware.wsgi import WSGIMiddleware
 from fastapi.middleware.cors import CORSMiddleware
 
-from . import models
 from .core import create_app
 from .data import data_source, data_sources
 
+from .models.location import LocationResponse as Location, LocationsResponse as Locations
+from .models.latest import LatestResponse as Latest
+
 # ################
 # Dependencies
 # ################
@@ -100,8 +103,7 @@ async def handle_validation_error(
 
 V2 = fastapi.APIRouter()
 
-
-@V2.get('/latest', response_model=models.LatestResponse)
+@V2.get('/latest', response_model=Latest)
 def get_latest(request: fastapi.Request, source: Sources = 'jhu'):
     """
     Getting latest amount of total confirmed cases, deaths, and recoveries.
@@ -117,7 +119,7 @@ def get_latest(request: fastapi.Request, source: Sources = 'jhu'):
 
 
 @V2.get(
-    '/locations', response_model=models.LocationsResponse, response_model_exclude_unset=True
+    '/locations', response_model=Locations, response_model_exclude_unset=True
 )
 def get_locations(
     request: fastapi.Request,
@@ -163,7 +165,7 @@ def get_locations(
     }
 
 
-@V2.get('/locations/{id}', response_model=models.LocationResponse)
+@V2.get('/locations/{id}', response_model=Location)
 def get_location_by_id(request: fastapi.Request, id: int, source: Sources = 'jhu', timelines: bool = True):
     """
     Getting specific location by id.

app/models.py

@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+class Latest(BaseModel):
+    """
+    Latest model.
+    """
+    confirmed: int
+    deaths: int
+    recovered: int
+
+class LatestResponse(BaseModel):
+    """
+    Response for latest.
+    """
+    latest: Latest

app/models/latest.py

@@ -0,0 +1,31 @@
+from pydantic import BaseModel
+from typing import Dict, List
+from .timeline import Timelines
+from .latest import Latest
+
+class Location(BaseModel):
+    """
+    Location model.
+    """
+    id: int
+    country: str
+    country_code: str
+    county: str = ''
+    province: str = ''
+    last_updated: str # TODO use datetime.datetime type.
+    coordinates: Dict
+    latest: Latest
+    timelines: Timelines = {}
+
+class LocationResponse(BaseModel):
+    """
+    Response for location.
+    """
+    location: Location
+
+class LocationsResponse(BaseModel):
+    """
+    Response for locations.
+    """
+    latest: Latest
+    locations: List[Location] = []

app/models/location.py

@@ -0,0 +1,18 @@
+from pydantic import BaseModel
+from typing import Dict
+
+class Timeline(BaseModel):
+    """
+    Timeline model.
+    """
+
+    latest: int
+    timeline: Dict[str, int] = {}
+
+class Timelines(BaseModel):
+    """
+    Timelines model.
+    """
+    confirmed: Timeline
+    deaths: Timeline
+    recovered: Timeline

app/models/timeline.py

@@ -6,8 +6,3 @@
 
 # API version 1.
 from .v1 import confirmed, deaths, recovered, all
-
-# Redirect to project page on index.
-@app.route('/')
-def index():
-    return redirect('https://github.com/ExpDev07/coronavirus-tracker-api', 302)