Merge pull request #699 from NHSDigital/11559-benign-lumps-model-demo-data

Add BenignLumpHistoryItem

Author: malcolmbaig

manage_breast_screening/data/east_tester_one_week_ago_clinic_data.yml

@@ -71,6 +71,7 @@ clinic:
               systemic_treatments: NO_RADIOTHERAPY
               intervention_location: NHS_HOSPITAL
               intervention_location_details: East Tester Hospital
+
     - id: c19bf83e-a1b5-4374-a84d-ab29d24e995d
       duration_in_minutes: 8
       starts_at_time: 09:16

manage_breast_screening/data/east_tester_today_clinic_data.yml

@@ -55,6 +55,14 @@ clinic:
               procedure_details: Lorem ipsum dolor sit amet
               procedure_year: 2018
               additional_details: No complications
+          benign_lump_history_items:
+            - id: 271E4B10-BBB2-4FCD-A777-5CE7E9411FEC
+              right_breast_procedures: [NEEDLE_BIOPSY, LUMP_REMOVED]
+              left_breast_procedures: [LUMP_REMOVED]
+              procedure_year: 2005
+              procedure_location: NHS_HOSPITAL
+              procedure_location_details: East Tester Hospital
+              additional_details: Lorem ipsum dolor sit amet
     - id: aa1b4c5c-3742-4f97-aa68-04a6f3bd631b
       duration_in_minutes: 8
       starts_at_time: 09:08

manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja

@@ -60,6 +60,11 @@
   {% set non_cancerous_lump_diagnosis_link %}
   <a class="nhsuk-link" href="#">Enter non-cancerous lump diagnosis</a>
   {% endset %}
+  {% set benign_lump_history_html %}
+    {% for presented_item in presenter.benign_lump_history %}
+      {{ summaryList(presented_item.summary_list_params) }}
+    {% endfor %}
+  {% endset %}
   {% set chest_procedures_link %}
   <a class="nhsuk-link" href="#">Enter other breast or chest procedures</a>
   {% endset %}
@@ -109,6 +114,17 @@
           "items": []
        }
      },
+     {
+       "key": {
+         "text": "Benign lump history"
+       },
+       "value": {
+         "html": benign_lump_history_html
+       },
+       "actions": {
+          "items": []
+       }
+     },
      {
        "key": {
          "text": "Non-cancerous lump diagnosis"

manage_breast_screening/mammograms/presenters/benign_lump_history_item_presenter.py

@@ -0,0 +1,55 @@
+from manage_breast_screening.core.template_helpers import multiline_content, nl2br
+from manage_breast_screening.participants.models.benign_lump_history_item import (
+    BenignLumpHistoryItem,
+)
+
+
+class BenignLumpHistoryItemPresenter:
+    def __init__(self, benign_lump_history_item):
+        self._item = benign_lump_history_item
+        self.right_breast_procedures = self._format_multiple_choices(
+            self._item.right_breast_procedures, BenignLumpHistoryItem.Procedure
+        )
+        self.left_breast_procedures = self._format_multiple_choices(
+            self._item.left_breast_procedures, BenignLumpHistoryItem.Procedure
+        )
+        self.procedure_year = str(self._item.procedure_year)
+        self.procedure_location = self._item.get_procedure_location_display()
+        self.procedure_location_details = self._item.procedure_location_details
+        self.additional_details = nl2br(self._item.additional_details)
+
+    @property
+    def summary_list_params(self):
+        # This is a placeholder until we have a properly formatted table.
+        return {
+            "rows": [
+                {
+                    "key": {"text": "Procedures"},
+                    "value": {
+                        "html": multiline_content(
+                            [
+                                f"Right breast: {self.right_breast_procedures}",
+                                f"Left breast: {self.left_breast_procedures}",
+                            ]
+                        )
+                    },
+                },
+                {
+                    "key": {"text": "Procedure year"},
+                    "value": {"html": self.procedure_year},
+                },
+                {
+                    "key": {"text": "Procedure location"},
+                    "value": {
+                        "html": f"{self.procedure_location}: {self.procedure_location_details}"
+                    },
+                },
+                {
+                    "key": {"text": "Additional details"},
+                    "value": {"html": self.additional_details},
+                },
+            ],
+        }
+
+    def _format_multiple_choices(self, choices, ChoiceClass):
+        return ", ".join(ChoiceClass(choice).label for choice in choices)

manage_breast_screening/mammograms/presenters/medical_information_presenter.py

@@ -1,5 +1,8 @@
 from django.urls import reverse
 
+from manage_breast_screening.mammograms.presenters.benign_lump_history_item_presenter import (
+    BenignLumpHistoryItemPresenter,
+)
 from manage_breast_screening.mammograms.presenters.breast_augmentation_history_item_presenter import (
     BreastAugmentationHistoryItemPresenter,
 )
@@ -43,6 +46,10 @@ def __init__(self, appointment):
             OtherProcedureHistoryItemPresenter(item)
             for item in appointment.other_procedure_history_items.all()
         ]
+        self.benign_lump_history = [
+            BenignLumpHistoryItemPresenter(item)
+            for item in appointment.benign_lump_history_items.all()
+        ]
         self.existing_symptom_type_ids = {
             symptom.symptom_type_id for symptom in symptoms
         }

manage_breast_screening/mammograms/tests/presenters/test_benign_lump_history_item_presenter.py

@@ -0,0 +1,54 @@
+from manage_breast_screening.mammograms.presenters.benign_lump_history_item_presenter import (
+    BenignLumpHistoryItemPresenter,
+)
+from manage_breast_screening.participants.models.benign_lump_history_item import (
+    BenignLumpHistoryItem,
+)
+from manage_breast_screening.participants.tests.factories import (
+    BenignLumpHistoryItemFactory,
+)
+
+
+class TestBenignLumpHistoryItemPresenter:
+    def test_summary_list_params(self):
+        item = BenignLumpHistoryItemFactory.build(
+            right_breast_procedures=[
+                BenignLumpHistoryItem.Procedure.NEEDLE_BIOPSY,
+                BenignLumpHistoryItem.Procedure.LUMP_REMOVED,
+            ],
+            left_breast_procedures=[BenignLumpHistoryItem.Procedure.NO_PROCEDURES],
+            procedure_year=2015,
+            procedure_location=BenignLumpHistoryItem.ProcedureLocation.PRIVATE_CLINIC_UK,
+            procedure_location_details="Harley Street Clinic",
+            additional_details="First line\nSecond line",
+        )
+
+        presenter = BenignLumpHistoryItemPresenter(item)
+
+        assert presenter.summary_list_params == {
+            "rows": [
+                {
+                    "key": {"text": "Procedures"},
+                    "value": {
+                        "html": (
+                            "Right breast: Needle biopsy, Lump removed<br>"
+                            "Left breast: No procedures"
+                        )
+                    },
+                },
+                {
+                    "key": {"text": "Procedure year"},
+                    "value": {"html": "2015"},
+                },
+                {
+                    "key": {"text": "Procedure location"},
+                    "value": {
+                        "html": ("At a private clinic in the UK: Harley Street Clinic")
+                    },
+                },
+                {
+                    "key": {"text": "Additional details"},
+                    "value": {"html": "First line<br>Second line"},
+                },
+            ],
+        }

manage_breast_screening/nonprod/management/commands/seed_demo_data.py

@@ -23,6 +23,7 @@
 from manage_breast_screening.participants.models import (
     Appointment,
     AppointmentStatus,
+    BenignLumpHistoryItem,
     BreastAugmentationHistoryItem,
     BreastCancerHistoryItem,
     ImplantedMedicalDeviceHistoryItem,
@@ -36,6 +37,7 @@
 from manage_breast_screening.participants.tests.factories import (
     AppointmentFactory,
     AppointmentStatusFactory,
+    BenignLumpHistoryItemFactory,
     BreastAugmentationHistoryItemFactory,
     BreastCancerHistoryItemFactory,
     ImplantedMedicalDeviceHistoryItemFactory,
@@ -198,6 +200,11 @@ def create_medical_information(self, appointment, medical_information_key):
                 appointment, implanted_medical_device_history_item
             )
 
+        for benign_lump_history_item in medical_information_key.get(
+            "benign_lump_history_items", []
+        ):
+            self.create_benign_lump_history_item(appointment, benign_lump_history_item)
+
         for breast_augmentation_history_item in medical_information_key.get(
             "breast_augmentation_history_items", []
         ):
@@ -236,6 +243,11 @@ def create_other_procedure_history_item(
             appointment=appointment, **other_procedure_history_item
         )
 
+    def create_benign_lump_history_item(self, appointment, benign_lump_history_item):
+        BenignLumpHistoryItemFactory(
+            appointment=appointment, **benign_lump_history_item
+        )
+
     def create_participant(self, **participant_key):
         address_key = participant_key.pop("address", None)
         previous_mammograms_key = participant_key.pop("previous_mammograms", [])
@@ -275,6 +287,7 @@ def reset_db(self):
         BreastCancerHistoryItem.objects.all().delete()
         ImplantedMedicalDeviceHistoryItem.objects.all().delete()
         OtherProcedureHistoryItem.objects.all().delete()
+        BenignLumpHistoryItem.objects.all().delete()
         AppointmentStatus.objects.all().delete()
         Appointment.objects.all().delete()
         ParticipantReportedMammogram.objects.all().delete()

manage_breast_screening/participants/migrations/0038_benignlumphistoryitem.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.2.7 on 2025-11-11 13:56
+
+import django.contrib.postgres.fields
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('participants', '0037_otherprocedurehistoryitem'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BenignLumpHistoryItem',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('right_breast_procedures', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(choices=[('NEEDLE_BIOPSY', 'Needle biopsy'), ('LUMP_REMOVED', 'Lump removed'), ('NO_PROCEDURES', 'No procedures')]), default=list, size=None)),
+                ('left_breast_procedures', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(choices=[('NEEDLE_BIOPSY', 'Needle biopsy'), ('LUMP_REMOVED', 'Lump removed'), ('NO_PROCEDURES', 'No procedures')]), default=list, size=None)),
+                ('procedure_year', models.IntegerField(null=True)),
+                ('procedure_location', models.CharField(choices=[('NHS_HOSPITAL', 'At an NHS hospital'), ('PRIVATE_CLINIC_UK', 'At a private clinic in the UK'), ('OUTSIDE_UK', 'Outside the UK'), ('MULTIPLE_LOCATIONS', 'In multiple locations'), ('EXACT_LOCATION_UNKNOWN', 'Exact location unknown')])),
+                ('procedure_location_details', models.CharField(blank=True, default='')),
+                ('additional_details', models.TextField(blank=True, default='')),
+                ('appointment', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='benign_lump_history_items', to='participants.appointment')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

manage_breast_screening/participants/models/__init__.py

@@ -1,4 +1,5 @@
 from .appointment import Appointment, AppointmentStatus
+from .benign_lump_history_item import BenignLumpHistoryItem
 from .breast_augmentation_history_item import BreastAugmentationHistoryItem
 from .breast_cancer_history_item import BreastCancerHistoryItem
 from .ethnicity import Ethnicity
@@ -12,6 +13,7 @@
 __all__ = [
     "Appointment",
     "AppointmentStatus",
+    "BenignLumpHistoryItem",
     "BreastAugmentationHistoryItem",
     "BreastCancerHistoryItem",
     "ImplantedMedicalDeviceHistoryItem",

manage_breast_screening/participants/models/benign_lump_history_item.py

@@ -0,0 +1,37 @@
+from django.contrib.postgres.fields import ArrayField
+from django.db import models
+
+from ...core.models import BaseModel
+from .appointment import Appointment
+
+
+class BenignLumpHistoryItem(BaseModel):
+    class Procedure(models.TextChoices):
+        NEEDLE_BIOPSY = "NEEDLE_BIOPSY", "Needle biopsy"
+        LUMP_REMOVED = "LUMP_REMOVED", "Lump removed"
+        NO_PROCEDURES = "NO_PROCEDURES", "No procedures"
+
+    class ProcedureLocation(models.TextChoices):
+        NHS_HOSPITAL = "NHS_HOSPITAL", "At an NHS hospital"
+        PRIVATE_CLINIC_UK = "PRIVATE_CLINIC_UK", "At a private clinic in the UK"
+        OUTSIDE_UK = "OUTSIDE_UK", "Outside the UK"
+        MULTIPLE_LOCATIONS = "MULTIPLE_LOCATIONS", "In multiple locations"
+        EXACT_LOCATION_UNKNOWN = "EXACT_LOCATION_UNKNOWN", "Exact location unknown"
+
+    appointment = models.ForeignKey(
+        Appointment,
+        on_delete=models.PROTECT,
+        related_name="benign_lump_history_items",
+    )
+    right_breast_procedures = ArrayField(
+        base_field=models.CharField(choices=Procedure),
+        default=list,
+    )
+    left_breast_procedures = ArrayField(
+        base_field=models.CharField(choices=Procedure),
+        default=list,
+    )
+    procedure_year = models.IntegerField(null=True)
+    procedure_location = models.CharField(choices=ProcedureLocation)
+    procedure_location_details = models.CharField(blank=True, null=False, default="")
+    additional_details = models.TextField(blank=True, null=False, default="")