Merge branch 'main' into PPHA-749-replace-fewer-with-less

Author: stephhou

Dockerfile

@@ -49,44 +49,19 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 USER root
 WORKDIR ${APP_DIR}
 
-# Install system dependencies needed for Playwright
-RUN apt-get update && apt-get install -y \
-    fonts-liberation \
-    libasound2 \
-    libatk-bridge2.0-0 \
-    libatk1.0-0 \
-    libatspi2.0-0 \
-    libcups2 \
-    libdbus-1-3 \
-    libdrm2 \
-    libexpat1 \
-    libgbm1 \
-    libglib2.0-0 \
-    libgtk-3-0 \
-    libnspr4 \
-    libnss3 \
-    libx11-6 \
-    libxcomposite1 \
-    libxdamage1 \
-    libxext6 \
-    libxfixes3 \
-    libxrandr2 \
-    libxss1 \
-    libxtst6 \
-    xdg-utils \
-    && rm -rf /var/lib/apt/lists/*
-
 ENV POETRY_NO_INTERACTION=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
     POETRY_VIRTUALENVS_CREATE=1 \
     POETRY_CACHE_DIR=/tmp/poetry_cache \
     PLAYWRIGHT_BROWSERS_PATH=${APP_DIR}/browsers
 
 COPY pyproject.toml poetry.lock ./
-RUN pip install poetry
-RUN poetry install --no-root && rm -rf $POETRY_CACHE_DIR
-RUN poetry run playwright install --with-deps chromium
-RUN chown -R ${USER}:${USER} ${APP_DIR}
+
+RUN pip install --no-cache-dir poetry \
+    && poetry install --no-root && rm -rf $POETRY_CACHE_DIR \
+    && poetry run playwright install --with-deps chromium \
+    && chown -R ${USER}:${USER} ${APP_DIR} \
+    && rm -rf /root/.cache/pip /tmp/*
 
 USER ${USER}
 COPY --chown=${USER}:${USER} . .

lung_cancer_screening/questions/forms/periods_when_you_stopped_smoking_form.py

@@ -31,7 +31,7 @@ def __init__(self, *args, **kwargs):
 
         self.fields["duration_years"] = IntegerField(
             label=self.duration_years_label(),
-            label_classes="nhsuk-fieldset__legend--s",
+            label_classes="nhsuk-label--s",
             classes="nhsuk-input--width-4",
             hint=self.duration_years_hint(),
             required=False,

lung_cancer_screening/questions/models/periods_when_you_stopped_smoking_response.py

@@ -56,8 +56,11 @@ def _validate_duration_years_is_less_than_time_they_have_smoked(self):
             return None
 
         if self.duration_years > self.response_set.age_when_started_smoking_response.years_smoked_including_stopped():
-            raise ValidationError(
-                {
-                    "duration_years": "The number of years you stopped smoking must be fewer than the total number of years you have been smoking"
-                }
-            )
+            if self.response_set.current_smoker():
+                message = "The number of years you stopped smoking must be fewer than the total number of years you have been smoking"
+            else:
+                message = "The number of years you stopped or quit smoking must be fewer than the total number of years you smoked"
+
+            raise ValidationError({
+                "duration_years": message
+            })

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

@@ -7,6 +7,8 @@
 from ...factories.periods_when_you_stopped_smoking_response_factory import PeriodsWhenYouStoppedSmokingResponseFactory
 from ...factories.date_of_birth_response_factory import DateOfBirthResponseFactory
 from ...factories.age_when_started_smoking_response_factory import AgeWhenStartedSmokingResponseFactory
+from ...factories.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
+
 from ....models.periods_when_you_stopped_smoking_response import PeriodsWhenYouStoppedSmokingResponse
 
 
@@ -135,12 +137,17 @@ def test_is_invalid_if_they_havent_answered_age_started_smoking(self):
         )
 
 
-    def test_is_invalid_if_duration_years_is_longer_than_time_they_have_smoked(self):
+    def test_is_invalid_if_duration_years_is_longer_than_time_they_have_smoked_and_they_are_a_current_smoker(self):
         self.date_of_birth_response.value = datetime.today() - relativedelta(years=55)
         self.date_of_birth_response.save()
         self.age_when_started_smoking_response.value = 18
         self.age_when_started_smoking_response.save()
 
+        HaveYouEverSmokedResponseFactory.create(
+            response_set=self.response_set,
+            current_smoker=True,
+        )
+
         response = PeriodsWhenYouStoppedSmokingResponseFactory.build(
             response_set=self.response_set,
             value=True,
@@ -153,3 +160,28 @@ def test_is_invalid_if_duration_years_is_longer_than_time_they_have_smoked(self)
             context.exception.messages[0],
             "The number of years you stopped smoking must be fewer than the total number of years you have been smoking",
         )
+
+
+    def test_is_invalid_if_duration_years_is_longer_than_time_they_have_smoked_and_they_are_a_former_smoker(self):
+        self.date_of_birth_response.value = datetime.today() - relativedelta(years=55)
+        self.date_of_birth_response.save()
+        self.age_when_started_smoking_response.value = 18
+        self.age_when_started_smoking_response.save()
+
+        HaveYouEverSmokedResponseFactory.create(
+            response_set=self.response_set,
+            former_smoker=True,
+        )
+
+        response = PeriodsWhenYouStoppedSmokingResponseFactory.build(
+            response_set=self.response_set,
+            value=True,
+            duration_years=self.date_of_birth_response.age_in_years() - self.age_when_started_smoking_response.value + 1
+        )
+        with self.assertRaises(ValidationError) as context:
+            response.full_clean()
+
+        self.assertEqual(
+            context.exception.messages[0],
+            "The number of years you stopped or quit smoking must be fewer than the total number of years you smoked",
+        )