get tests passing

Author: drkane

content.html

@@ -1,4 +1,5 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, Request
+from fastapi.middleware.cors import CORSMiddleware
 
 from findthatpostcode.blueprints import (
     addtocsv,
@@ -11,15 +12,56 @@
     search,
     tools,
 )
+from findthatpostcode.controllers.areas import area_types_count
+from findthatpostcode.db import ElasticsearchDep
+from findthatpostcode.utils import templates
 
 app = FastAPI()
 
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+    expose_headers=["Content-Disposition"],
+)
+
+
+@app.get("/")
+def index(es: ElasticsearchDep, request: Request):
+    return templates.TemplateResponse(
+        request=request,
+        name="index.html.j2",
+        context={"result": area_types_count(es)},
+        media_type="text/html",
+    )
+
+
+@app.get("/robots.txt")
+def robots(request: Request):
+    return templates.TemplateResponse(
+        request=request,
+        name="robots.txt",
+        media_type="text/plain",
+    )
+
+
+@app.get("/about")
+def about(request: Request):
+    return templates.TemplateResponse(
+        request=request,
+        name="about.html.j2",
+        media_type="text/html",
+    )
+
+
 app.include_router(areas.bp)
 app.include_router(addtocsv.bp)
 app.include_router(areatypes.bp)
 app.include_router(places.bp)
 app.include_router(points.bp)
-# app.include_router(postcodes.bp)
-# app.include_router(reconcile.bp)
-# app.include_router(search.bp)
-# app.include_router(tools.bp)
+app.include_router(postcodes.bp)
+app.include_router(reconcile.bp)
+app.include_router(search.bp)
+app.include_router(tools.bp)

findthatpostcode/blueprints/__init__.py

@@ -3,7 +3,7 @@
 import tempfile
 from typing import Annotated
 
-from fastapi import APIRouter, Form, UploadFile
+from fastapi import APIRouter, Form, Request, UploadFile
 
 from findthatpostcode.blueprints.areas import CSVResponse
 from findthatpostcode.blueprints.process_csv import process_csv
@@ -20,14 +20,18 @@
 
 
 @bp.get("/")
-def addtocsv(es: ElasticsearchDep):
+def addtocsv(es: ElasticsearchDep, request: Request):
     ats = area_types_count(es)
     return templates.TemplateResponse(
-        "addtocsv.html.j2",
-        result=ats,
-        basic_fields=BASIC_UPLOAD_FIELDS,
-        stats_fields=STATS_FIELDS,
-        default_fields=DEFAULT_UPLOAD_FIELDS,
+        request=request,
+        name="addtocsv.html.j2",
+        context={
+            "result": ats,
+            "basic_fields": BASIC_UPLOAD_FIELDS,
+            "stats_fields": STATS_FIELDS,
+            "default_fields": DEFAULT_UPLOAD_FIELDS,
+        },
+        media_type="text/html",
     )
 
 

findthatpostcode/blueprints/addtocsv.py

@@ -7,7 +7,7 @@
 
 from findthatpostcode.blueprints.utils import return_result
 from findthatpostcode.controllers.areas import Area, get_all_areas
-from findthatpostcode.db import ElasticsearchDep
+from findthatpostcode.db import ElasticsearchDep, S3Dep
 from findthatpostcode.utils import CSVResponse, templates
 
 bp = APIRouter(prefix="/areas")
@@ -16,9 +16,10 @@
 @bp.get("/search")
 @bp.get("/search.<filetype>")
 def area_search(request: Request, filetype="json", q: str | None = None):
-    return RedirectResponse(
-        request.url_for("search.search_index", q=q), status_code=301
-    )
+    redirect_url = request.url_for("search_index")
+    if q:
+        redirect_url = redirect_url.include_query_params(q=q)
+    return RedirectResponse(redirect_url, status_code=301)
 
 
 @bp.get("/names.csv")
@@ -48,60 +49,70 @@ def areas_csv(areas, filename):
     return output
 
 
-@bp.get("/<areacodes>.geojson")
-def get_area_boundary(areacodes: str, es: ElasticsearchDep):
+@bp.get("/{areacodes}.geojson")
+def get_area_boundary(areacodes: str, es: ElasticsearchDep, s3_client: S3Dep):
     areacodes = areacodes.split("+")
     features = []
     for areacode in areacodes:
-        result = Area.get_from_es(areacode, es, boundary=True, examples_count=0)
+        result = Area.get_from_es(
+            areacode, es, boundary=True, examples_count=0, s3_client=s3_client
+        )
         status, r = result.geoJSON()
         if status == 200:
             features.extend(r.get("features"))
     if status != 200:
-        return JSONResponse(message=r, status_code=status)
-    return JSONResponse({"type": "FeatureCollection", "features": features})
+        return JSONResponse(dict(message=r), status_code=status)
+    return {"type": "FeatureCollection", "features": features}
 
 
-@bp.get("/<areacode>/children/<areatype>.geojson")
-def get_area_children_boundary(areacode: str, areatype: str, es: ElasticsearchDep):
+@bp.get("/{areacode}/children/{areatype}.geojson")
+def get_area_children_boundary(
+    areacode: str, areatype: str, es: ElasticsearchDep, s3_client: S3Dep
+):
     area = Area.get_from_es(areacode, es, boundary=False, examples_count=0)
     features = []
     errors = {}
     for child_area in area.relationships["children"][areatype]:
-        result = Area.get_from_es(child_area.id, es, boundary=True, examples_count=0)
+        result = Area.get_from_es(
+            child_area.id, es, boundary=True, examples_count=0, s3_client=s3_client
+        )
         status, r = result.geoJSON()
         if status == 200:
             features.extend(r.get("features"))
         else:
             errors[child_area.id] = r
     if not features:
-        return JSONResponse(message=errors, status_code=status)
-    return JSONResponse({"type": "FeatureCollection", "features": features})
+        return JSONResponse(dict(message=errors), status_code=status)
+    return {"type": "FeatureCollection", "features": features}
 
 
-@bp.route("/<areacode>")
-@bp.route("/<areacode>.<filetype>")
+@bp.get("/{areacode}")
+@bp.get("/{areacode}.{filetype}")
 def get_area(
     areacode: str,
+    request: Request,
     filetype: str = "json",
     es: ElasticsearchDep = None,
+    s3_client: S3Dep = None,
     child: str | None = None,
 ):
     result = Area.get_from_es(
         areacode,
         es,
         boundary=(filetype == "geojson"),
         examples_count=(0 if filetype == "geojson" else 5),
+        s3_client=s3_client,
     )
 
     if filetype == "geojson":
         status, r = result.geoJSON()
         if status != 200:
             return JSONResponse(message=r, status_code=status)
-        return JSONResponse(r)
+        return r
 
     return return_result(
         result,
+        request,
         filetype,
         "area.html.j2",
         child=child,
@@ -113,6 +124,11 @@ def get_area(
     )
 
 
-@bp.route("/<areacodes>/map")
-def get_area_map(areacodes):
-    return templates.TemplateResponse("area_map.html.j2", {"areacodes": areacodes})
+@bp.get("/{areacodes}/map")
+def get_area_map(request: Request, areacodes):
+    return templates.TemplateResponse(
+        request=request,
+        name="area_map.html.j2",
+        context={"areacodes": areacodes},
+        media_type="text/html",
+    )

findthatpostcode/blueprints/areas.py

@@ -8,36 +8,49 @@
     get_all_areas,
 )
 from findthatpostcode.controllers.controller import Pagination
-from findthatpostcode.db import get_db
+from findthatpostcode.db import ElasticsearchDep
 from findthatpostcode.utils import templates
 
 bp = APIRouter(prefix="/areatypes")
 
 
 @bp.get("/")
-def all():
-    ats = area_types_count(get_db())
-    return templates.TemplateResponse("areatypes.html.j2", {"result": ats})
+def all_areatypes(es: ElasticsearchDep, request: Request):
+    ats = area_types_count(es)
+    print(ats)
+    return templates.TemplateResponse(
+        request=request,
+        name="areatypes.html.j2",
+        context={"result": ats},
+        media_type="text/html",
+    )
 
 
-@bp.get("/<areacode>")
-@bp.get("/<areacode>.<filetype>")
-def get_areatype(areacode: str, request: Request, filetype: str = "json"):
+@bp.get("/{areacode}")
+@bp.get("/{areacode}.{filetype}")
+def get_areatype(
+    areacode: str,
+    request: Request,
+    es: ElasticsearchDep,
+    filetype: str = "json",
+    p: int = 1,
+    size: int = 25,
+):
     if filetype == "csv":
-        areas = get_all_areas(get_db(), areatypes=[areacode.strip().lower()])
+        areas = get_all_areas(es, areatypes=[areacode.strip().lower()])
         return areas_csv(areas, "{}.csv".format(areacode))
-    result = Areatype.get_from_es(areacode, get_db())
-    pagination = Pagination(request)
-    result.get_areas(get_db(), pagination=pagination)
+    result = Areatype.get_from_es(areacode, es)
+    pagination = Pagination(p, size=size)
+    result.get_areas(es, pagination=pagination)
 
     pagination.set_pagination(result.attributes["count_areas"])
     nav = {
         p: request.url_for(
-            "areatypes.get_areatype", areacode=areacode, filetype=filetype, **args
-        )
+            "get_areatype", areacode=areacode, filetype=filetype
+        ).include_query_params(**args)
         if isinstance(args, dict)
         else args
         for p, args in pagination.pagination.items()
         if args
     }
-    return return_result(result, filetype, "areatype.html.j2", nav=nav)
+    return return_result(result, request, filetype, "areatype.html.j2", nav=nav)

findthatpostcode/blueprints/areatypes.py

@@ -37,6 +37,8 @@ def nearest(lat: float, lon: float, es: ElasticsearchDep, filetype: str = "json"
 
 @bp.get("/{areacode}")
 @bp.get("/{areacode}.{filetype}")
-def get_place(areacode: str, es: ElasticsearchDep, filetype: str = "json"):
+def get_place(
+    areacode: str, es: ElasticsearchDep, request: Request, filetype: str = "json"
+):
     result = Place.get_from_es(areacode, es)
-    return return_result(result, filetype, "place.html.j2")
+    return return_result(result, request, filetype, "place.html.j2")

findthatpostcode/blueprints/places.py

@@ -8,18 +8,18 @@
 bp = APIRouter(prefix="/points")
 
 
-@bp.route("/redirect")
+@bp.get("/redirect")
 def point_redirect(lat: float, lon: float, request: Request):
     return RedirectResponse(
         request.url_for(
-            "points.get", latlon="{},{}.html".format(lat, lon), filetype="html"
+            "get_point", latlon="{},{}.html".format(lat, lon), filetype="html"
         ),
         code=303,
     )
 
 
 @bp.get("/{latlon}")
-def get(latlon, es: ElasticsearchDep):
+def get_point(latlon: str, es: ElasticsearchDep, request: Request):
     filetype = "json"
     if latlon.endswith(".json"):
         latlon = latlon[:-5]
@@ -30,13 +30,14 @@ def get(latlon, es: ElasticsearchDep):
     result = Point.get_from_es((float(lat), float(lon)), es)
     errors = result.get_errors()
     if errors:
-        return_result(result, filetype, "postcode.html.j2")
+        return_result(result, request, filetype, "postcode.html.j2")
     if filetype == "html":
         return return_result(
             result.relationships["nearest_postcode"],
+            request,
             filetype,
             "postcode.html.j2",
             point=result,
             stats=result.relationships["nearest_postcode"].get_stats(),
         )
-    return return_result(result, filetype, "postcode.html.j2")
+    return return_result(result, request, filetype, "postcode.html.j2")