Add presenter for ResponseSet presentation layer

Author: Themitchell

lung_cancer_screening/questions/jinja2/responses.jinja

@@ -18,25 +18,17 @@
     <div class="nhsuk-grid-column-two-thirds">
       <h1 class="nhsuk-heading-l">Responses</h1>
       <ul class="responses">
-        {% set have_you_ever_smoked = response_set.have_you_ever_smoked_response %}
-        {% set date_of_birth = response_set.date_of_birth_response %}
-        {% set height = response_set.height_response %}
-        {% set weight = response_set.weight_response %}
-        {% set sex_at_birth = response_set.sex_at_birth_response %}
-        {% set gender = response_set.gender_response %}
-        {% set ethnicity = response_set.ethnicity_response %}
-        {% set asbestos_exposure = response_set.asbestos_exposure_response %}
-        {% set respiratory_conditions = response_set.respiratory_conditions_response %}
-        <li>Have you ever smoked? {% if have_you_ever_smoked %}{{ have_you_ever_smoked.get_value_display() }}{% endif %}</li>
-        <li>What is your date of birth? {% if date_of_birth %}{{ date_of_birth.value }}{% endif %}</li>
-        <li>What is your height? {% if height %}{{ height.formatted }}{% endif %}</li>
-        <li>What is your weight? {% if weight %}{{ weight.formatted }}{% endif %}</li>
-        <li>What was your sex at birth? {% if sex_at_birth %}{{ sex_at_birth.get_value_display() }}{% endif %}</li>
-        <li>Which of these best describes you? {% if gender %}{{ gender.get_value_display() }}{% endif %}</li>
-        <li>What is your ethnic background? {% if ethnicity %}{{ ethnicity.get_value_display() }}{% endif %}</li>
-        <li>Have you ever worked in a job where you might have been exposed to asbestos? {% if asbestos_exposure %}{{ "Yes" if asbestos_exposure.value else "No" }}{% else %}No{% endif %}</li>
-        <li>Have you ever been diagnosed with any of the following respiratory conditions? {% if respiratory_conditions %}{{ respiratory_conditions.formatted }}{% endif %}</li>
+        <li>Have you ever smoked? {{ response_set.have_you_ever_smoked }}</li>
+        <li>What is your date of birth? {{ response_set.date_of_birth }}</li>
+        <li>What is your height? {{ response_set.height }}</li>
+        <li>What is your weight? {{ response_set.weight }}</li>
+        <li>What was your sex at birth? {{ response_set.sex_at_birth }}</li>
+        <li>Which of these best describes you? {{ response_set.gender }}</li>
+        <li>What is your ethnic background? {{ response_set.ethnicity }}</li>
+        <li>Have you ever worked in a job where you might have been exposed to asbestos? {{ response_set.asbestos_exposure }}</li>
+        <li>Have you ever been diagnosed with any of the following respiratory conditions? {{ response_set.respiratory_conditions }}</li>
       </ul>
+
       <form action="{{ request.path }}" method="post">
         {{ csrf_input }}
         {{ button({

lung_cancer_screening/questions/models/height_response.py

@@ -1,7 +1,6 @@
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
-from decimal import Decimal
 
 from .base import BaseModel
 from .response_set import ResponseSet
@@ -29,12 +28,3 @@ def clean(self):
             raise ValidationError("Either metric or imperial height must be provided.")
         if self.metric and self.imperial:
             raise ValidationError("Cannot provide both metric and imperial height.")
-
-    @property
-    def formatted(self):
-        if self.metric:
-            return f"{Decimal(self.metric) / 10}cm"
-        elif self.imperial:
-            value = Decimal(self.imperial)
-            return f"{value // 12} feet {value % 12} inches"
-        return None

lung_cancer_screening/questions/models/respiratory_conditions_response.py

@@ -29,13 +29,3 @@ class RespiratoryConditionsResponse(BaseModel):
         models.CharField(max_length=1, choices=RespiratoryConditionValues.choices),
         validators=[validate_singleton_option]
     )
-
-    @property
-    def formatted(self):
-        if not self.value:
-            return None
-        display_values = [
-            RespiratoryConditionValues(code).label
-            for code in self.value
-        ]
-        return ", ".join(display_values)

lung_cancer_screening/questions/models/weight_response.py

@@ -1,7 +1,6 @@
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
-from decimal import Decimal
 
 from .base import BaseModel
 from .response_set import ResponseSet
@@ -29,12 +28,3 @@ def clean(self):
             raise ValidationError("Either metric or imperial weight must be provided.")
         if self.metric and self.imperial:
             raise ValidationError("Cannot provide both metric and imperial weight.")
-
-    @property
-    def formatted(self):
-        if self.metric:
-            return f"{Decimal(self.metric) / 10}kg"
-        elif self.imperial:
-            value = Decimal(self.imperial)
-            return f"{value // 14} stone {value % 14} pounds"
-        return None

lung_cancer_screening/questions/presenters/__init__.py

@@ -0,0 +1,98 @@
+from decimal import Decimal
+
+from ..models.respiratory_conditions_response import RespiratoryConditionValues
+
+class ResponseSetPresenter:
+    DATE_FORMAT = "%-d %B %Y" # eg 8 September 2000
+
+    def __init__(self, response_set):
+        self.response_set = response_set
+
+    @property
+    def have_you_ever_smoked(self):
+        if not hasattr(self.response_set, 'have_you_ever_smoked_response'):
+            return None
+
+        return self.response_set.have_you_ever_smoked_response.get_value_display()
+
+    @property
+    def date_of_birth(self):
+        if not hasattr(self.response_set, 'date_of_birth_response'):
+            return None
+
+        return self.response_set.date_of_birth_response.value.strftime(self.DATE_FORMAT)
+
+    @property
+    def height(self):
+        if not hasattr(self.response_set, 'height_response'):
+            return None
+
+        if self.response_set.height_response.metric:
+            return f"{Decimal(self.response_set.height_response.metric) / 10} cm"
+        elif self.response_set.height_response.imperial:
+            value = Decimal(self.response_set.height_response.imperial)
+            return f"{value // 12} feet {value % 12} inches"
+        else:
+            return None
+
+    @property
+    def weight(self):
+        if not hasattr(self.response_set, 'weight_response'):
+            return None
+
+        if self.response_set.weight_response.metric:
+            return f"{Decimal(self.response_set.weight_response.metric) / 10} kg"
+        elif self.response_set.weight_response.imperial:
+            value = Decimal(self.response_set.weight_response.imperial)
+            return f"{value // 14} stone {value % 14} pounds"
+        else:
+            return None
+
+    @property
+    def sex_at_birth(self):
+        if not hasattr(self.response_set, 'sex_at_birth_response'):
+            return None
+
+        return self.response_set.sex_at_birth_response.get_value_display()
+
+    @property
+    def gender(self):
+        if not hasattr(self.response_set, 'gender_response'):
+            return None
+
+        return self.response_set.gender_response.get_value_display()
+
+    @property
+    def ethnicity(self):
+        if not hasattr(self.response_set, 'ethnicity_response'):
+            return None
+
+        return self.response_set.ethnicity_response.get_value_display()
+
+    @property
+    def asbestos_exposure(self):
+        if not hasattr(self.response_set, 'asbestos_exposure_response'):
+            return None
+
+        return "Yes" if self.response_set.asbestos_exposure_response.value else "No"
+
+    @property
+    def respiratory_conditions(self):
+        if not hasattr(self.response_set, 'respiratory_conditions_response'):
+            return None
+
+        return self._list_to_sentence([
+            RespiratoryConditionValues(code).label
+            for code in self.response_set.respiratory_conditions_response.value
+        ])
+
+
+    def _list_to_sentence(self, list):
+        if len(list) == 0:
+            return ''
+        if len(list) == 1:
+            return list[0]
+        if len(list) == 2:
+            return '{} and {}'.format(list[0], list[1])
+
+        return '{}, and {}'.format(', '.join(list[:-1]), list[-1])

lung_cancer_screening/questions/presenters/response_set_presenter.py

@@ -0,0 +1,12 @@
+import factory
+
+from .response_set_factory import ResponseSetFactory
+from ...models.asbestos_exposure_response import AsbestosExposureResponse
+
+
+class AsbestosExposureResponseFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = AsbestosExposureResponse
+
+    response_set = factory.SubFactory(ResponseSetFactory)
+    value = factory.Faker('boolean')

lung_cancer_screening/questions/tests/factories/asbestos_exposure_response_factory.py

@@ -0,0 +1,12 @@
+import factory
+
+from .response_set_factory import ResponseSetFactory
+from ...models.date_of_birth_response import DateOfBirthResponse
+
+
+class DateOfBirthResponseFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = DateOfBirthResponse
+
+    response_set = factory.SubFactory(ResponseSetFactory)
+    value = factory.Faker('date_of_birth')

lung_cancer_screening/questions/tests/factories/date_of_birth_response_factory.py

@@ -0,0 +1,12 @@
+import factory
+
+from .response_set_factory import ResponseSetFactory
+from ...models.ethnicity_response import EthnicityResponse, EthnicityValues
+
+
+class EthnicityResponseFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = EthnicityResponse
+
+    response_set = factory.SubFactory(ResponseSetFactory)
+    value = factory.Iterator(EthnicityValues)

lung_cancer_screening/questions/tests/factories/ethnicity_response_factory.py

@@ -0,0 +1,12 @@
+import factory
+
+from .response_set_factory import ResponseSetFactory
+from ...models.gender_response import GenderResponse, GenderValues
+
+
+class GenderResponseFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = GenderResponse
+
+    response_set = factory.SubFactory(ResponseSetFactory)
+    value = factory.Iterator(GenderValues)