feat: init api

Author: JonFreer

.gitignore

@@ -7,6 +7,6 @@ __pycache__
 
 node_modules/
 
-./data
+/data
 
 *.DS_Store

README.md

@@ -2,4 +2,30 @@
 
 This project aims to create an Web App and API to display and make available the Cycle Count Data from the West Midlands Vivacity API
 
-mkcert -cert-file dev.cert -key-file dev.pem "cyclecounter.localhost" "*.cyclecounter.localhost"
+## Development
+
+### Setup
+
+- Generate certificates using [mkcert](https://github.com/FiloSottile/mkcert):
+
+      cd traefik/certs
+      mkcert -cert-file dev.cert -key-file dev.pem "cyclecounter.localhost" "*.cyclecounter.localhost"
+      
+- Create a `.env` file using the `example.env` template:
+
+      cp example.env .env
+
+  <!-- You *will* need to fill in any missing fields, such as the OAuth scope stuff
+  for both Twitter and Discord. -->
+
+- Download and build docker image dependencies:
+
+      INFRA=dev make pull
+      INFRA=dev make build
+
+- Launch application:
+
+      INFRA=dev make up
+      
+The infrastructure should now be running at `cyclecounter.localhost`, make sure that
+this resolves to `127.0.0.1`!

api/API/crud.py

@@ -0,0 +1,26 @@
+from datetime import datetime
+import uuid
+
+from sqlalchemy.orm import Session
+from sqlalchemy import or_,and_
+
+from . import config, models
+from typing import Any, Dict, List, Optional, Tuple, Union
+
+def read_counters(db: Session, limit_offset: Tuple[int, int]):
+    limit, offset = limit_offset
+    counters = db.query(models.Counter).offset(offset).limit(limit).all()
+    return counters
+
+def create_counter(db:Session, name:str, lat:float,lon:float,location_desc:str)->models.Counter:
+    print("Creating Counter")
+    db_submission = models.Counter( 
+        name=name,
+        lat=lat,
+        lon=lon,
+        location_desc=location_desc)
+
+    db.add(db_submission)
+    db.commit()
+    db.refresh(db_submission)
+    return db_submission

api/API/db.py

@@ -0,0 +1,11 @@
+from sqlalchemy import create_engine
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker
+
+from .config import DatabaseURL
+
+print("db.py init")
+engine = create_engine(DatabaseURL)
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+
+Base = declarative_base()

api/API/dependencies.py

@@ -0,0 +1,9 @@
+from .db import SessionLocal
+
+
+def get_db():
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()

api/API/main.py

@@ -3,11 +3,17 @@
 from fastapi.openapi.utils import get_openapi
 
 from . import config
-# from .routers import report,crossings
+from .routers import counts,admin
+from .db import engine
+from . import config, models
+
+models.Base.metadata.create_all(bind=engine)
 
 app = FastAPI(root_path="/api",title="WMCycleCounter")
-print("starting")
 app.add_middleware(SessionMiddleware, secret_key=config.SessionSecret)
+
+app.include_router(counts.router)
+app.include_router(admin.router)
 # openapi_schema = get_openapi(title="BadlyParked",version="1.0.0",routes=app.routes,description="This is a very custom OpenAPI schema")
 # app.openapi_schema = openapi_schema
 # app.openapi = app.openapi_schema

api/API/models.py

@@ -0,0 +1,13 @@
+from .db import Base, engine
+import uuid
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey, String,Float,Integer,BigInteger
+
+class Counter(Base):
+    __tablename__ = "counters"
+    name = Column(
+        String, primary_key=True, index=True, default=uuid.uuid4
+    )
+    lat = Column(Float,nullable=False)
+    lon = Column(Float,nullable=False)
+    location_desc = Column(String,nullable=True)

api/API/routers/admin.py

@@ -0,0 +1,25 @@
+
+from fastapi import APIRouter, Depends
+from fastapi.responses import Response
+from typing import List, Union
+from sqlalchemy.orm import Session
+from .. import crud, schemas
+from ..dependencies import get_db
+
+router = APIRouter()
+
+@router.post("/add_counter/", response_model=schemas.Counter, tags=["admin"])
+def add_counter(
+    response: Response,
+    name: str,
+    lat: float,
+    lon: float,
+    location_desc: str = "", 
+    db: Session = Depends(get_db),
+):
+    # validate.check_limit(limit)
+    response.headers["X-Total-Count"] = str(5)
+    # res = crud.get_submissions(db, (limit, offset))
+    # print(res[0].time)
+    # return []
+    return crud.create_counter(db, name,lat,lon,location_desc)

api/API/routers/counts.py

@@ -0,0 +1,22 @@
+from fastapi import APIRouter, Depends
+from fastapi.responses import Response
+from typing import List, Union
+from sqlalchemy.orm import Session
+from .. import crud, schemas
+from ..dependencies import get_db
+
+router = APIRouter()
+
+@router.get("/counters/", response_model=List[schemas.Counter], tags=["counters"])
+def read_counter(
+    response: Response,
+    offset: int = 0,
+    limit: int = 25,
+    db: Session = Depends(get_db),
+):
+    # validate.check_limit(limit)
+    response.headers["X-Total-Count"] = str(5)
+    # res = crud.get_submissions(db, (limit, offset))
+    # print(res[0].time)
+    # return []
+    return crud.read_counters(db, (limit, offset))

api/API/schemas.py

@@ -0,0 +1,8 @@
+from pydantic import BaseModel
+import uuid
+
+class Counter(BaseModel):
+    name:str
+    lat:float
+    lon:float
+    location_desc:str