Future

Dockerfile

@@ -9,22 +9,23 @@ ENV PYTHONUNBUFFERED=1 \
     POETRY_HOME="/opt/poetry" \
     POETRY_VIRTUALENVS_IN_PROJECT=true \
     POETRY_NO_INTERACTION=1 \
-    PYSETUP_PATH="/opt/pysetup" \
+    PYSETUP_PATH="/opt/app" \
     VENV_PATH="/opt/pysetup/.venv"
 
-ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
+ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH/"
 
 
 RUN apt-get update
 RUN apt-get install -y postgresql postgresql-contrib gcc python3-dev musl-dev
 RUN pip install --upgrade pip
-COPY certs/ certs/
 
 RUN curl -sSL https://install.python-poetry.org | python3 -
+
 WORKDIR $PYSETUP_PATH
 
 COPY poetry.lock pyproject.toml ./
-
-WORKDIR src/
-
+RUN poetry install --no-root
 EXPOSE 8000
+COPY . .
+
+CMD ["python", "-m src"]

alembic.ini

@@ -2,7 +2,7 @@
 
 [alembic]
 # path to migration scripts
-script_location = src/services/database/migrations
+script_location = ./src/services/database/migrations
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
 # Uncomment the line below if you want the files to be prepended with date and time

docker-compose.yml

@@ -1,16 +1,12 @@
-version: 3.10.12
-
-networks:
-    app-network:
-        external: true
+version: "3"
 
 services:
   web:
     build: .
     volumes:
       - ./:/usr/src/
-    working_dir: /usr/src/
-    command: sh -c 'alembic upgrade head && python -m src'
+    working_dir: /usr/project/src
+    command: sh -c 'alembic merge heads && python -m src'
     networks:
       - app-network
     ports:
@@ -25,12 +21,18 @@ services:
     container_name: postgres_container
     restart: always
     volumes:
-      - /home/local_postgres_data:/var/lib/postgresql/data/
+      - ./home/local_postgres_data:/var/lib/postgresql/data/
     environment:
       - POSTGRES_USER=${DB_USER}
       - POSTGRES_PASSWORD=${DB_PASS}
       - POSTGRES_DB=${DB_NAME}
     networks:
       - app-network
     ports:
-      - "25432:5432"
+      - "25432:5432"
+
+
+
+networks:
+    app-network:
+      #external: true

src/__main__.py

@@ -1,5 +1,6 @@
 from fastapi import FastAPI
 import uvicorn
+
 from src.api.v1 import api
 from src.middleware.add_midleware import setup_middleware
 
@@ -11,7 +12,7 @@
 
 
 def main() -> None:
-    uvicorn.run("main:app", host='127.0.0.1', port=8000)
+    uvicorn.run("main:app", host='127.17.0.1', port=8000)
 
 
 if __name__ == "__main__":

src/config/setting.py

@@ -3,14 +3,12 @@
 
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
-
-PATH_TO_SRC = Path(__file__).parent.parent.parent
-
+SRC_PATH = Path(__file__).parent.parent.parent
 
 class Settings(BaseSettings):
 
     model_config = SettingsConfigDict(
-        env_file=f"{PATH_TO_SRC}/.env",
+        env_file=f"{SRC_PATH}/.env",
         env_file_encoding="utf-8",
         case_sensitive=False
     )

src/middleware/add_midleware.py

@@ -3,5 +3,5 @@
 from src.config.setting import load_auth_jwt
 
 
-def setup_middleware(app: FastAPI) -> None:
-    app.add_middleware(SessionMiddleware, secret_key=load_auth_jwt().private_key_path)
+def setup_middleware(web: FastAPI) -> None:
+    web.add_middleware(SessionMiddleware, secret_key=load_auth_jwt().private_key_path)

src/services/database/migrations/versions/264223f21244_.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 264223f21244
+Revises: 723ab2a468c8
+Create Date: 2024-01-24 10:11:41.654753
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '264223f21244'
+down_revision: Union[str, None] = '723ab2a468c8'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

src/services/database/migrations/versions/723ab2a468c8_.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 723ab2a468c8
+Revises: d8d78dc2c072
+Create Date: 2024-01-24 10:10:33.645964
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '723ab2a468c8'
+down_revision: Union[str, None] = 'd8d78dc2c072'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

src/services/database/migrations/versions/870426e0d6a9_.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 870426e0d6a9
+Revises: f0d11c41d80a
+Create Date: 2024-01-24 09:12:21.622232
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '870426e0d6a9'
+down_revision: Union[str, None] = 'f0d11c41d80a'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

src/services/database/migrations/versions/adf7335ac625_.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: adf7335ac625
+Revises: 
+Create Date: 2024-01-24 07:17:19.700782
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'adf7335ac625'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

src/services/database/migrations/versions/b501628138e6_.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: b501628138e6
+Revises: adf7335ac625
+Create Date: 2024-01-24 07:17:54.920996
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'b501628138e6'
+down_revision: Union[str, None] = 'adf7335ac625'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass