uuid in post model

Author: igorbenav

README.md

@@ -75,14 +75,6 @@ ALGORITHM= # pick an algorithm, default HS256
 ACCESS_TOKEN_EXPIRE_MINUTES= # minutes until token expires, default 30
 ```
 
-For tests, create:
-```
-# ------------- test -------------
-TEST_EMAIL="[email protected]"
-TEST_USERNAME="testeruser"
-TEST_PASSWORD="Str1ng$t"
-```
-
 And finally for the first admin user:
 ```
 # ------------- admin -------------
@@ -151,12 +143,20 @@ poetry run alembic upgrade head
 
 ___
 ## Testing
+For tests, create in .env:
+```
+# ------------- test -------------
+TEST_EMAIL="[email protected]"
+TEST_USERNAME="testeruser"
+TEST_PASSWORD="Str1ng$t"
+```
+
 While in the tests folder, create your test file with the name "test_{object}.py", replacing object with what you're testing
 ```sh
 touch test_items.py
 ```
 
-Create your tests (you may want to copy the structure in test_user.py), then run:
+Finally create your tests (you may want to copy the structure in test_user.py), then run:
 ```sh
 poetry run python -m pytest
 ```

src/app/api/dependencies.py

@@ -12,7 +12,7 @@
 from app.crud.crud_users import crud_users
 from app.api.exceptions import credentials_exception, privileges_exception
 
-async def get_current_user(token: Annotated[str, Depends(oauth2_scheme)], db: Annotated[AsyncSession, Depends(async_get_db)]):
+async def get_current_user(token: Annotated[str, Depends(oauth2_scheme)], db: Annotated[AsyncSession, Depends(async_get_db)]) -> User:
     try:
         payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
         username_or_email: str = payload.get("sub")

src/app/api/v1/posts.py

@@ -113,11 +113,10 @@ async def erase_post(
     return message
 
 
-@router.delete("/{username}/db_post/{id}")
+@router.delete("/{username}/db_post/{id}", dependencies=Depends(get_current_superuser))
 async def erase_db_post(
     username: str,
     id: int,
-    current_superuser: Annotated[UserRead, Depends(get_current_superuser)],
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
     db_user = await crud_users.get(db=db, username=username, is_deleted=False)

src/app/api/v1/users.py

@@ -98,10 +98,9 @@ async def erase_user(
     return db_user
 
 
-@router.delete("/db_user/{username}")
+@router.delete("/db_user/{username}", dependencies=Depends(get_current_superuser))
 async def erase_db_user(
     username: str,
-    current_superuser: Annotated[UserRead, Depends(get_current_superuser)],
     db: AsyncSession = Depends(async_get_db)
 ):
     db_user = await crud_users.get(db=db, username=username)

src/app/crud/crud_base.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Generic, List, Optional, Type, TypeVar, Union
+from typing import Any, Dict, Generic, List, Type, TypeVar, Union
 from datetime import datetime
 
 from pydantic import BaseModel
@@ -24,7 +24,7 @@ async def create(
         await db.commit()
         return db_object
 
-    async def get(self, db: AsyncSession, **kwargs) -> Optional[ModelType]:
+    async def get(self, db: AsyncSession, **kwargs) -> ModelType | None:
         query = select(self._model).filter_by(**kwargs)
         result = await db.execute(query)
         return result.scalar_one_or_none()
@@ -46,7 +46,7 @@ async def update(
             object: Union[UpdateSchemaType, Dict[str, Any]],
             db_object: ModelType | None = None,
             **kwargs
-    ) -> Optional[ModelType]:
+    ) -> ModelType | None:
         db_object = db_object or await self.get(db=db, **kwargs)
         if db_object:
             if isinstance(object, dict):
@@ -80,7 +80,7 @@ async def delete(
             db: AsyncSession,
             db_object: ModelType | None = None,
             **kwargs
-    ) -> Optional[ModelType]:
+    ) -> ModelType | None:
         db_object = db_object or await self.get(db=db, **kwargs)
         if db_object:
             if "is_deleted" in db_object.__dict__.keys():

src/app/models/post.py

@@ -1,4 +1,3 @@
-from typing import Optional
 import uuid as uuid_pkg
 from datetime import datetime
 
@@ -16,13 +15,16 @@ class Post(Base):
     created_by_user_id: Mapped[int] = mapped_column(ForeignKey("user.id"))
     title: Mapped[str] = mapped_column(String(30))
     text: Mapped[str] = mapped_column(String(63206))
+    uuid: Mapped[uuid_pkg.UUID] = mapped_column(
+        default_factory=uuid_pkg.uuid4, primary_key=True, unique=True
+    )    
     media_url: Mapped[str | None] = mapped_column(String, default=None)
 
     user: Mapped["User"] = relationship(back_populates="posts", lazy="selectin", init=False)
 
     created_at: Mapped[datetime] = mapped_column(
         DateTime, default_factory=datetime.utcnow
     )
-    updated_at: Mapped[Optional[datetime]] = mapped_column(default=None)
-    deleted_at: Mapped[Optional[datetime]] = mapped_column(default=None)
+    updated_at: Mapped[datetime | None] = mapped_column(default=None)
+    deleted_at: Mapped[datetime | None] = mapped_column(default=None)
     is_deleted: Mapped[bool] = mapped_column(default=False)