Replaced flask based v1. Not currently passing integration tests, nee…

…d to change them to work with new implementation

app/main.py

@@ -10,14 +10,15 @@
 import uvicorn
 from fastapi import FastAPI, Request, Response
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.middleware.wsgi import WSGIMiddleware
+# from fastapi.middleware.wsgi import WSGIMiddleware
 from fastapi.responses import JSONResponse
 
 from .core import create_app
 from .data import data_source
 from .models.latest import LatestResponse as Latest
 from .models.location import LocationResponse as Location
 from .models.location import LocationsResponse as Locations
+from .router.v1 import router as v1router
 from .router.v2 import router as v2router
 
 # ############
@@ -83,12 +84,14 @@ async def handle_validation_error(request: Request, exc: pydantic.error_wrappers
 
 
 # Include routers.
-# APP.include_router(router, prefix="/", tags=["v1"])
+APP.include_router(v1router, prefix="", tags=["v1"])
 APP.include_router(v2router, prefix="/v2", tags=["v2"])
 
+'''
 # mount the existing Flask app
 # v1 @ /
 APP.mount("/", WSGIMiddleware(create_app()))
+'''
 
 
 # Running of app.

app/router/__init__.py

@@ -1,8 +1,5 @@
 from fastapi import APIRouter
 
-# Create the router.
-# router = APIRouter()
-
 # The routes.
 from .v2 import latest, sources, locations  # isort:skip
-# from .v1 import confirmed, deaths, recovered, all
+from .v1 import confirmed, deaths, recovered, all

app/router/v1/__init__.py

@@ -0,0 +1,3 @@
+from fastapi import APIRouter
+
+router = APIRouter()

app/router/v1/all.py

@@ -0,0 +1,21 @@
+#from flask import jsonify
+
+from ...services.location.jhu import get_category
+from . import router
+
+
+@router.get("/all")
+def all():
+    # Get all the categories.
+    confirmed = get_category("confirmed")
+    deaths = get_category("deaths")
+    recovered = get_category("recovered")
+
+    return {
+        # Data.
+        "confirmed": confirmed,
+        "deaths": deaths,
+        "recovered": recovered,
+        # Latest.
+        "latest": {"confirmed":confirmed["latest"], "deaths": deaths["latest"], "recovered": recovered["latest"],},
+    }

app/router/v1/confirmed.py

@@ -0,0 +1,13 @@
+# from flask import jsonify
+
+# from ...routes import api_v1 as api
+from ...services.location.jhu import get_category
+from . import router
+
+
+@router.get("/confirmed")
+def confirmed():
+
+    return {
+        get_category("confirmed")
+    }

app/router/v1/deaths.py

@@ -0,0 +1,12 @@
+# from flask import jsonify
+
+# from ...routes import api_v1 as api
+from ...services.location.jhu import get_category
+from . import router
+
+
+@router.get("/deaths")
+def deaths():
+    return {
+        get_category("deaths")
+    }

app/router/v1/recovered.py

@@ -0,0 +1,12 @@
+# from flask import jsonify
+
+# from ...routes import api_v1 as api
+from ...services.location.jhu import get_category
+from . import router
+
+
+@router.get("/recovered")
+def recovered():
+    return {
+        get_category("recovered")
+    }