From 92249e1b8b57752919a7c33d16239e93fe0e3a2c Mon Sep 17 00:00:00 2001
From: Jakub Miazek <the@grillazz.com>
Date: Sun, 17 Sep 2023 13:44:43 +0200
Subject: [PATCH 1/2] remove directive with no parameters

---
 app/models/nonsense.py    | 7 +++++--
 app/models/shakespeare.py | 2 +-
 app/models/stuff.py       | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/models/nonsense.py b/app/models/nonsense.py
index 8fcfad8..b031807 100644
--- a/app/models/nonsense.py
+++ b/app/models/nonsense.py
@@ -1,4 +1,5 @@
 import uuid
+from typing import Optional
 
 from fastapi import HTTPException, status
 from sqlalchemy import String, select
@@ -13,8 +14,10 @@ class Nonsense(Base):
     __tablename__ = "nonsense"
     __table_args__ = ({"schema": "happy_hog"},)
     id: Mapped[uuid:UUID] = mapped_column(UUID(as_uuid=True), unique=True, default=uuid.uuid4, autoincrement=True)
-    name: Mapped[str] = mapped_column(String, nullable=False, primary_key=True, unique=True)
-    description: Mapped[str] = mapped_column(String, nullable=False)
+    name: Mapped[str] = mapped_column(String, primary_key=True, unique=True)
+    description: Mapped[Optional[str]]
+    # TODO: apply relation to other tables
+
 
     @classmethod
     async def find(cls, db_session: AsyncSession, name: str):
diff --git a/app/models/shakespeare.py b/app/models/shakespeare.py
index a228fa6..a42dd9e 100644
--- a/app/models/shakespeare.py
+++ b/app/models/shakespeare.py
@@ -11,7 +11,7 @@ from sqlalchemy import (
     select,
 )
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import relationship, mapped_column, Mapped
+from sqlalchemy.orm import relationship
 
 from app.models.base import Base
 
diff --git a/app/models/stuff.py b/app/models/stuff.py
index ec27086..b96f0b6 100644
--- a/app/models/stuff.py
+++ b/app/models/stuff.py
@@ -1,4 +1,5 @@
 import uuid
+from typing import Optional
 
 from fastapi import HTTPException, status
 from sqlalchemy import String, select
@@ -13,8 +14,8 @@ class Stuff(Base):
     __tablename__ = "stuff"
     __table_args__ = ({"schema": "happy_hog"},)
     id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), unique=True, default=uuid.uuid4, autoincrement=True)
-    name: Mapped[str] = mapped_column(String, nullable=False, primary_key=True, unique=True)
-    description: Mapped[str] = mapped_column(String, nullable=False)
+    name: Mapped[str] = mapped_column(String, primary_key=True, unique=True)
+    description: Mapped[Optional[str]]
 
     @classmethod
     async def find(cls, db_session: AsyncSession, name: str):

From bacd7ba6dee8fbce90840404981afa1d14fe6146 Mon Sep 17 00:00:00 2001
From: Jakub Miazek <the@grillazz.com>
Date: Sun, 17 Sep 2023 15:18:42 +0200
Subject: [PATCH 2/2] fix code lint

---
 Dockerfile             | 2 +-
 app/models/nonsense.py | 3 +--
 app/models/stuff.py    | 3 +--
 app/models/user.py     | 2 +-
 docker-compose.yml     | 4 +---
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8674694..0bcb1e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ FROM base AS install
 WORKDIR /home/code
 
 # allow controlling the poetry installation of dependencies via external args
-ARG INSTALL_ARGS="--no-root  --only main"
+ARG INSTALL_ARGS="--no-root"
 ENV POETRY_HOME="/opt/poetry"
 ENV PATH="$POETRY_HOME/bin:$PATH"
 COPY pyproject.toml poetry.lock ./
diff --git a/app/models/nonsense.py b/app/models/nonsense.py
index b031807..0e7341f 100644
--- a/app/models/nonsense.py
+++ b/app/models/nonsense.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Optional
 
 from fastapi import HTTPException, status
 from sqlalchemy import String, select
@@ -15,7 +14,7 @@ class Nonsense(Base):
     __table_args__ = ({"schema": "happy_hog"},)
     id: Mapped[uuid:UUID] = mapped_column(UUID(as_uuid=True), unique=True, default=uuid.uuid4, autoincrement=True)
     name: Mapped[str] = mapped_column(String, primary_key=True, unique=True)
-    description: Mapped[Optional[str]]
+    description: Mapped[str | None]
     # TODO: apply relation to other tables
 
 
diff --git a/app/models/stuff.py b/app/models/stuff.py
index b96f0b6..e0b3c49 100644
--- a/app/models/stuff.py
+++ b/app/models/stuff.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Optional
 
 from fastapi import HTTPException, status
 from sqlalchemy import String, select
@@ -15,7 +14,7 @@ class Stuff(Base):
     __table_args__ = ({"schema": "happy_hog"},)
     id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), unique=True, default=uuid.uuid4, autoincrement=True)
     name: Mapped[str] = mapped_column(String, primary_key=True, unique=True)
-    description: Mapped[Optional[str]]
+    description: Mapped[str | None]
 
     @classmethod
     async def find(cls, db_session: AsyncSession, name: str):
diff --git a/app/models/user.py b/app/models/user.py
index 8917b0c..c22cd9c 100644
--- a/app/models/user.py
+++ b/app/models/user.py
@@ -3,7 +3,7 @@ from typing import Any
 
 import bcrypt
 from passlib.context import CryptContext
-from sqlalchemy import Column, String, LargeBinary, select
+from sqlalchemy import String, LargeBinary, select
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import mapped_column, Mapped
diff --git a/docker-compose.yml b/docker-compose.yml
index 28f8551..cbc0456 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,9 +15,7 @@ services:
       --reload --log-level debug
       "
     volumes:
-      - ./app:/home/code/app
-      - ./tests:/home/code/tests
-      - ./alembic:/home/code/alembic
+      - .:/home/code
     ports:
       - "8080:8080"
     depends_on: