simplify serializer changes?

shapiromatron · Sep 21, 2023 · b52535d · b52535d
1 parent f57868e
commit b52535d
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 8 deletions.
diff --git a/client/hawc_client/summary.py b/client/hawc_client/summary.py
@@ -107,7 +107,6 @@ def create_datapivot(self, data: dict) -> dict:
                      presented. This setting may used for comparing
                      percent-response, where dose-units are not needed, or for
                      creating one plot similar, but not identical, dose-units.
-                - published_only (bool): Only present data from studies marked as "published" in HAWC.
                 - published (bool): datapivot is published for public view
                 - settings (str): JSON of object settings
                 - assessment (int): assessment ID
@@ -138,7 +137,6 @@ def update_datapivot(self, datapivot_id: int, data: dict) -> dict:
                      presented. This setting may used for comparing
                      percent-response, where dose-units are not needed, or for
                      creating one plot similar, but not identical, dose-units.
-                - published_only (bool): Only present data from studies marked as "published" in HAWC.
                 - published (bool): datapivot is published for public view
                 - settings (str): JSON of object settings
                 - assessment (int): assessment ID

diff --git a/hawc/apps/summary/serializers.py b/hawc/apps/summary/serializers.py
@@ -23,7 +23,6 @@ class DataPivotSerializer(serializers.ModelSerializer):
     url = serializers.CharField(source="get_absolute_url", read_only=True)
     data_url = serializers.CharField(source="get_data_url", read_only=True)
     download_url = serializers.CharField(source="get_download_url", read_only=True)
-    settings = serializers.JSONField()
 
     def to_representation(self, instance):
         ret = super().to_representation(instance)
@@ -56,11 +55,6 @@ class Meta:
 
 
 class VisualSerializer(serializers.ModelSerializer):
-    url = serializers.CharField(source="get_absolute_url", read_only=True)
-    data_url = serializers.CharField(source="get_data_url", read_only=True)
-    slug = serializers.CharField(write_only=True)
-    prefilters = serializers.JSONField(write_only=True)
-
     def validate(self, data):
         try:
             data["prefilters"] = (

diff --git a/tests/data/api/api-visual-bioassay-aggregation.json b/tests/data/api/api-visual-bioassay-aggregation.json
@@ -362,8 +362,10 @@
   ],
   "id": 10,
   "last_updated": "2020-11-25T13:35:00.094667-05:00",
+  "prefilters": {},
   "published": true,
   "settings": {},
+  "slug": "bioassay-aggregation",
   "sort_order": "short_citation",
   "studies": [],
   "title": "bioassay-aggregation",

diff --git a/tests/data/api/api-visual-crossview.json b/tests/data/api/api-visual-crossview.json
@@ -3247,6 +3247,9 @@
   ],
   "id": 4,
   "last_updated": "2020-05-08T15:37:19.255730-04:00",
+  "prefilters": {
+    "published_only": true
+  },
   "published": true,
   "settings": {
     "colorBase": "#cccccc",
@@ -3328,6 +3331,7 @@
     "ylabel_x": 0,
     "ylabel_y": 0
   },
+  "slug": "crossview",
   "sort_order": "short_citation",
   "studies": [],
   "title": "crossview",

diff --git a/tests/data/api/api-visual-embedded-tableau.json b/tests/data/api/api-visual-embedded-tableau.json
@@ -9,6 +9,7 @@
   "endpoints": [],
   "id": 7,
   "last_updated": "2020-05-08T15:45:29.985848-04:00",
+  "prefilters": {},
   "published": true,
   "settings": {
     "external_url": "https://public.tableau.com/views/Iris_15675445278420/Iris-Actual",
@@ -20,6 +21,7 @@
     ],
     "filters": []
   },
+  "slug": "embedded-tableau",
   "sort_order": "short_citation",
   "studies": [],
   "title": "embedded-tableau",

diff --git a/tests/data/api/api-visual-exploratory-heatmap.json b/tests/data/api/api-visual-exploratory-heatmap.json
@@ -9,6 +9,7 @@
   "endpoints": [],
   "id": 8,
   "last_updated": "2020-11-25T09:29:33.991892-05:00",
+  "prefilters": {},
   "published": true,
   "settings": {
     "autorotate_tick_labels": true,
@@ -118,6 +119,7 @@
     },
     "y_tick_rotate": -90
   },
+  "slug": "exploratory-heatmap",
   "sort_order": "short_citation",
   "studies": [],
   "title": "exploratory-heatmap",

diff --git a/tests/data/api/api-visual-rob-barchart.json b/tests/data/api/api-visual-rob-barchart.json
@@ -9,6 +9,11 @@
   "endpoints": [],
   "id": 5,
   "last_updated": "2020-05-08T15:38:48.445082-04:00",
+  "prefilters": {
+    "studies": [
+      7
+    ]
+  },
   "published": true,
   "rob_settings": {
     "assessment_id": 2,
@@ -189,6 +194,7 @@
     "xAxisLabel": "Percent of studies",
     "yAxisLabel": ""
   },
+  "slug": "rob-barchart",
   "sort_order": "short_citation",
   "studies": [
     {

diff --git a/tests/data/api/api-visual-rob-heatmap.json b/tests/data/api/api-visual-rob-heatmap.json
@@ -9,6 +9,11 @@
   "endpoints": [],
   "id": 3,
   "last_updated": "2020-05-08T15:36:41.324440-04:00",
+  "prefilters": {
+    "studies": [
+      7
+    ]
+  },
   "published": true,
   "rob_settings": {
     "assessment_id": 2,
@@ -191,6 +196,7 @@
     "x_field": "study",
     "yAxisLabel": ""
   },
+  "slug": "rob-heatmap",
   "sort_order": "short_citation",
   "studies": [
     {

diff --git a/tests/data/api/api-visual-tagtree.json b/tests/data/api/api-visual-tagtree.json
@@ -9,6 +9,7 @@
   "endpoints": [],
   "id": 6,
   "last_updated": "2020-05-08T15:43:09.448621-04:00",
+  "prefilters": {},
   "published": true,
   "settings": {
     "height": 500,
@@ -20,6 +21,7 @@
     "show_legend": true,
     "width": 1280
   },
+  "slug": "tagtree",
   "sort_order": "short_citation",
   "studies": [],
   "title": "tagtree",