fix tests and pr feedback

Signed-off-by: nayib-jose-gloria <ngloria@chanzuckerberg.com>
chanzuckerberg · Dec 5, 2022 · 8602a32 · 8602a32
1 parent 2e59b6a
commit 8602a32
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 99 deletions.
diff --git a/backend/layers/business/business.py b/backend/layers/business/business.py
@@ -341,7 +341,7 @@ def get_dataset_status(self, dataset_version_id: DatasetVersionId) -> DatasetSta
     def update_dataset_version_status(self, dataset_version_id: DatasetVersionId, status_key: DatasetStatusKey, new_dataset_status: DatasetStatusGeneric) -> None:
         """
         Updates the status of a dataset version. 
-        status_key can be one of: [upload_status, validation_status, cxg_status, rds_status, h5ad_status, processing_status]
+        status_key can be one of: [upload, validation, cxg, rds, h5ad, processing]
         """
         if status_key == DatasetStatusKey.UPLOAD and isinstance(new_dataset_status, DatasetUploadStatus):
             self.database_provider.update_dataset_upload_status(dataset_version_id, new_dataset_status)

diff --git a/backend/layers/common/entities.py b/backend/layers/common/entities.py
@@ -10,7 +10,7 @@
 # TODO: copy and paste the docs for these
 
 
-class DatasetStatusKey(Enum):
+class DatasetStatusKey(str, Enum):
     UPLOAD = "upload"
     VALIDATION = "validation"
     CXG = "cxg"
@@ -71,9 +71,6 @@ class DatasetStatus:
     def empty():
         return DatasetStatus(None, None, None, None, None, None)
 
-    def to_json(self):
-        return json.dumps(self, default=lambda obj: obj.__dict__)
-
 
 @dataclass(eq=True, frozen=True)
 class CollectionId:
@@ -150,9 +147,6 @@ class DatasetMetadata:
     is_primary_data: str
     x_approximate_distribution: str
 
-    def to_json(self):
-        return json.dumps(self, default=lambda obj: obj.__dict__)
-
 
 @dataclass
 class CanonicalDataset:
@@ -189,6 +183,7 @@ class CollectionMetadata:
     contact_email: str
     links: List[Link]
 
+
 @dataclass
 class CanonicalCollection:
     id: CollectionId
@@ -217,7 +212,7 @@ class CollectionVersionWithDatasets(CollectionVersionBase):
     datasets: List[DatasetVersion]
 
 
-class CollectionLinkType(Enum):
+class CollectionLinkType(str, Enum):
     DOI = "doi"
     RAW_DATA = "raw_data"
     PROTOCOL = "protocol"
@@ -226,7 +221,7 @@ class CollectionLinkType(Enum):
     DATA_SOURCE = "data_source"
 
 
-class DatasetArtifactType(Enum):
+class DatasetArtifactType(str, Enum):
     """
     Enumerates DatasetArtifact file types.
 

diff --git a/backend/layers/persistence/orm.py b/backend/layers/persistence/orm.py
@@ -11,6 +11,7 @@
 metadata = MetaData(schema="persistence_schema")
 mapper_registry = registry(metadata=metadata)
 
+
 @mapper_registry.mapped
 class Collection: