Refactor responses to their own models (#195)

* Move HaveYouEverSmokedResponse to its own model

* Move AsbestosExposureResponse to its own model

* Move DateOfBirthResponse to its own model

* Move EthnicityResponse to its own model

* Move GenderResponse to its own model

* Move HeightResponse to its own model

* Move RespiratoryConditionsResponse to its own model

* Move SexAtBirthResponse to its own model

* Move WeightResponse to its own model

* Cleanup old ResponseSet model

* Add presenter for ResponseSet presentation layer

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/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/forms/ethnicity_form.py

@@ -1,15 +1,15 @@
 from django import forms
 
 from ...nhsuk_forms.choice_field import ChoiceField
-from ..models.response_set import ResponseSet, EthnicityValues
+from ..models.ethnicity_response import EthnicityResponse, EthnicityValues
 
 
 class EthnicityForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields["ethnicity"] = ChoiceField(
+        self.fields["value"] = ChoiceField(
             choices=EthnicityValues.choices,
             label="What is your ethnic background?",
             widget=forms.RadioSelect,
@@ -24,10 +24,10 @@ def __init__(self, *args, **kwargs):
             }
         )
 
-        self["ethnicity"].add_divider_after(
+        self["value"].add_divider_after(
             EthnicityValues.OTHER.value, "or"
         )
 
     class Meta:
-        model = ResponseSet
-        fields = ['ethnicity']
+        model = EthnicityResponse
+        fields = ['value']

lung_cancer_screening/questions/forms/gender_form.py

@@ -1,15 +1,15 @@
 from django import forms
 
 from ...nhsuk_forms.choice_field import ChoiceField
-from ..models.response_set import ResponseSet, GenderValues
+from ..models.gender_response import GenderResponse, GenderValues
 
 
 class GenderForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields["gender"] = ChoiceField(
+        self.fields["value"] = ChoiceField(
             choices=GenderValues.choices,
             widget=forms.RadioSelect,
             label="Which of these best describes you?",
@@ -25,5 +25,5 @@ def __init__(self, *args, **kwargs):
         )
 
     class Meta:
-        model = ResponseSet
-        fields = ['gender']
+        model = GenderResponse
+        fields = ['value']

lung_cancer_screening/questions/forms/have_you_ever_smoked_form.py

@@ -1,14 +1,14 @@
 from django import forms
 
 from ...nhsuk_forms.typed_choice_field import TypedChoiceField
-from ..models.response_set import ResponseSet, HaveYouEverSmokedValues
+from ..models.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
 
 class HaveYouEverSmokedForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields["have_you_ever_smoked"] = TypedChoiceField(
+        self.fields["value"] = TypedChoiceField(
             choices=HaveYouEverSmokedValues.choices,
             widget=forms.RadioSelect,
             label="Have you ever smoked?",
@@ -21,5 +21,5 @@ def __init__(self, *args, **kwargs):
         )
 
     class Meta:
-        model = ResponseSet
-        fields = ['have_you_ever_smoked']
+        model = HaveYouEverSmokedResponse
+        fields = ['value']

lung_cancer_screening/questions/forms/imperial_height_form.py

@@ -1,15 +1,15 @@
 from django import forms
 
 from ...nhsuk_forms.imperial_height_field import ImperialHeightField
-from ..models.response_set import ResponseSet
+from ..models.height_response import HeightResponse
 
 
 class ImperialHeightForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields["height_imperial"] = ImperialHeightField(
+        self.fields["imperial"] = ImperialHeightField(
             label="Height",
             required=True,
             require_all_fields=False,
@@ -18,9 +18,9 @@ def __init__(self, *args, **kwargs):
             }
         )
 
-    def clean_height(self):
+    def clean_metric(self):
         return None
 
     class Meta:
-        model = ResponseSet
-        fields = ['height_imperial', 'height_metric']
+        model = HeightResponse
+        fields = ['imperial', 'metric']

lung_cancer_screening/questions/forms/imperial_weight_form.py

@@ -1,15 +1,15 @@
 from django import forms
 
 from ...nhsuk_forms.imperial_weight_field import ImperialWeightField
-from ..models.response_set import ResponseSet
+from ..models.weight_response import WeightResponse
 
 
 class ImperialWeightForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields["weight_imperial"] = ImperialWeightField(
+        self.fields["imperial"] = ImperialWeightField(
             label="Weight",
             required=True,
             require_all_fields=False,
@@ -18,9 +18,9 @@ def __init__(self, *args, **kwargs):
             }
         )
 
-    def clean_weight_metric(self):
+    def clean_metric(self):
         return None
 
     class Meta:
-        model = ResponseSet
-        fields = ['weight_imperial', 'weight_metric']
+        model = WeightResponse
+        fields = ['imperial', 'metric']

lung_cancer_screening/questions/forms/metric_height_form.py

@@ -1,7 +1,7 @@
 from django import forms
 
 from ...nhsuk_forms.decimal_field import DecimalField
-from ..models.response_set import ResponseSet
+from ..models.height_response import HeightResponse
 
 
 class MetricHeightForm(forms.ModelForm):
@@ -10,10 +10,10 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         # Convert mm to cm for display
-        if self.instance and self.instance.height_metric is not None:
-            self.initial['height_metric'] = self.instance.height_metric / 10
+        if self.instance and self.instance.metric is not None:
+            self.initial['metric'] = self.instance.metric / 10
 
-        self.fields["height_metric"] = DecimalField(
+        self.fields["metric"] = DecimalField(
             decimal_places=1,
             label="Centimetres",
             classes="nhsuk-input--width-4",
@@ -27,12 +27,12 @@ def __init__(self, *args, **kwargs):
             suffix="cm"
         )
 
-    def clean_height_metric(self):
-        return self.cleaned_data['height_metric'] * 10
+    def clean_metric(self):
+        return int(self.cleaned_data['metric'] * 10)
 
-    def clean_height_imperial(self):
+    def clean_imperial(self):
         return None
 
     class Meta:
-        model = ResponseSet
-        fields = ['height_metric', 'height_imperial']
+        model = HeightResponse
+        fields = ['metric', 'imperial']

lung_cancer_screening/questions/forms/metric_weight_form.py

@@ -1,7 +1,7 @@
 from django import forms
 
 from ...nhsuk_forms.decimal_field import DecimalField
-from ..models.response_set import ResponseSet
+from ..models.weight_response import WeightResponse
 
 
 class MetricWeightForm(forms.ModelForm):
@@ -10,10 +10,10 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         # Convert hundreds of grams to kg for display
-        if self.instance and self.instance.weight_metric is not None:
-            self.initial['weight_metric'] = self.instance.weight_metric / 10
+        if self.instance and self.instance.metric is not None:
+            self.initial['metric'] = self.instance.metric / 10
 
-        self.fields["weight_metric"] = DecimalField(
+        self.fields["metric"] = DecimalField(
             decimal_places=1,
             label="Kilograms",
             classes="nhsuk-input--width-4",
@@ -28,12 +28,12 @@ def __init__(self, *args, **kwargs):
             suffix="kg"
         )
 
-    def clean_weight_metric(self):
-        return self.cleaned_data['weight_metric'] * 10
+    def clean_metric(self):
+        return int(self.cleaned_data['metric'] * 10)
 
-    def clean_weight_imperial(self):
+    def clean_imperial(self):
         return None
 
     class Meta:
-        model = ResponseSet
-        fields = ['weight_metric', 'weight_imperial']
+        model = WeightResponse
+        fields = ['metric', 'imperial']

lung_cancer_screening/questions/forms/respiratory_conditions_form.py

@@ -1,15 +1,15 @@
 from django import forms
 
 from ...nhsuk_forms.choice_field import MultipleChoiceField
-from ..models.response_set import ResponseSet, RespiratoryConditionValues
+from ..models.respiratory_conditions_response import RespiratoryConditionsResponse, RespiratoryConditionValues
 
 
 class RespiratoryConditionsForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields["respiratory_conditions"] = MultipleChoiceField(
+        self.fields["value"] = MultipleChoiceField(
             choices=RespiratoryConditionValues.choices,
             widget=forms.CheckboxSelectMultiple,
             label=(
@@ -31,7 +31,7 @@ def __init__(self, *args, **kwargs):
         )
 
         # Add hints for each choice
-        respiratory_conditions_field = self["respiratory_conditions"]
+        respiratory_conditions_field = self["value"]
         respiratory_conditions_field.add_hint_for_choice(
             RespiratoryConditionValues.PNEUMONIA,
             "An infection of the lungs, usually diagnosed by a chest x-ray"
@@ -66,5 +66,5 @@ def __init__(self, *args, **kwargs):
         )
 
     class Meta:
-        model = ResponseSet
-        fields = ['respiratory_conditions']
+        model = RespiratoryConditionsResponse
+        fields = ['value']