Feature/pdct 1527 make schema migration to add event metadata into event sub (#68)

* Add event metadata field

* Bump to 3.8.20

* Remove old code

* Update _event sub taxonomy key

* Bump to 3.8.21

Author: katybaulch

db_client/functions/metadata.py

@@ -150,21 +150,11 @@ def build_valid_taxonomy(
 
     taxonomy_entries: Mapping[str, TaxonomyEntry] = {}
 
-    # TODO: Remove as part of PDCT-1435.
-    if (
-        all(
-            k in ["allow_any", "allow_blanks", "allowed_values"]
-            for k in list(taxonomy.keys())
-        )
-        and metadata is not None
-        and list(metadata.keys()) == [EntitySpecificTaxonomyKeys.EVENT.value]
-    ):
-        taxonomy_entries[EntitySpecificTaxonomyKeys.EVENT.value] = TaxonomyEntry(
-            **taxonomy
-        )
-        return taxonomy_entries
-
     for key, values in taxonomy.items():
+        # TODO: Can we do extra validation of the taxonomy here - e.g., compare the
+        # metadata datetime_event_name value against the list of allowed event types in
+        # the taxonomy. In fact - split any conditionals under this for loop into a
+        # separate validate_taxonomy function that we can isolate to test against.
         if not isinstance(values, dict):
             raise TypeError(f"Taxonomy entry for '{key}' is not a dictionary")
 

db_client/models/dfce/taxonomy_entry.py

@@ -30,7 +30,7 @@ class EntitySpecificTaxonomyKeys(str, Enum):
     """The entity specific taxonomy keys."""
 
     DOCUMENT = "_document"
-    EVENT = "event_type"
+    EVENT = "_event"
 
 
 @pydantic_dataclass(config=ConfigDict(validate_assignment=True, extra="forbid"))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "db-client"
-version = "3.8.20"
+version = "3.8.21"
 description = "All things to do with the datamodel and its storage. Including alembic migrations and datamodel code."
 authors = ["CPR-dev-team <[email protected]>"]
 license = "Apache-2.0"