Merge pull request #8 from helpwave/patch/read-functionality

implement read capabilities

Author: felixevers

backend/api/inputs.py

@@ -5,7 +5,7 @@
 
 
 @strawberry.enum
-class Gender(Enum):
+class Sex(Enum):
     MALE = "MALE"
     FEMALE = "FEMALE"
     UNKNOWN = "UNKNOWN"
@@ -56,7 +56,7 @@ class CreatePatientInput:
     firstname: str
     lastname: str
     birthdate: date
-    gender: Gender
+    sex: Sex
     assigned_location_id: strawberry.ID | None = None
     properties: list[PropertyValueInput] | None = None
 
@@ -66,7 +66,7 @@ class UpdatePatientInput:
     firstname: str | None = None
     lastname: str | None = None
     birthdate: date | None = None
-    gender: Gender | None = None
+    sex: Sex | None = None
     assigned_location_id: strawberry.ID | None = None
     properties: list[PropertyValueInput] | None = None
 

backend/api/resolvers/location.py

@@ -16,7 +16,7 @@ class LocationQuery:
     async def location_roots(self, info: Info) -> list[LocationNodeType]:
         result = await info.context.db.execute(
             select(models.LocationNode).where(
-                models.LocationNode.parent_id == None,  # noqa: E711
+                models.LocationNode.parent_id == None,
             ),
         )
         return result.scalars().all()

backend/api/resolvers/patient.py

@@ -32,15 +32,32 @@ async def patients(
     ) -> list[PatientType]:
         query = select(models.Patient)
         if location_node_id:
+            # Recursive CTE to find the selected node and all its descendants
+            cte = (
+                select(models.LocationNode.id)
+                .where(models.LocationNode.id == location_node_id)
+                .cte(name="location_descendants", recursive=True)
+            )
+
+            parent = select(models.LocationNode.id).join(
+                cte,
+                models.LocationNode.parent_id == cte.c.id,
+            )
+            cte = cte.union_all(parent)
+
+            # Filter patients who are assigned to any of these locations
             query = query.where(
-                models.Patient.assigned_location_id == location_node_id,
+                models.Patient.assigned_location_id.in_(select(cte.c.id)),
             )
+
         result = await info.context.db.execute(query)
         return result.scalars().all()
 
     @strawberry.field
     async def recent_patients(
-        self, info: Info, limit: int = 5
+        self,
+        info: Info,
+        limit: int = 5,
     ) -> list[PatientType]:
         query = select(models.Patient).limit(limit)
         result = await info.context.db.execute(query)
@@ -59,7 +76,7 @@ async def create_patient(
             firstname=data.firstname,
             lastname=data.lastname,
             birthdate=data.birthdate,
-            gender=data.gender.value,
+            sex=data.sex.value,
             assigned_location_id=data.assigned_location_id,
         )
         info.context.db.add(new_patient)
@@ -97,8 +114,8 @@ async def update_patient(
             patient.lastname = data.lastname
         if data.birthdate is not None:
             patient.birthdate = data.birthdate
-        if data.gender is not None:
-            patient.gender = data.gender.value
+        if data.sex is not None:
+            patient.sex = data.sex.value
         if data.assigned_location_id is not None:
             patient.assigned_location_id = data.assigned_location_id
 

backend/api/types/patient.py

@@ -3,7 +3,7 @@
 
 import strawberry
 from api.context import Info
-from api.inputs import Gender
+from api.inputs import Sex
 from api.types.property import PropertyValueType
 from database import models
 from sqlalchemy import select
@@ -20,7 +20,7 @@ class PatientType:
     firstname: str
     lastname: str
     birthdate: date
-    gender: Gender
+    sex: Sex
     assigned_location_id: strawberry.ID | None
 
     @strawberry.field

…ase/migrations/versions/ac24ef41bd41_.py …ase/migrations/versions/a0b4916b75c6_.pybackend/database/migrations/versions/ac24ef41bd41_.py renamed to backend/database/migrations/versions/a0b4916b75c6_.py backend/database/migrations/versions/ac24ef41bd41_.py renamed to backend/database/migrations/versions/a0b4916b75c6_.py

@@ -1,8 +1,8 @@
 """empty message
 
-Revision ID: ac24ef41bd41
+Revision ID: a0b4916b75c6
 Revises: 
-Create Date: 2025-12-12 19:00:58.216109
+Create Date: 2025-12-12 20:54:09.779104
 
 """
 from typing import Sequence, Union
@@ -12,7 +12,7 @@
 
 
 # revision identifiers, used by Alembic.
-revision: str = 'ac24ef41bd41'
+revision: str = 'a0b4916b75c6'
 down_revision: Union[str, Sequence[str], None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
@@ -53,7 +53,7 @@ def upgrade() -> None:
     sa.Column('firstname', sa.String(), nullable=False),
     sa.Column('lastname', sa.String(), nullable=False),
     sa.Column('birthdate', sa.Date(), nullable=False),
-    sa.Column('gender', sa.String(), nullable=False),
+    sa.Column('sex', sa.String(), nullable=False),
     sa.Column('assigned_location_id', sa.String(), nullable=True),
     sa.ForeignKeyConstraint(['assigned_location_id'], ['location_nodes.id'], ),
     sa.PrimaryKeyConstraint('id')

backend/database/models/patient.py

@@ -18,22 +18,30 @@ class Patient(Base):
     __tablename__ = "patients"
 
     id: Mapped[str] = mapped_column(
-        String, primary_key=True, default=lambda: str(uuid.uuid4())
+        String,
+        primary_key=True,
+        default=lambda: str(uuid.uuid4()),
     )
     firstname: Mapped[str] = mapped_column(String)
     lastname: Mapped[str] = mapped_column(String)
     birthdate: Mapped[date] = mapped_column()
-    gender: Mapped[str] = mapped_column(String)
+    sex: Mapped[str] = mapped_column(String)
     assigned_location_id: Mapped[str | None] = mapped_column(
-        ForeignKey("location_nodes.id"), nullable=True
+        ForeignKey("location_nodes.id"),
+        nullable=True,
     )
 
     assigned_location: Mapped[LocationNode | None] = relationship(
-        "LocationNode", back_populates="patients"
+        "LocationNode",
+        back_populates="patients",
     )
     tasks: Mapped[list[Task]] = relationship(
-        "Task", back_populates="patient", cascade="all, delete-orphan"
+        "Task",
+        back_populates="patient",
+        cascade="all, delete-orphan",
     )
     properties: Mapped[list[PropertyValue]] = relationship(
-        "PropertyValue", back_populates="patient", cascade="all, delete-orphan"
+        "PropertyValue",
+        back_populates="patient",
+        cascade="all, delete-orphan",
     )

backend/database/models/task.py

@@ -25,26 +25,34 @@ class Task(Base):
     __tablename__ = "tasks"
 
     id: Mapped[str] = mapped_column(
-        String, primary_key=True, default=lambda: str(uuid.uuid4())
+        String,
+        primary_key=True,
+        default=lambda: str(uuid.uuid4()),
     )
     title: Mapped[str] = mapped_column(String)
     description: Mapped[str | None] = mapped_column(String, nullable=True)
     done: Mapped[bool] = mapped_column(Boolean, default=False)
     creation_date: Mapped[datetime] = mapped_column(default=datetime.now)
     update_date: Mapped[datetime | None] = mapped_column(
-        nullable=True, onupdate=datetime.now
+        nullable=True,
+        default=datetime.now,
+        onupdate=datetime.now,
     )
     assignee_id: Mapped[str | None] = mapped_column(
-        ForeignKey("users.id"), nullable=True
+        ForeignKey("users.id"),
+        nullable=True,
     )
     patient_id: Mapped[str] = mapped_column(ForeignKey("patients.id"))
 
     assignee: Mapped[User | None] = relationship(
-        "User", back_populates="tasks"
+        "User",
+        back_populates="tasks",
     )
     patient: Mapped[Patient] = relationship("Patient", back_populates="tasks")
     properties: Mapped[list[PropertyValue]] = relationship(
-        "PropertyValue", back_populates="task", cascade="all, delete-orphan"
+        "PropertyValue",
+        back_populates="task",
+        cascade="all, delete-orphan",
     )
 
     previous_tasks: Mapped[list[Task]] = relationship(