address review comments

bento-platform · Sep 30, 2024 · e5a3a8e · e5a3a8e
1 parent 0715010
commit e5a3a8e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/chord_metadata_service/chord/tests/test_api.py b/chord_metadata_service/chord/tests/test_api.py
@@ -192,15 +192,25 @@ def test_dats_as_attachment(self):
         self.assertEqual(r.status_code, status.HTTP_201_CREATED)
         dataset_id = Dataset.objects.first().identifier
 
-        response = self.client.get(f"/api/datasets/{dataset_id}/dats?attachment=true")
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertDictEqual(response.data, payload['dats_file'])
-        self.assertEqual(response.headers["Content-Disposition"], f"attachment; filename=\"{dataset_id}_dats.json\"")
+        subtest_params = [
+            ("?attachment=true", True),
+            ("?attachment=false", False),
+            ("?attachment=", False),
+            ("", False),
+        ]
 
-        response = self.client.get(f"/api/datasets/{dataset_id}/dats?attachment=false")
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertDictEqual(response.data, payload['dats_file'])
-        self.assertNotIn("Content-Disposition", response.headers)
+        for params in subtest_params:
+            with self.subTest(params=params):
+                response = self.client.get(f"/api/datasets/{dataset_id}/dats{params[0]}")
+                self.assertEqual(response.status_code, status.HTTP_200_OK)
+                self.assertDictEqual(response.data, payload['dats_file'])
+                if params[1]:
+                    self.assertEqual(
+                        response.headers["Content-Disposition"],
+                        f"attachment; filename=\"{dataset_id}_dats.json\""
+                    )
+                else:
+                    self.assertNotIn("Content-Disposition", response.headers)
 
     def test_resources(self):
         resource = {

diff --git a/chord_metadata_service/restapi/utils.py b/chord_metadata_service/restapi/utils.py
@@ -11,8 +11,6 @@
 from chord_metadata_service.phenopackets.models import Biosample
 
 __all__ = [
-    "COMPUTED_PROPERTY_PREFIX",
-    "camel_case_field_names",
     "transform_keys",
     "computed_property",
     "remove_computed_properties",
@@ -25,6 +23,7 @@
 
 
 COMPUTED_PROPERTY_PREFIX = "__"
+FILENAME_REPLACE_PATTERN = re.compile(r"[\\/:*?\"<>|]")
 
 
 def camel_case_field_names(string) -> str:
@@ -117,9 +116,6 @@ def response_as_attachment(request: DrfRequest) -> bool:
     return request.query_params.get("attachment", "").strip().lower() in ("1", "true", "yes")
 
 
-FILENAME_REPLACE_PATTERN = re.compile(r"[\\/:*?\"<>|]")
-
-
 def attachment_content_disposition(filename: str) -> dict[str, str]:
     filename_safe = FILENAME_REPLACE_PATTERN.sub("_", filename)
     return {"Content-Disposition": f"attachment; filename=\"{filename_safe}\""}