[E-64] Update the current state of the web application

.gitignore

@@ -9,6 +9,9 @@ __pycache__/
 .vscode
 **/__pycache__
 **/test*
+migration
+alembic.ini
+test_folder
 
 # Distribution / packaging
 .Python
@@ -36,6 +39,7 @@ MANIFEST
 *.manifest
 *.spec
 
+
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
@@ -170,3 +174,6 @@ cython_debug/
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+/src/edulytica_api/front_end/node_modules/
+/src/edulytica_api/models/init_models.py
+task.txt

alembic_helper.txt

@@ -0,0 +1,16 @@
+alembic init -t async migration
+Прописываем в терминале эту команду и следуем инструкции:
+1) В alembic.ini меняем значение sqlalchemy.url на
+sqlalchemy.url = postgresql+asyncpg://edulytica:superstrongpassword@localhost:5432/edulytica
+2) В migration/env.py:
+    1) from src.edulytica_api.models.init_models import Base
+    2) Меняет target_metadate = Base.metadata
+В консоли пишем команды:
+alembic revision --autogenerate -m "Initial tables without relationships"
+alembic upgrade heads
+
+Заходим migration/env.py и меняем
+from src.models.models import Base
+В консоли пишем команды:
+alembic revision --autogenerate -m "Update tables"
+alembic upgrade heads

docker-compose-database.yml

@@ -0,0 +1,13 @@
+version: "3.9"
+
+services:
+  edulytica_db:
+    container_name: "EdulyticaDatabase"
+    image: postgres:16-alpine
+    restart: always
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    ports:
+      - "5443:5432"

src/edulytica_api/app.py

@@ -1,15 +1,11 @@
 import uvicorn
-from dotenv import load_dotenv
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from src.edulytica_api.database import engine
-from src.edulytica_api.models import models
 from src.edulytica_api.routers.llm_services import *
 from src.edulytica_api.routers.auth import *
 from src.edulytica_api.routers.norm_services import normocontrol_router
 
-load_dotenv()
-models.Base.metadata.create_all(bind=engine)
+
 app = FastAPI()
 origins = [
     "http://localhost",

src/edulytica_api/auth/auth_bearer.py

@@ -3,9 +3,8 @@
 from fastapi import HTTPException, Depends
 from jose import JWTError, jwt
 from passlib.context import CryptContext
-from sqlalchemy.orm import Session
+from sqlalchemy.ext.asyncio import AsyncSession
 from starlette import status
-
 from src.edulytica_api.crud.user_crud import UserCrud
 from src.edulytica_api.database import get_session
 from src.edulytica_api.settings import ALGORITHM, JWT_SECRET_KEY, JWT_REFRESH_SECRET_KEY
@@ -32,23 +31,23 @@ def __init__(self, token_type, secret_key):
         self.token_type = token_type
         self.secret_key = secret_key
 
-    def __call__(self, token: Annotated[str, Depends(oauth2_scheme)], session: Session = Depends(get_session)):
+    async def __call__(self, token: Annotated[str, Depends(oauth2_scheme)], session: AsyncSession = Depends(get_session)):
         try:
             payload = jwt.decode(token, self.secret_key, algorithms=[ALGORITHM])
             if self.token_type_validate(payload, self.token_type):
-                user = self.user_check(payload=payload, session=session)
+                user = await self.user_check(payload=payload, session=session)
                 return {"user": user,
                         "payload": payload,
                         "token": token}
         except JWTError as e:
             raise credentials_exception
 
     @staticmethod
-    def user_check(payload, session: Session):
+    async def user_check(payload, session: AsyncSession):
         user_id: str = payload.get("sub")
         if user_id is None:
             raise credentials_exception
-        user = UserCrud.get_by_id(session=session, record_id=user_id)
+        user = await UserCrud.get_by_id(session=session, record_id=user_id)
         if user is None:
             raise credentials_exception
         if user.disabled: