Merge pull request #400 from NHSDigital/dtoss-10724-model-improvements

[DTOSS-10724] small model fixes

Author: MatMoore

manage_breast_screening/participants/migrations/0025_alter_symptom_investigated_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.5 on 2025-09-15 16:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('participants', '0024_remove_symptom_participant'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='symptom',
+            name='investigated',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='symptom',
+            name='when_started',
+            field=models.CharField(blank=True, choices=[('LESS_THAN_THREE_MONTHS', 'Less than 3 months'), ('THREE MONTHS TO A YEAR', '3 months to a year'), ('ONE_TO_THREE_YEARS', '1 to 3 years'), ('OVER_THREE_YEARS', 'Over 3 years'), ('SINCE_A_SPECIFIC_DATE', 'Since a specific date'), ('NOT_SURE', 'Not sure')]),
+        ),
+    ]

manage_breast_screening/participants/migrations/0026_symptom_investigation_details.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.5 on 2025-09-16 10:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('participants', '0025_alter_symptom_investigated_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='symptom',
+            name='investigation_details',
+            field=models.CharField(blank=True),
+        ),
+    ]

manage_breast_screening/participants/models/__init__.py

@@ -3,7 +3,7 @@
 from .participant import Participant, ParticipantAddress
 from .reported_mammograms import ParticipantReportedMammogram, SupportReasons
 from .screening_episode import ScreeningEpisode
-from .symptoms import Symptom, SymptomAreas, SymptomSubType, SymptomType
+from .symptom import Symptom, SymptomAreas, SymptomSubType, SymptomType
 
 __all__ = [
     "Appointment",

…creening/participants/models/symptoms.py …screening/participants/models/symptom.pymanage_breast_screening/participants/models/symptoms.py renamed to manage_breast_screening/participants/models/symptom.py manage_breast_screening/participants/models/symptoms.py renamed to manage_breast_screening/participants/models/symptom.py

@@ -26,6 +26,15 @@ class SymptomAreas(models.TextChoices):
     OTHER = ("OTHER", "Other")
 
 
+class RelativeDateChoices(models.TextChoices):
+    LESS_THAN_THREE_MONTHS = "LESS_THAN_THREE_MONTHS", "Less than 3 months"
+    THREE_MONTHS_TO_A_YEAR = "THREE MONTHS TO A YEAR", "3 months to a year"
+    ONE_TO_THREE_YEARS = "ONE_TO_THREE_YEARS", "1 to 3 years"
+    OVER_THREE_YEARS = "OVER_THREE_YEARS", "Over 3 years"
+    SINCE_A_SPECIFIC_DATE = "SINCE_A_SPECIFIC_DATE", "Since a specific date"
+    NOT_SURE = "NOT_SURE", "Not sure"
+
+
 class Symptom(BaseModel):
     symptom_type = models.ForeignKey(SymptomType, on_delete=models.PROTECT)
     symptom_sub_type = models.ForeignKey(
@@ -42,10 +51,11 @@ class Symptom(BaseModel):
     area_description = models.CharField(blank=True, null=False)
 
     # Has the symptom been investigated already?
-    investigated = models.BooleanField()
+    investigated = models.BooleanField(null=False, default=False)
+    investigation_details = models.CharField(blank=True, null=False)
 
     # Onset information
-    when_started = models.CharField(blank=True, null=False)
+    when_started = models.CharField(blank=True, null=False, choices=RelativeDateChoices)
     year_started = models.IntegerField(null=True, blank=True)
     month_started = models.IntegerField(null=True, blank=True)
     intermittent = models.BooleanField(null=False, default=False)