diff --git a/back/Dockerfile b/back/Dockerfile index c728b9c..b2f4a87 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -6,6 +6,6 @@ COPY back/requirements.txt /code/requirements.txt RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt -COPY back/ /code/ +COPY back/ /code/back -CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--proxy-headers"] +CMD ["uvicorn", "back.main:app", "--host", "0.0.0.0", "--port", "8000", "--proxy-headers"] diff --git a/back/database.py b/back/database.py index 7ffabe1..942140a 100644 --- a/back/database.py +++ b/back/database.py @@ -1,4 +1,4 @@ -from .secret import host, user, password, database +from back.secret import host, user, password, database import pymysql.cursors @@ -14,9 +14,4 @@ def get_db(): try: yield connection finally: - connection.close() - -# cursor = connection.cursor() -# cursor.execute(sql, ()) -# cursor.fetchall() -# connection.commit() \ No newline at end of file + connection.close() \ No newline at end of file diff --git a/back/main.py b/back/main.py index c1de243..79e1b8c 100644 --- a/back/main.py +++ b/back/main.py @@ -5,11 +5,11 @@ from fastapi.middleware.cors import CORSMiddleware import json from typing import Optional -from .database import get_db -from .crud import get_books, remove_book, edit_book, add_book, get_films, remove_film, edit_film, add_film, get_field_values, get_user +from back.database import get_db +from back.crud import get_books, remove_book, edit_book, add_book, get_films, remove_film, edit_film, add_film, get_field_values, get_user from pydantic import BaseModel from passlib.context import CryptContext -from .secret import SECRET_KEY, ALGORITHM, ACCESS_TOKEN_EXPIRE_MINUTES, origins +from back.secret import SECRET_KEY, ALGORITHM, ACCESS_TOKEN_EXPIRE_MINUTES, origins from datetime import datetime, timedelta from jose import JWTError, jwt diff --git a/back/tests/test_main.py b/back/tests/test_main.py index c3e0dfe..c8287df 100644 --- a/back/tests/test_main.py +++ b/back/tests/test_main.py @@ -1,8 +1,8 @@ import pytest from fastapi.testclient import TestClient from unittest.mock import MagicMock, patch, ANY -from ..main import app, get_current_user -from ..database import get_db +from back.main import app, get_current_user +from back.database import get_db def override_get_db(): mock_db = MagicMock()