Add lots of changes and docker build

Author: gitkoDev

.env

@@ -1 +1,3 @@
-DB_URL="postgresql+psycopg2://postgres:1234@localhost:5432"
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=1234
+POSTGRES_DB=postgres

Dockerfile

@@ -0,0 +1,10 @@
+FROM python:3.12
+
+ENV PYTHONDONTWRITEBYCODE = 1
+ENV PYTHONUUNBUFFERED = 1
+
+WORKDIR /app
+
+COPY requirements.txt /app/
+RUN pip install -r requirements.txt
+COPY . /app/

Makefile

@@ -1,8 +1,14 @@
 run:
-	fastapi dev main.py
-
+	uvicorn main:app --reload
+	
 review:
 	alembic revision --autogenerate -m "Create User model"
 
 upgrade:
-	alembic upgrade head
+	alembic upgrade head
+
+downgrade:
+	alembic downgrade base
+
+generate_migrations: upgrade
+	alembic revision --autogenerate -m "Create User and Note models"

__pycache__/main.cpython-312.pyc

@@ -60,7 +60,7 @@ version_path_separator = os  # Use os.pathsep. Default configuration used for ne
 # are written from script.py.mako
 # output_encoding = utf-8
 
-sqlalchemy.url = postgresql://postgres:1234@localhost/postgres
+sqlalchemy.url = postgresql://postgres:1234@notesdb/postgres
 
 
 [post_write_hooks]

alembic.ini

@@ -0,0 +1,16 @@
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker, Session
+from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
+
+DB_USER = "postgres"
+DB_PASSWORD = "1234"
+DB_HOST = "notesdb"
+DB_NAME = "postgres"
+
+DB_URL = f"postgresql+asyncpg://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:5432/{DB_NAME}"
+
+# engine = create_engine(DB_URL)
+engine = create_async_engine(DB_URL)
+
+# SessionLocal = sessionmaker(engine, autoflush=False, autocommit=False)
+SessionLocal = async_sessionmaker(bind=engine, autoflush=False)

config/database.py

@@ -0,0 +1,29 @@
+services:
+  web:
+    container_name: notes_api
+    build: .
+    command: bash -c "alembic upgrade head && uvicorn main:app --host 0.0.0.0 --port 8000"
+    depends_on:
+      db:
+        condition: service_healthy
+    ports:
+      - 8000:8000
+
+  db:
+    container_name: notesdb
+    image: postgres:latest
+    restart: always
+    env_file:
+      - .env
+    ports:
+      - 5432:5432
+    volumes:
+      - pgdata://var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  pgdata:

database/database.py

@@ -0,0 +1,2 @@
+class NotFoundError(Exception):
+    pass

docker-compose.yml

@@ -1,14 +1,9 @@
 from fastapi import FastAPI
-from sqlalchemy.orm import session
 
-from database.database import engine, new_session
-from routers.routes import router
+from router.note_routes import router as notes_router
+from router.auth_routes import router as auth_router
 
 
-app = FastAPI(title="Trading App", version="1.0")
-app.include_router(router)
-
-if __name__ == "__main__":
-    import uvicorn
-
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+app = FastAPI(title="Notes Service", version="1.0")
+app.include_router(auth_router)
+app.include_router(notes_router)

helpers/helpers.py

@@ -4,7 +4,9 @@
 from sqlalchemy import pool
 
 from alembic import context
-from models.user import Base
+from models.user_models import Base as UserBase
+from models.notes_models import Base as NotesBase
+
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
@@ -19,7 +21,7 @@
 # for 'autogenerate' support
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
-target_metadata = Base.metadata
+target_metadata = [UserBase.metadata, NotesBase.metadata]
 
 # other values from the config, defined by the needs of env.py,
 # can be acquired:

main.py

@@ -0,0 +1,30 @@
+"""Create User and Note models
+
+Revision ID: 6cd2eb75776c
+Revises: 7ae8b93ae7b0
+Create Date: 2024-09-11 10:21:00.142559
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '6cd2eb75776c'
+down_revision: Union[str, None] = '7ae8b93ae7b0'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('password_hash', sa.String(), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'password_hash')
+    # ### end Alembic commands ###

migrations/README renamed to middleware/auth_middleware.py

@@ -1,8 +1,8 @@
-"""Create User model
+"""Create User and Note models
 
-Revision ID: 6b78fdfedaa6
+Revision ID: 7ae8b93ae7b0
 Revises: 
-Create Date: 2024-09-09 11:55:24.008408
+Create Date: 2024-09-10 17:24:21.056484
 
 """
 from typing import Sequence, Union
@@ -12,7 +12,7 @@
 
 
 # revision identifiers, used by Alembic.
-revision: str = '6b78fdfedaa6'
+revision: str = '7ae8b93ae7b0'
 down_revision: Union[str, None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
@@ -26,10 +26,20 @@ def upgrade() -> None:
     sa.PrimaryKeyConstraint('id'),
     sa.UniqueConstraint('name')
     )
+    op.create_table('notes',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('content', sa.Text(), nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('now()'), nullable=False),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('notes')
     op.drop_table('users')
     # ### end Alembic commands ###

migrations/env.py

@@ -0,0 +1,24 @@
+from sqlalchemy import String, Integer, Text, DateTime, ForeignKey, func
+from sqlalchemy.orm import Mapped, mapped_column, DeclarativeBase, relationship
+
+from datetime import datetime
+from models.user_models import UserModel
+
+
+class Base(DeclarativeBase):
+    pass
+
+
+class NoteModel(Base):
+    __tablename__ = "notes"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    content: Mapped[str] = mapped_column(Text, nullable=False)
+    user_id: Mapped[int] = mapped_column(ForeignKey(UserModel.id))
+    created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime, server_default=func.now(), onupdate=func.now()
+    )
+
+    def __repr__(self):
+        return f"id: {self.id}, content: {self.content}"

migrations/versions/6cd2eb75776c_create_user_and_note_models.py

@@ -1,4 +1,4 @@
-from sqlalchemy import Column, String, Integer
+from sqlalchemy import String, Integer
 from sqlalchemy.orm import Mapped, mapped_column, DeclarativeBase
 
 
@@ -11,6 +11,7 @@ class UserModel(Base):
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True)
     name: Mapped[str] = mapped_column(String(50), unique=True, nullable=False)
+    password_hash: Mapped[str] = mapped_column(String)
 
     def __repr__(self):
         return f"id: {self.id}, name: {self.name}"

migrations/versions/6b78fdfedaa6_create_user_model.py renamed to migrations/versions/7ae8b93ae7b0_create_user_and_note_models.py

@@ -0,0 +1,60 @@
+from fastapi import Depends
+from jose import jwt, JWTError
+from sqlalchemy.future import select
+
+from datetime import datetime, timedelta
+from typing import Annotated
+
+from models.user_models import UserModel
+from schemas.user_schemas import (
+    CreateUserInput,
+    bcrypt_context,
+    SECRET_KEY,
+    ALGORITHM,
+    oauth2_bearer,
+)
+from config.database import SessionLocal
+
+
+class AuthRepository:
+    @classmethod
+    async def create_user(cls, data: CreateUserInput) -> int:
+        async with SessionLocal() as session:
+            user = UserModel(
+                name=data.name, password_hash=bcrypt_context.hash(data.password)
+            )
+            session.add(user)
+            await session.commit()
+            await session.refresh(user)
+            return user.id
+
+    @classmethod
+    async def authenticate_user(cls, name: str, password: str):
+        async with SessionLocal() as session:
+            query = select(UserModel).where(UserModel.name == name)
+            result = await session.execute(query)
+            user = result.scalars().one()
+            if not user:
+                return False
+            if not bcrypt_context.verify(password, user.password_hash):
+                return False
+            return user
+
+    @classmethod
+    def create_access_token(cls, name: str, id: int, ttl: timedelta):
+        data_to_encode = {"sub": name, "id": id}
+        expires = datetime.now() + ttl
+        data_to_encode.update({"exp": expires})
+        return jwt.encode(data_to_encode, SECRET_KEY, algorithm=ALGORITHM)
+
+    @classmethod
+    def parse_access_token(cls, token: Annotated[str, Depends(oauth2_bearer)]):
+        try:
+            payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
+            username: str = payload.get("sub")
+            user_id: str = payload.get("id")
+            if username is None or user_id is None:
+                return False
+            return {"username": username, "user_id": user_id}
+        except JWTError:
+            return False