Update SavedDatasetColumns to include recordType and update pytest constants and tests to match

Author: davereinhart

src/mavedb/view_models/score_set_dataset_columns.py

@@ -46,7 +46,9 @@ def validate_dataset_columns_metadata_keys(self) -> Self:
         return self
 
 class SavedDatasetColumns(DatasetColumnsBase):
-    pass
+    record_type: str = None # type: ignore
+
+    _record_type_factory = record_type_validator()(set_record_type)
 
 class DatasetColumns(SavedDatasetColumns):
     pass

tests/helpers/constants.py

@@ -693,6 +693,12 @@
     "active": TEST_INACTIVE_LICENSE["active"],
 }
 
+SAVED_SHORT_DATASET_COLUMNS = {
+    "recordType": "DatasetColumns",
+    "countColumns": [],
+    "scoreColumns": ["score"],
+}
+
 TEST_SEQ_SCORESET = {
     "title": "Test Score Set Title",
     "short_description": "Test score set",
@@ -805,7 +811,9 @@
     "doiIdentifiers": [],
     "primaryPublicationIdentifiers": [],
     "secondaryPublicationIdentifiers": [],
-    "datasetColumns": {},
+    "datasetColumns": {
+        "recordType": "DatasetColumns",
+    },
     "externalLinks": {},
     "private": True,
     "experiment": TEST_MINIMAL_EXPERIMENT_RESPONSE,
@@ -920,7 +928,9 @@
     "doiIdentifiers": [],
     "primaryPublicationIdentifiers": [],
     "secondaryPublicationIdentifiers": [],
-    "datasetColumns": {},
+    "datasetColumns": {
+        "recordType": "DatasetColumns",
+    },
     "private": True,
     "experiment": TEST_MINIMAL_EXPERIMENT_RESPONSE,
     # keys to be set after receiving response
@@ -1060,7 +1070,9 @@
     "doiIdentifiers": [],
     "primaryPublicationIdentifiers": [],
     "secondaryPublicationIdentifiers": [],
-    "datasetColumns": {},
+    "datasetColumns": {
+        "recordType": "DatasetColumns",
+    },
     "externalLinks": {},
     "private": True,
     "experiment": TEST_MINIMAL_EXPERIMENT_RESPONSE,

tests/routers/test_score_set.py

@@ -29,6 +29,7 @@
 from tests.helpers.constants import (
     EXTRA_USER,
     EXTRA_LICENSE,
+    SAVED_SHORT_DATASET_COLUMNS,
     TEST_CROSSREF_IDENTIFIER,
     TEST_MAPPED_VARIANT_WITH_HGVS_G_EXPRESSION,
     TEST_MAPPED_VARIANT_WITH_HGVS_P_EXPRESSION,
@@ -414,6 +415,7 @@ def test_can_update_score_set_data_before_publication(
         ("secondary_publication_identifiers", [{"identifier": TEST_PUBMED_IDENTIFIER}], [SAVED_PUBMED_PUBLICATION]),
         ("doi_identifiers", [{"identifier": TEST_CROSSREF_IDENTIFIER}], [SAVED_DOI_IDENTIFIER]),
         ("license_id", EXTRA_LICENSE["id"], SAVED_SHORT_EXTRA_LICENSE),
+        ("dataset_columns", {"countColumns": [], "scoreColumns": ["score"]}, SAVED_SHORT_DATASET_COLUMNS)
     ],
 )
 @pytest.mark.parametrize(
@@ -455,7 +457,7 @@ def test_can_update_score_set_supporting_data_after_publication(
             "publishedDate": date.today().isoformat(),
             "numVariants": 3,
             "private": False,
-            "datasetColumns": {"countColumns": [], "scoreColumns": ["score"]},
+            "datasetColumns": {"recordType": "DatasetColumns", "countColumns": [], "scoreColumns": ["score"]},
             "processingState": ProcessingState.success.name,
         }
     )