Move AsbestosExposureResponse to its own model

Author: Themitchell

lung_cancer_screening/questions/forms/asbestos_exposure_form.py

@@ -1,13 +1,13 @@
 from django import forms
 from ...nhsuk_forms.typed_choice_field import TypedChoiceField
-from ..models.response_set import ResponseSet
+from ..models.asbestos_exposure_response import AsbestosExposureResponse
 
 
 class AsbestosExposureForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields["asbestos_exposure"] = TypedChoiceField(
+        self.fields["value"] = TypedChoiceField(
             choices=[(True, 'Yes'), (False, 'No')],
             widget=forms.RadioSelect,
             label="Have you ever worked in a job where you might have been exposed to asbestos?",
@@ -19,5 +19,5 @@ def __init__(self, *args, **kwargs):
         )
 
     class Meta:
-        model = ResponseSet
-        fields = ['asbestos_exposure']
+        model = AsbestosExposureResponse
+        fields = ['value']

lung_cancer_screening/questions/migrations/0026_asbestosexposureresponse.py

@@ -0,0 +1,53 @@
+# Generated manually to create AsbestosExposureResponse and copy data
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+def copy_asbestos_exposure_data(apps, schema_editor):
+    with schema_editor.connection.cursor() as cursor:
+        cursor.execute("""
+            INSERT INTO questions_asbestosexposureresponse (created_at, updated_at, value, response_set_id)
+            SELECT NOW(), NOW(), asbestos_exposure, id
+            FROM questions_responseset
+            WHERE asbestos_exposure IS NOT NULL
+            ON CONFLICT (response_set_id) DO NOTHING
+        """)
+
+
+def reverse_copy_asbestos_exposure_data(apps, schema_editor):
+    with schema_editor.connection.cursor() as cursor:
+        cursor.execute("""
+            UPDATE questions_responseset rs
+            SET asbestos_exposure = a.value
+            FROM questions_asbestosexposureresponse a
+            WHERE rs.id = a.response_set_id
+        """)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0025_haveyoueversmokedresponse'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AsbestosExposureResponse',
+            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.BooleanField()),
+                ('response_set', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='asbestos_exposure_response', to='questions.responseset')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.RunPython(copy_asbestos_exposure_data, reverse_copy_asbestos_exposure_data),
+        migrations.RemoveField(
+            model_name='responseset',
+            name='asbestos_exposure',
+        ),
+    ]

lung_cancer_screening/questions/models/__init__.py

@@ -1,3 +1,4 @@
 from .response_set import ResponseSet # noqa: F401
 from .user import User # noqa: F401
 from .have_you_ever_smoked_response import HaveYouEverSmokedResponse # noqa: F401
+from .asbestos_exposure_response import AsbestosExposureResponse # noqa: F401

lung_cancer_screening/questions/models/asbestos_exposure_response.py

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

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

@@ -1,53 +1,54 @@
 from django.test import TestCase
 
-from ...factories.user_factory import UserFactory
-from ....models.response_set import ResponseSet
+from ...factories.response_set_factory import ResponseSetFactory
+from ....models.asbestos_exposure_response import AsbestosExposureResponse
 from ....forms.asbestos_exposure_form import AsbestosExposureForm
 
 
 class TestAsbestosExposureForm(TestCase):
     def setUp(self):
-        self.user = UserFactory()
-        self.response_set = ResponseSet(user=self.user)
+        self.response_set = ResponseSetFactory()
+        self.response = AsbestosExposureResponse.objects.create(
+            response_set=self.response_set,
+            value=False
+        )
 
 
     def test_is_valid_with_a_valid_value(self):
         form = AsbestosExposureForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "asbestos_exposure": False
+                "value": False
             }
         )
         self.assertTrue(form.is_valid())
         self.assertEqual(
-            form.cleaned_data["asbestos_exposure"],
+            form.cleaned_data["value"],
             False
         )
 
     def test_is_invalid_with_an_invalid_value(self):
         form = AsbestosExposureForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "user": self.user,
-                "asbestos_exposure": "invalid"
+                "value": "invalid"
             }
         )
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors["asbestos_exposure"],
+            form.errors["value"],
             ["Select a valid choice. invalid is not one of the available choices."]
         )
 
     def test_is_invalid_when_no_option_is_selected(self):
         form = AsbestosExposureForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "user": self.user,
-                "asbestos_exposure": None
+                "value": None
             }
         )
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors["asbestos_exposure"],
+            form.errors["value"],
             ["Select if you have been exposed to asbestos"]
         )

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

@@ -0,0 +1,24 @@
+from django.test import TestCase
+
+from ...factories.response_set_factory import ResponseSetFactory
+from ....models.asbestos_exposure_response import AsbestosExposureResponse
+
+
+class TestAsbestosExposureResponse(TestCase):
+    def test_has_response_set_as_foreign_key(self):
+        response_set = ResponseSetFactory()
+        response = AsbestosExposureResponse.objects.create(
+            response_set=response_set,
+            value=True
+        )
+
+        self.assertEqual(response.response_set, response_set)
+
+    def test_has_value_as_bool(self):
+        response_set = ResponseSetFactory()
+        response = AsbestosExposureResponse.objects.create(
+            response_set=response_set,
+            value=False
+        )
+
+        self.assertIsInstance(response.value, bool)

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

@@ -4,6 +4,7 @@
 from django.utils import timezone
 
 from .helpers.authentication import login_user
+from lung_cancer_screening.questions.models.asbestos_exposure_response import AsbestosExposureResponse
 
 
 class TestGetAsbestosExposure(TestCase):
@@ -49,7 +50,7 @@ class TestPostAsbestosExposure(TestCase):
     def setUp(self):
         self.user = login_user(self.client)
 
-        self.valid_params = {"asbestos_exposure": True}
+        self.valid_params = {"value": True}
 
 
     def test_post_redirects_if_the_user_is_not_logged_in(self):
@@ -72,7 +73,7 @@ def test_post_creates_an_unsubmitted_response_set_for_the_user_when_no_response_
         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.asbestos_exposure, self.valid_params["asbestos_exposure"])
+        self.assertEqual(AsbestosExposureResponse.objects.get(response_set=response_set).value, self.valid_params["value"])
         self.assertEqual(response_set.user, self.user)
 
 
@@ -87,7 +88,7 @@ def test_post_updates_an_unsubmitted_response_set_for_the_user_when_an_unsubmitt
         response_set.refresh_from_db()
         self.assertEqual(self.user.responseset_set.count(), 1)
         self.assertEqual(response_set.submitted_at, None)
-        self.assertEqual(response_set.asbestos_exposure, self.valid_params["asbestos_exposure"])
+        self.assertEqual(AsbestosExposureResponse.objects.get(response_set=response_set).value, self.valid_params["value"])
         self.assertEqual(response_set.user, self.user)
 
 
@@ -106,7 +107,7 @@ def test_post_creates_an_new_unsubmitted_response_set_for_the_user_when_an_submi
 
         response_set = self.user.responseset_set.last()
         self.assertEqual(response_set.submitted_at, None)
-        self.assertEqual(response_set.asbestos_exposure, self.valid_params["asbestos_exposure"])
+        self.assertEqual(AsbestosExposureResponse.objects.get(response_set=response_set).value, self.valid_params["value"])
         self.assertEqual(response_set.user, self.user)
 
 
@@ -135,18 +136,17 @@ def test_post_redirects_to_the_next_page(self):
     def test_post_responds_with_422_if_the_response_fails_to_create(self):
         response = self.client.post(
             reverse("questions:asbestos_exposure"),
-            {"asbestos_exposure": "something not in list"}
+            {"value": "something not in list"}
         )
 
         self.assertEqual(response.status_code, 422)
 
     def test_post_does_not_update_response_set_on_invalid_data(self):
         self.client.post(
             reverse("questions:asbestos_exposure"),
-            {"asbestos_exposure": "invalid"}
+            {"value": "invalid"}
         )
 
-        self.assertEqual(
-            self.user.responseset_set.first().asbestos_exposure,
-            None
-        )
+        response_set = self.user.responseset_set.first()
+        if response_set:
+            self.assertFalse(AsbestosExposureResponse.objects.filter(response_set=response_set).exists())

lung_cancer_screening/questions/views/asbestos_exposure.py

@@ -5,26 +5,31 @@
 
 from .mixins.ensure_response_set import EnsureResponseSet
 from ..forms.asbestos_exposure_form import AsbestosExposureForm
+from ..models.asbestos_exposure_response import AsbestosExposureResponse
 
 class AsbestosExposureView(LoginRequiredMixin, EnsureResponseSet, View):
     def get(self, request):
+        response, _ = AsbestosExposureResponse.objects.get_or_build(
+            response_set=request.response_set
+        )
         return render(
             request,
             "asbestos_exposure.jinja",
-            {"form": AsbestosExposureForm(instance=request.response_set)}
+            {"form": AsbestosExposureForm(instance=response)}
         )
 
     def post(self, request):
-
+        response, _ = AsbestosExposureResponse.objects.get_or_build(
+            response_set=request.response_set
+        )
         form = AsbestosExposureForm(
-            instance=request.response_set,
+            instance=response,
             data=request.POST
         )
 
         if form.is_valid():
-            response_set = request.user.responseset_set.last()
-            response_set.asbestos_exposure = form.cleaned_data["asbestos_exposure"]
-            response_set.save()
+            response.value = form.cleaned_data["value"]
+            response.save()
             return redirect(reverse("questions:cancer_diagnosis"))
         else:
             return render(