feat: update observed var schema

Author: harryle95

src/model/method.py

@@ -12,6 +12,7 @@
 
 if TYPE_CHECKING:
     from src.model.device import Device
+    from src.model.observed_variable import ObservedVariable
     from src.model.vocabulary import Vocabulary
 
 
@@ -23,8 +24,15 @@ class Method(Base):
     # Relationships:
     method_reference_id: Mapped[UUID | None] = mapped_column(ForeignKey("vocabulary_table.id", ondelete="SET NULL"))
     method_reference: Mapped[Optional["Vocabulary"]] = relationship(
-        back_populates="method", lazy=None, info=dto_field("read-only"),
+        back_populates="method",
+        lazy=None,
+        info=dto_field("read-only"),
     )
 
     device_id: Mapped[UUID | None] = mapped_column(ForeignKey("device_table.id", ondelete="SET NULL"))
     device: Mapped[Optional["Device"]] = relationship(lazy=None, info=dto_field("read-only"))
+    observed_variable: Mapped[Optional["ObservedVariable"]] = relationship(
+        "ObservedVariable",
+        lazy=None,
+        info=dto_field("read-only"),
+    )

src/model/observed_variable.py

@@ -12,6 +12,7 @@
 
 
 if TYPE_CHECKING:
+    from src.model.method import Method
     from src.model.vocabulary import Vocabulary
 
 
@@ -21,6 +22,13 @@ class ObservedVariable(Variable):
     id: Mapped[UUID] = mapped_column(ForeignKey("variable_table.id"), primary_key=True, info=dto_field("read-only"))
 
     title: Mapped[str] = mapped_column(nullable=False)
+    method_id: Mapped[UUID | None] = mapped_column(ForeignKey("method_table.id", ondelete="SET NULL"))
+    method: Mapped[Optional["Method"]] = relationship(
+        "Method",
+        lazy=None,
+        back_populates="observed_variable",
+        info=dto_field("read-only"),
+    )
     trait_reference_id: Mapped[UUID | None] = mapped_column(ForeignKey("vocabulary_table.id", ondelete="SET NULL"))
     trait_reference: Mapped[Optional["Vocabulary"]] = relationship(
         "Vocabulary",
@@ -34,4 +42,5 @@ class ObservedVariable(Variable):
 @dataclass(kw_only=True)
 class ObservedVariableDataclass(VariableDataclass):
     title: str
+    method_id: UUID | None = field(default=None)
     trait_reference_id: UUID | None = field(default=None)

src/router/observed_variable.py

@@ -1,14 +1,23 @@
-from src.model import ObservedVariable
-from src.router.base import BaseController
+from litestar.dto import DataclassDTO, DTOConfig
+
+from src.model.observed_variable import ObservedVariable, ObservedVariableDataclass
+from src.model.study import Study
+from src.router.base import DataclassController
 from src.router.utils.dto import DTOGenerator
 
 __all__ = ("ObservedVariableController",)
 
 
-ObservedVariableDTO = DTOGenerator[ObservedVariable]()
+class ObservedVariableDTO(DataclassDTO[ObservedVariableDataclass]):
+    config = DTOConfig(rename_strategy="camel")
+
+
+ObservedVariableReturnDTO = DTOGenerator[ObservedVariable]()
 
 
-class ObservedVariableController(BaseController[ObservedVariable]):
+class ObservedVariableController(DataclassController[ObservedVariable, ObservedVariableDataclass]):
     path = "/observedVariable"
-    dto = ObservedVariableDTO.write_dto
-    return_dto = ObservedVariableDTO.read_dto
+    dto = ObservedVariableDTO
+    return_dto = ObservedVariableDTO
+    attr_map = {"studies": ("study_id", Study)}
+    selectinload_attrs = [ObservedVariable.studies]