Merge pull request #448 from NHSDigital/dtos-10724-fix-other-area

[DTOS-10724] fix a few formatting issues in the symptom summary list

Author: MatMoore

manage_breast_screening/mammograms/presenters/medical_information_presenter.py

@@ -4,7 +4,11 @@
 
 from manage_breast_screening.core.template_helpers import multiline_content
 from manage_breast_screening.core.utils.date_formatting import format_approximate_date
-from manage_breast_screening.participants.models.symptom import SymptomType
+from manage_breast_screening.participants.models.symptom import (
+    RelativeDateChoices,
+    SymptomAreas,
+    SymptomType,
+)
 
 from .appointment_presenters import AppointmentPresenter
 
@@ -23,10 +27,34 @@ class PresentedSymptom:
     stopped_line: str = ""
     additional_information_line: str = ""
 
+    @staticmethod
+    def _present_symptom_area(symptom):
+        if symptom.area == SymptomAreas.OTHER and symptom.area_description:
+            location = f"Other: {symptom.area_description}"
+        else:
+            location = symptom.get_area_display()
+        return location
+
+    @staticmethod
+    def _present_started(symptom):
+        match symptom.when_started:
+            case RelativeDateChoices.SINCE_A_SPECIFIC_DATE:
+                if symptom.year_started is None or symptom.month_started is None:
+                    # Shouldn't happen unless there is a bug in data entry
+                    return "Since a specific date"
+
+                return format_approximate_date(
+                    symptom.year_started, symptom.month_started
+                )
+            case RelativeDateChoices.NOT_SURE:
+                return "Not sure"
+            case _:
+                return symptom.get_when_started_display() + " ago"
+
     @classmethod
     def from_symptom(cls, symptom):
-        location = symptom.get_area_display()
-        started = symptom.get_when_started_display()
+        location = cls._present_symptom_area(symptom)
+        started = cls._present_started(symptom)
         if symptom.year_started is not None and symptom.month_started is not None:
             started = format_approximate_date(
                 symptom.year_started, symptom.month_started

manage_breast_screening/mammograms/tests/presenters/test_medical_information_presenter.py

@@ -43,7 +43,29 @@ def test_presents_symptoms_with_area(self, area, expected_location):
                 symptom_type_id="LUMP",
                 symptom_type_name="Lump",
                 location_line=expected_location,
-                started_line="Less than 3 months",
+                started_line="Less than 3 months ago",
+                investigated_line="Not investigated",
+            ),
+        ]
+
+    def test_formats_area(self):
+        symptom = SymptomFactory.create(
+            lump=True,
+            when_started=RelativeDateChoices.LESS_THAN_THREE_MONTHS,
+            area=SymptomAreas.OTHER,
+            area_description="abc",
+        )
+
+        presenter = MedicalInformationPresenter(symptom.appointment)
+
+        assert presenter.symptoms == [
+            PresentedSymptom(
+                id=symptom.id,
+                appointment_id=symptom.appointment_id,
+                symptom_type_id="lump",
+                symptom_type_name="Lump",
+                location_line="Other: abc",
+                started_line="Less than 3 months ago",
                 investigated_line="Not investigated",
             )
         ]
@@ -201,7 +223,7 @@ def test_formats_for_summary_list(self):
                     "text": "Swelling or shape change",
                 },
                 "value": {
-                    "html": "Both breasts<br>Less than 3 months<br>Not investigated",
+                    "html": "Both breasts<br>Less than 3 months ago<br>Not investigated",
                 },
             },
         ]