diff --git a/api/__init__.py b/api/__init__.py new file mode 100644 index 0000000..bebf979 --- /dev/null +++ b/api/__init__.py @@ -0,0 +1 @@ +from .main import api diff --git a/web/main.py b/api/main.py similarity index 85% rename from web/main.py rename to api/main.py index 17474d1..c6027d1 100644 --- a/web/main.py +++ b/api/main.py @@ -44,7 +44,7 @@ class ConnectionManager: connection_manager = ConnectionManager() -app = FastAPI( +api = FastAPI( title=config.Main.app_name, ) @@ -60,7 +60,7 @@ env = Environment( env.globals['app_name'] = config.Main.app_name -@app.get( +@api.get( path='/', ) async def _(): @@ -76,34 +76,38 @@ polls = [ { 'id': 1, 'name': 'Текущее состояние сотрудников', - 'days_of_week': 'ПН-ПТ', + 'daysOfWeek': 'ПН-ПТ', 'time': '11:00', - 'question_number': '1 вопрос', + 'questionNumber': '1 вопрос', + 'isEnabled': True, }, { 'id': 2, 'name': 'Планы на обед', - 'days_of_week': 'ПН-ПТ', + 'daysOfWeek': 'ПН-ПТ', 'time': '11:45-12:00', - 'question_number': '2 вопроса', + 'questionNumber': '2 вопроса', + 'isEnabled': False, }, ] -@app.get( +@api.get( path='/api/polls', ) async def _(): return polls -@app.post( +@api.put( path='/api/polls', ) async def _( poll: dict, ): - polls.append(poll) + for i, p in enumerate(polls): + if p['id'] == poll['id']: + polls[i] = poll # @app.websocket( diff --git a/main.py b/main.py index 35eddd5..6f9ce82 100644 --- a/main.py +++ b/main.py @@ -4,13 +4,13 @@ import uvicorn from bot import bot, dp import config -from web import app +from api import api from server import Server if __name__ == '__main__': config = uvicorn.Config( - app=app, + app=api, host=config.Main.host, port=config.Main.port, ) diff --git a/web/__init__.py b/web/__init__.py deleted file mode 100644 index e4c7aa5..0000000 --- a/web/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .main import app