Fix issue when syncing with new child definitions (#571)

Author: PGijsbers

docker-compose.dev.yaml

@@ -53,3 +53,8 @@ services:
   es_logstash_setup:
     volumes:
       - ./src:/app:ro
+
+  taxonomy:
+    stdin_open: true
+    volumes:
+       - ./src:/app:ro

src/database/model/named_relation.py

@@ -69,13 +69,17 @@ def create_taxonomy(class_name: str, table_name: str) -> type[Taxonomy]:
             int | None,
             Field(foreign_key=f"{table_name}.identifier", default=None, nullable=True),
         ),
+        parent=(
+            ForwardRef(class_name) | None,
+            Relationship(
+                back_populates="children",
+                sa_relationship_kwargs=dict(remote_side=f"{class_name}.identifier"),
+            ),
+        ),
         children=(
             List[ForwardRef(class_name)],  # type: ignore
             Relationship(
-                sa_relationship_kwargs=dict(
-                    cascade="all",
-                    backref=backref("parent", remote_side=f"{class_name}.identifier"),
-                )
+                back_populates="parent",
             ),
         ),
     )

src/taxonomies/synchronize_taxonomy.py

@@ -104,11 +104,17 @@ def synchronize_term(term: Taxonomy):
             term_object.official = True
             term_object.children = synchronized_children
             return term_object
+
         if term.name not in added_terms:
             logging.info(f"Adding new term {term.name!r}")
+            if term.parent is not None and (
+                parent := db_definitions.get(term.parent.name.casefold())
+            ):
+                term.parent = parent
             added_terms[term.name] = term
             session.add(term)
             return term
+
         logging.warning(f"Term {term.name!r} defined more than once!")
         return added_terms[term.name]