Move DateOfBirthResponse to its own model

Author: Themitchell

lung_cancer_screening/questions/forms/date_of_birth_form.py

@@ -1,7 +1,7 @@
 from django import forms
 from datetime import date
 
-from ..models.response_set import ResponseSet
+from ..models.date_of_birth_response import DateOfBirthResponse
 from ...nhsuk_forms.split_date_field import SplitDateField
 
 
@@ -10,7 +10,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         invalid_error_message = 'Date of birth must be a real date'
-        self.fields["date_of_birth"] = SplitDateField(
+        self.fields["value"] = SplitDateField(
             max_value=date.today(),
             required=True,
             require_all_fields=False,
@@ -28,5 +28,5 @@ def __init__(self, *args, **kwargs):
         )
 
     class Meta:
-        model = ResponseSet
-        fields = ['date_of_birth']
+        model = DateOfBirthResponse
+        fields = ['value']

lung_cancer_screening/questions/migrations/0027_dateofbirthresponse.py

@@ -0,0 +1,53 @@
+# Generated manually to create DateOfBirthResponse and copy data
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+def copy_date_of_birth_data(apps, schema_editor):
+    with schema_editor.connection.cursor() as cursor:
+        cursor.execute("""
+            INSERT INTO questions_dateofbirthresponse (created_at, updated_at, value, response_set_id)
+            SELECT NOW(), NOW(), date_of_birth, id
+            FROM questions_responseset
+            WHERE date_of_birth IS NOT NULL
+            ON CONFLICT (response_set_id) DO NOTHING
+        """)
+
+
+def reverse_copy_date_of_birth_data(apps, schema_editor):
+    with schema_editor.connection.cursor() as cursor:
+        cursor.execute("""
+            UPDATE questions_responseset rs
+            SET date_of_birth = d.value
+            FROM questions_dateofbirthresponse d
+            WHERE rs.id = d.response_set_id
+        """)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0026_asbestosexposureresponse'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DateOfBirthResponse',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('value', models.DateField()),
+                ('response_set', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='date_of_birth_response', to='questions.responseset')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.RunPython(copy_date_of_birth_data, reverse_copy_date_of_birth_data),
+        migrations.RemoveField(
+            model_name='responseset',
+            name='date_of_birth',
+        ),
+    ]

lung_cancer_screening/questions/models/__init__.py

@@ -2,3 +2,4 @@
 from .user import User # noqa: F401
 from .have_you_ever_smoked_response import HaveYouEverSmokedResponse # noqa: F401
 from .asbestos_exposure_response import AsbestosExposureResponse # noqa: F401
+from .date_of_birth_response import DateOfBirthResponse # noqa: F401

lung_cancer_screening/questions/models/date_of_birth_response.py

@@ -0,0 +1,9 @@
+from django.db import models
+
+from .base import BaseModel
+from .response_set import ResponseSet
+
+
+class DateOfBirthResponse(BaseModel):
+    response_set = models.OneToOneField(ResponseSet, on_delete=models.CASCADE, related_name='date_of_birth_response')
+    value = models.DateField()

lung_cancer_screening/questions/tests/unit/forms/test_date_of_birth_form.py

@@ -1,83 +1,86 @@
 from django.test import TestCase
 from datetime import date
 
-from ...factories.user_factory import UserFactory
-from ....models.response_set import ResponseSet
+from ...factories.response_set_factory import ResponseSetFactory
+from ....models.date_of_birth_response import DateOfBirthResponse
 from ....forms.date_of_birth_form import DateOfBirthForm
 
 
 class TestDateOfBirthForm(TestCase):
     def setUp(self):
-        self.user = UserFactory()
-        self.response_set = ResponseSet(user=self.user)
+        self.response_set = ResponseSetFactory()
+        self.response = DateOfBirthResponse.objects.create(
+            response_set=self.response_set,
+            value=date(2000, 1, 1)
+        )
 
     def test_is_valid_when_a_valid_date_is_provided(self):
         form = DateOfBirthForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "date_of_birth_0": 1,
-                "date_of_birth_1": 1,
-                "date_of_birth_2": 2025
+                "value_0": 1,
+                "value_1": 1,
+                "value_2": 2025
             }
         )
         self.assertTrue(form.is_valid())
 
     def test_is_invalid_when_no_date_is_provided(self):
         form = DateOfBirthForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "date_of_birth_0": "",
-                "date_of_birth_1": "",
-                "date_of_birth_2": ""
+                "value_0": "",
+                "value_1": "",
+                "value_2": ""
             }
         )
 
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors["date_of_birth"],
+            form.errors["value"],
             ["Enter your date of birth"]
         )
 
     def test_is_invalid_when_a_partial_date_is_provided(self):
         form = DateOfBirthForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "date_of_birth_0": "10",
-                "date_of_birth_1": "",
-                "date_of_birth_2": ""
+                "value_0": "10",
+                "value_1": "",
+                "value_2": ""
             }
         )
 
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors["date_of_birth"],
+            form.errors["value"],
             ["Enter your full date of birth"]
         )
 
     def test_is_invalid_when_an_invalid_date_is_provided(self):
         form = DateOfBirthForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "date_of_birth_0": "31",
-                "date_of_birth_1": "02",
-                "date_of_birth_2": "2025"
+                "value_0": "31",
+                "value_1": "02",
+                "value_2": "2025"
             }
         )
 
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors["date_of_birth"],
+            form.errors["value"],
             ["Date of birth must be a real date"]
         )
 
     def test_returns_a_date_type(self):
         form = DateOfBirthForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "date_of_birth_0": 1,
-                "date_of_birth_1": 1,
-                "date_of_birth_2": 2025
+                "value_0": 1,
+                "value_1": 1,
+                "value_2": 2025
             }
         )
         form.is_valid()
-        self.assertIsInstance(form.cleaned_data["date_of_birth"], date)
+        self.assertIsInstance(form.cleaned_data["value"], date)

lung_cancer_screening/questions/tests/unit/models/test_date_of_birth_response.py

@@ -0,0 +1,25 @@
+from django.test import TestCase
+from datetime import date
+
+from ...factories.response_set_factory import ResponseSetFactory
+from ....models.date_of_birth_response import DateOfBirthResponse
+
+
+class TestDateOfBirthResponse(TestCase):
+    def test_has_response_set_as_foreign_key(self):
+        response_set = ResponseSetFactory()
+        response = DateOfBirthResponse.objects.create(
+            response_set=response_set,
+            value=date(2000, 9, 8)
+        )
+
+        self.assertEqual(response.response_set, response_set)
+
+    def test_has_value_as_date(self):
+        response_set = ResponseSetFactory()
+        response = DateOfBirthResponse.objects.create(
+            response_set=response_set,
+            value=date(2000, 9, 8)
+        )
+
+        self.assertIsInstance(response.value, date)

lung_cancer_screening/questions/tests/unit/views/test_date_of_birth.py

@@ -5,6 +5,7 @@
 from django.utils import timezone
 
 from .helpers.authentication import login_user
+from lung_cancer_screening.questions.models.date_of_birth_response import DateOfBirthResponse
 
 
 class TestGetDateOfBirth(TestCase):
@@ -49,16 +50,16 @@ def setUp(self):
 
         self.valid_age = date.today() - relativedelta(years=55)
         self.valid_params = {
-            "date_of_birth_0": self.valid_age.day,
-            "date_of_birth_1": self.valid_age.month,
-            "date_of_birth_2": self.valid_age.year
+            "value_0": self.valid_age.day,
+            "value_1": self.valid_age.month,
+            "value_2": self.valid_age.year
         }
 
         self.invalid_age = date.today() - relativedelta(years=20)
         self.invalid_params = {
-            "date_of_birth_0": self.invalid_age.day,
-            "date_of_birth_1": self.invalid_age.month,
-            "date_of_birth_2": self.invalid_age.year
+            "value_0": self.invalid_age.day,
+            "value_1": self.invalid_age.month,
+            "value_2": self.invalid_age.year
         }
 
     def test_post_redirects_if_the_user_is_not_logged_in(self):
@@ -86,7 +87,7 @@ def test_post_creates_unsubmitted_response_set_when_no_response_set_exists(
         response_set = self.user.responseset_set.first()
         self.assertEqual(self.user.responseset_set.count(), 1)
         self.assertEqual(response_set.submitted_at, None)
-        self.assertEqual(response_set.date_of_birth, self.valid_age)
+        self.assertEqual(DateOfBirthResponse.objects.get(response_set=response_set).value, self.valid_age)
         self.assertEqual(response_set.user, self.user)
 
     def test_post_updates_unsubmitted_response_set_when_one_exists(self):
@@ -100,7 +101,7 @@ def test_post_updates_unsubmitted_response_set_when_one_exists(self):
         response_set.refresh_from_db()
         self.assertEqual(self.user.responseset_set.count(), 1)
         self.assertEqual(response_set.submitted_at, None)
-        self.assertEqual(response_set.date_of_birth, self.valid_age)
+        self.assertEqual(DateOfBirthResponse.objects.get(response_set=response_set).value, self.valid_age)
         self.assertEqual(response_set.user, self.user)
 
     def test_post_creates_new_unsubmitted_response_set_when_submitted_exists_over_year_ago(  # noqa: E501
@@ -120,7 +121,7 @@ def test_post_creates_new_unsubmitted_response_set_when_submitted_exists_over_ye
 
         response_set = self.user.responseset_set.last()
         self.assertEqual(response_set.submitted_at, None)
-        self.assertEqual(response_set.date_of_birth, self.valid_age)
+        self.assertEqual(DateOfBirthResponse.objects.get(response_set=response_set).value, self.valid_age)
         self.assertEqual(response_set.user, self.user)
 
     def test_post_redirects_when_submitted_response_set_exists_within_last_year(
@@ -144,7 +145,7 @@ def test_post_stores_a_valid_response_set_for_the_user(self):
         )
 
         response_set = self.user.responseset_set.first()
-        self.assertEqual(response_set.date_of_birth, self.valid_age)
+        self.assertEqual(DateOfBirthResponse.objects.get(response_set=response_set).value, self.valid_age)
         self.assertEqual(response_set.user, self.user)
 
     def test_post_redirects_to_height_path(self):
@@ -159,9 +160,9 @@ def test_post_responds_with_422_if_the_resource_is_invalid(self):
         response = self.client.post(
             reverse("questions:date_of_birth"),
             {
-                "date_of_birth_0": "80000",
-                "date_of_birth_1": "90000",
-                "date_of_birth_2": "20000000"
+                "value_0": "80000",
+                "value_1": "90000",
+                "value_2": "20000000"
             }
         )
 
@@ -175,9 +176,9 @@ def test_post_does_not_set_date_of_birth_if_user_not_in_correct_age_range(
             self.invalid_params
         )
 
-        self.assertEqual(
-            self.user.responseset_set.first().date_of_birth, None
-        )
+        response_set = self.user.responseset_set.first()
+        if response_set:
+            self.assertFalse(DateOfBirthResponse.objects.filter(response_set=response_set).exists())
 
     def test_post_redirects_if_user_not_in_correct_age_range(self):
         response = self.client.post(

lung_cancer_screening/questions/views/date_of_birth.py

@@ -7,33 +7,39 @@
 
 from .mixins.ensure_response_set import EnsureResponseSet
 from ..forms.date_of_birth_form import DateOfBirthForm
+from ..models.date_of_birth_response import DateOfBirthResponse
 
 
 class DateOfBirthView(LoginRequiredMixin, EnsureResponseSet, View):
     def get(self, request):
+        response, _ = DateOfBirthResponse.objects.get_or_build(
+            response_set=request.response_set
+        )
         return render_template(
             request,
-            DateOfBirthForm(instance=request.response_set)
+            DateOfBirthForm(instance=response)
         )
 
     def post(self, request):
+        response, _ = DateOfBirthResponse.objects.get_or_build(
+            response_set=request.response_set
+        )
         form = DateOfBirthForm(
-            instance=request.response_set,
+            instance=response,
             data=request.POST
         )
 
         if form.is_valid():
             fifty_five_years_ago = date.today() - relativedelta(years=55)
             seventy_five_years_ago = date.today() - relativedelta(years=75)
-            date_of_birth = form.cleaned_data["date_of_birth"]
+            date_of_birth = form.cleaned_data["value"]
 
             age_in_range = (
                 seventy_five_years_ago < date_of_birth <= fifty_five_years_ago
             )
             if age_in_range:
-                response_set = request.response_set
-                response_set.date_of_birth = date_of_birth
-                response_set.save()
+                response.value = date_of_birth
+                response.save()
 
                 return redirect(reverse("questions:height"))
             else: