CDD-2371: refactor y_axis to use DecimalField

UKHSA-Internal · Jan 8, 2025 · 938b5de · 938b5de
1 parent cf13241
commit 938b5de
Show file tree

Hide file tree

Showing 6 changed files with 1,951 additions and 10 deletions.
diff --git a/cms/dynamic_content/cards.py b/cms/dynamic_content/cards.py
@@ -159,12 +159,12 @@ class SimplifiedChartWithLink(blocks.StructBlock):
         default="",
         help_text=help_texts.CHART_Y_AXIS_TITLE,
     )
-    y_axis_minimum_value = blocks.IntegerBlock(
+    y_axis_minimum_value = blocks.DecimalBlock(
         required=False,
         default=0,
         help_text=help_texts.CHART_Y_AXIS_MINIMUM_VALUE,
     )
-    y_axis_maximum_value = blocks.IntegerBlock(
+    y_axis_maximum_value = blocks.DecimalBlock(
         required=False,
         help_text=help_texts.CHART_Y_AXIS_MAXIMUM_VALUE,
     )

diff --git a/cms/home/migrations/0016_add_chart_y_axis_min_and_max_values.py b/cms/home/migrations/0016_add_chart_y_axis_min_and_max_values.py
diff --git a/cms/topic/migrations/0015_add_chart_y_axis_min_and_max_values.py b/cms/topic/migrations/0015_add_chart_y_axis_min_and_max_values.py
diff --git a/metrics/api/serializers/charts.py b/metrics/api/serializers/charts.py
@@ -117,17 +117,21 @@ class ChartsSerializer(serializers.Serializer):
         default="",
         help_text=help_texts.CHART_Y_AXIS_TITLE,
     )
-    y_axis_minimum_value = serializers.IntegerField(
+    y_axis_minimum_value = serializers.DecimalField(
         required=False,
         allow_null=True,
         help_text=help_texts.CHART_Y_AXIS_MINIMUM_VALUE,
         default=None,
+        max_digits=10,
+        decimal_places=1,
     )
-    y_axis_maximum_value = serializers.IntegerField(
+    y_axis_maximum_value = serializers.DecimalField(
         required=False,
         allow_null=True,
         help_text=help_texts.CHART_Y_AXIS_MAXIMUM_VALUE,
         default=None,
+        max_digits=10,
+        decimal_places=1,
     )
 
     plots = ChartPlotsListSerializer()

diff --git a/metrics/domain/charts/chart_settings.py b/metrics/domain/charts/chart_settings.py
@@ -31,11 +31,11 @@ def height(self) -> int:
         return self._chart_generation_payload.chart_height
 
     @property
-    def y_axis_minimum_value(self) -> int | None:
+    def y_axis_minimum_value(self) -> int | Decimal:
         return self._chart_generation_payload.y_axis_minimum_value
 
     @property
-    def y_axis_maximum_value(self) -> int | None:
+    def y_axis_maximum_value(self) -> int | Decimal | None:
         return self._chart_generation_payload.y_axis_maximum_value
 
     @staticmethod

diff --git a/metrics/domain/models/plots.py b/metrics/domain/models/plots.py
@@ -1,4 +1,5 @@
 import datetime
+from decimal import Decimal
 from typing import Literal, Self
 
 from dateutil.relativedelta import relativedelta
@@ -162,8 +163,8 @@ class ChartRequestParams(BaseModel):
     x_axis_title: str = ""
     y_axis: str
     y_axis_title: str = ""
-    y_axis_minimum_value: int = 0
-    y_axis_maximum_value: int | None = None
+    y_axis_minimum_value: Decimal = 0
+    y_axis_maximum_value: Decimal | None = None
 
 
 class NoReportingDelayPeriodFoundError(Exception): ...
@@ -244,8 +245,8 @@ class ChartGenerationPayload(BaseModel):
     chart_height: int
     x_axis_title: str
     y_axis_title: str
-    y_axis_minimum_value: int = 0
-    y_axis_maximum_value: int | None = None
+    y_axis_minimum_value: Decimal = 0
+    y_axis_maximum_value: Decimal | None = None
 
 
 class CompletePlotData(BaseModel):