From 620c514f5384dba2a946dd14e95a5e1862e92f52 Mon Sep 17 00:00:00 2001
From: Aymeric Chaumont <aymeric.chaumont@student-cs.fr>
Date: Mon, 11 Jul 2022 14:10:12 +0200
Subject: [PATCH] move opening_hours routes to stats
---
backend/main.py | 3 +--
backend/routers/opening_hours.py | 29 -----------------------------
backend/routers/stats.py | 21 ++++++++++++++++++++-
3 files changed, 21 insertions(+), 32 deletions(-)
delete mode 100644 backend/routers/opening_hours.py
diff --git a/backend/main.py b/backend/main.py
index 705da50..d4d2ed4 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -4,7 +4,7 @@ from dotenv import load_dotenv
import os
from db import database, models
-from routers import stats, comments, news, opening_hours
+from routers import stats, comments, news
app = FastAPI(docs_url="/api/docs", openapi_url="/api/openapi.json")
@@ -34,7 +34,6 @@ def on_startup():
app.include_router(stats.router)
app.include_router(comments.router)
app.include_router(news.router)
-app.include_router(opening_hours.router)
"""
diff --git a/backend/routers/opening_hours.py b/backend/routers/opening_hours.py
deleted file mode 100644
index 230d0df..0000000
--- a/backend/routers/opening_hours.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from fastapi import APIRouter, Depends
-from sqlalchemy.orm import Session
-from typing import List
-
-from db import schemas, crud
-from db.database import get_db
-
-
-router = APIRouter(prefix="/api", tags=["opening_hours"])
-
-
-@router.get('/{place}/opening_hours', response_model=List[schemas.OpeningHours])
-async def get_opening_hours(place: str, page: int = 1, db: Session = Depends(get_db)):
- return crud.get_opening_hours(place, page, db)
-
-
-@router.get('/{place}/opening_hours/{day}/{timeslot}', response_model=List[schemas.OpeningHours])
-async def get_timeslot(place: str, day: int, timeslot: bool, db: Session = Depends(get_db)):
- return crud.get_timeslot(place, day, timeslot, db)
-
-
-@router.post('/opening_hours', response_model=schemas.OpeningHours)
-async def create_opening_hours(opening_hours: schemas.OpeningHoursBase, db: Session = Depends(get_db)):
- return crud.create_opening_hours(opening_hours, db)
-
-
-@router.delete('/opening_hours/{id}', response_model=None)
-async def delete_opening_hours(id: int, db: Session = Depends(get_db)):
- return crud.delete_opening_hours(id, db)
diff --git a/backend/routers/stats.py b/backend/routers/stats.py
index 290d662..514e1e2 100644
--- a/backend/routers/stats.py
+++ b/backend/routers/stats.py
@@ -1,7 +1,7 @@
from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
-from db import crud
+from db import schemas, crud
from db.database import get_db
@@ -21,3 +21,22 @@ async def stats(place: str, db: Session = Depends(get_db)):
@router.get('/{place}/stats/current_graph', response_model=list)
async def stats(place: str, db: Session = Depends(get_db)):
return crud.get_current_graph(place, db)
+
+@router.get('/{place}/opening_hours', response_model=List[schemas.OpeningHours])
+async def get_opening_hours(place: str, page: int = 1, db: Session = Depends(get_db)):
+ return crud.get_opening_hours(place, page, db)
+
+
+@router.get('/{place}/opening_hours/{day}/{timeslot}', response_model=List[schemas.OpeningHours])
+async def get_timeslot(place: str, day: int, timeslot: bool, db: Session = Depends(get_db)):
+ return crud.get_timeslot(place, day, timeslot, db)
+
+
+@router.post('/opening_hours', response_model=schemas.OpeningHours)
+async def create_opening_hours(opening_hours: schemas.OpeningHoursBase, db: Session = Depends(get_db)):
+ return crud.create_opening_hours(opening_hours, db)
+
+
+@router.delete('/opening_hours/{id}', response_model=None)
+async def delete_opening_hours(id: int, db: Session = Depends(get_db)):
+ return crud.delete_opening_hours(id, db)
--
GitLab