fix: models improvement

Author: guillaumetavernier

app/modules/greencode/cruds_greencode.py

@@ -53,7 +53,7 @@ async def get_item_by_qr_code_content(
 
 async def get_item_by_id(
     db: AsyncSession,
-    item_id: Sequence[str],
+    item_id: uuid.UUID,
 ) -> models_greencode.GreenCodeItem | None:
     """Return an item by item_id."""
     result = await db.execute(
@@ -78,7 +78,7 @@ async def create_item(
     return item
 
 
-async def delete_item(item_id: str, db: AsyncSession):
+async def delete_item(item_id: uuid.UUID, db: AsyncSession):
     """Delete an item."""
     await db.execute(
         delete(models_greencode.GreenCodeItem).where(
@@ -93,7 +93,7 @@ async def delete_item(item_id: str, db: AsyncSession):
 
 
 async def update_item(
-    item_id: str,
+    item_id: uuid.UUID,
     item_update: schemas_greencode.ItemUpdate,
     db: AsyncSession,
 ):
@@ -144,13 +144,12 @@ async def get_greencode_users(
 
 
 async def create_membership(
-    item_id: str,
+    item_id: uuid.UUID,
     user_id: str,
     db: AsyncSession,
 ) -> models_greencode.GreenCodeMembership:
     """Create a membership. Make user_id discover item_id."""
     membership = models_greencode.GreenCodeMembership(
-        id=str(uuid.uuid4()),
         item_id=item_id,
         user_id=user_id,
     )
@@ -163,7 +162,7 @@ async def create_membership(
     return membership
 
 
-async def delete_membership(item_id: str, user_id, db: AsyncSession):
+async def delete_membership(item_id: uuid.UUID, user_id, db: AsyncSession):
     """Delete a membership. Make user_id undiscover item_id."""
     await db.execute(
         delete(models_greencode.GreenCodeMembership).where(

app/modules/greencode/endpoints_greencode.py

@@ -108,7 +108,7 @@ async def create_item(
     """
 
     db_item = models_greencode.GreenCodeItem(
-        id=str(uuid.uuid4()),
+        id=uuid.uuid4(),
         **item.model_dump(),
     )
 
@@ -123,7 +123,7 @@ async def create_item(
     status_code=204,
 )
 async def delete_item(
-    item_id: str,
+    item_id: uuid.UUID,
     db: AsyncSession = Depends(get_db),
     user: models_core.CoreUser = Depends(is_user_a_member_of(GroupType.greencode)),
 ):
@@ -144,7 +144,7 @@ async def delete_item(
     status_code=204,
 )
 async def update_item(
-    item_id: str,
+    item_id: uuid.UUID,
     item_update: schemas_greencode.ItemUpdate,
     db: AsyncSession = Depends(get_db),
     user: models_core.CoreUser = Depends(is_user_a_member_of(GroupType.greencode)),
@@ -179,7 +179,7 @@ async def update_item(
     status_code=204,
 )
 async def create_current_user_membership(
-    item_id: str,
+    item_id: uuid.UUID,
     db: AsyncSession = Depends(get_db),
     user: models_core.CoreUser = Depends(is_user_an_ecl_member),
 ):
@@ -203,7 +203,7 @@ async def create_current_user_membership(
     status_code=204,
 )
 async def delete_current_user_membership(
-    item_id: str,
+    item_id: uuid.UUID,
     db: AsyncSession = Depends(get_db),
     user: models_core.CoreUser = Depends(is_user_an_ecl_member),
 ):
@@ -223,7 +223,7 @@ async def delete_current_user_membership(
     status_code=204,
 )
 async def create_membership(
-    item_id: str,
+    item_id: uuid.UUID,
     user_id: str,
     db: AsyncSession = Depends(get_db),
     user: models_core.CoreUser = Depends(is_user_a_member_of(GroupType.greencode)),
@@ -249,7 +249,7 @@ async def create_membership(
     status_code=204,
 )
 async def delete_membership(
-    item_id: str,
+    item_id: uuid.UUID,
     user_id: str,
     db: AsyncSession = Depends(get_db),
     user: models_core.CoreUser = Depends(is_user_a_member_of(GroupType.greencode)),

app/modules/greencode/models_greencode.py

@@ -2,13 +2,13 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from app.core.models_core import CoreUser
-from app.types.sqlalchemy import Base
+from app.types.sqlalchemy import Base, PrimaryKey
 
 
 class GreenCodeItem(Base):
     __tablename__ = "greencode_items"
 
-    id: Mapped[str] = mapped_column(String, primary_key=True, index=True)
+    id: Mapped[PrimaryKey]
     qr_code_content: Mapped[str] = mapped_column(String, nullable=False, unique=True)
     title: Mapped[str] = mapped_column(String, nullable=False)
     content: Mapped[str] = mapped_column(String, nullable=False)
@@ -21,7 +21,6 @@ class GreenCodeItem(Base):
 class GreenCodeMembership(Base):
     __tablename__ = "greencode_memberships"
 
-    id: Mapped[str] = mapped_column(String, primary_key=True, index=True)
     item_id: Mapped[str] = mapped_column(
         ForeignKey("greencode_items.id"),
         primary_key=True,

app/modules/greencode/schemas_greencode.py

@@ -1,3 +1,5 @@
+import uuid
+
 from pydantic import BaseModel, ConfigDict
 
 from app.core.schemas_core import CoreUserSimple
@@ -16,7 +18,7 @@ class ItemUpdate(BaseModel):
 
 
 class ItemComplete(ItemBase):
-    id: str
+    id: uuid.UUID
     model_config = ConfigDict(from_attributes=True)
 
 

tests/test_greencode.py

@@ -46,7 +46,7 @@ async def init_objects():
 
     global item
     item = models_greencode.GreenCodeItem(
-        id=str(uuid.uuid4()),
+        id=uuid.uuid4(),
         qr_code_content="QRCodeContent",
         title="Item",
         content="Example of item",
@@ -55,15 +55,14 @@ async def init_objects():
 
     global item_to_delete
     item_to_delete = models_greencode.GreenCodeItem(
-        id=str(uuid.uuid4()),
+        id=uuid.uuid4(),
         qr_code_content="Another QRCodeContent",
         title="Item to delete",
         content="I will be deleted soon!",
     )
     await add_object_to_db(item_to_delete)
 
     membership = models_greencode.GreenCodeMembership(
-        id=str(uuid.uuid4()),
         user_id=user_with_membership.id,
         item_id=item.id,
     )
@@ -85,7 +84,7 @@ def test_get_items_for_user_greencode():
         headers={"Authorization": f"Bearer {token_greencode}"},
     )
     assert response.status_code == 200
-    assert response.json()[0]["id"] == item.id
+    assert response.json()[0]["id"] == str(item.id)
 
 
 def test_get_user_items():
@@ -94,7 +93,7 @@ def test_get_user_items():
         headers={"Authorization": f"Bearer {token_with_membership}"},
     )
     assert response.status_code == 200
-    assert response.json()[0]["id"] == item.id
+    assert response.json()[0]["id"] == str(item.id)
 
 
 def test_get_item_by_qr_code():
@@ -103,7 +102,7 @@ def test_get_item_by_qr_code():
         headers={"Authorization": f"Bearer {token_simple}"},
     )
     assert response.status_code == 200
-    assert response.json()["id"] == item.id
+    assert response.json()["id"] == str(item.id)
 
 
 def test_create_item():