Add code value additional information test; fix test assertion report…

…ing (#437)
GispoCoding · Feb 6, 2025 · 03f63f2 · 03f63f2
1 parent f6ad036
commit 03f63f2
Show file tree

Hide file tree

Showing 5 changed files with 327 additions and 14 deletions.
diff --git a/database/base.py b/database/base.py
@@ -192,7 +192,7 @@ def type_of_underground(cls) -> Mapped[VersionedBase]:  # noqa
     # class reference in abstract base class, with backreference to class name:
     @declared_attr
     def plan(cls) -> Mapped[VersionedBase]:  # noqa
-        return relationship("Plan", backref=f"{cls.__tablename__}s")
+        return relationship("Plan", back_populates=f"{cls.__tablename__}s")
 
     # class reference in abstract base class, with backreference to class name:
     @declared_attr

diff --git a/database/models.py b/database/models.py
@@ -115,6 +115,20 @@ class Plan(PlanBase):
     documents = relationship(
         "Document", back_populates="plan", lazy="joined", cascade="delete"
     )
+    # Load plan objects ordered
+    land_use_areas = relationship(
+        "LandUseArea", order_by="LandUseArea.ordering", back_populates="plan"
+    )
+    other_areas = relationship(
+        "OtherArea", order_by="OtherArea.ordering", back_populates="plan"
+    )
+    lines = relationship("Line", order_by="Line.ordering", back_populates="plan")
+    land_use_points = relationship(
+        "LandUsePoint", order_by="LandUsePoint.ordering", back_populates="plan"
+    )
+    other_points = relationship(
+        "OtherPoint", order_by="OtherPoint.ordering", back_populates="plan"
+    )
 
     permanent_plan_identifier: Mapped[Optional[str]]
     producers_plan_identifier: Mapped[Optional[str]]