Skip to content

PPHA-602: Fix smoking change journey redirects #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Themitchell wants to merge 4 commits into
base: main
Choose a base branch
from
+204 −18
Open

PPHA-602: Fix smoking change journey redirects #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a34f82
PPHA-602: Ensure change smoking history redirect to responses
Themitchell Mar 26, 2026
389b286
PPHA-602: Fix smoking no change redirect when changing responses
Themitchell Mar 26, 2026
cf1406c
fix:removed wip tag
stephhou Mar 27, 2026
611911e
PPHA-602: Fix smoking no change redirect when changing responses
Themitchell Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 95 additions & 2 deletions features/smoking_history.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ Feature: Smoking history pages
And I see "2 cigarillos a month" as a response to "Current cigarillo smoking" under "Cigarillo smoking history"
And I see "4 cigarillos a week for 3 years" as a response to "When you smoked more than 2 cigarillos a month" under "Cigarillo smoking history"

# Change cigarette smoking history
# Change cigarette smoking history with increased and decreased
When I click the link to change "Cigarette" smoking history

Then I am on "/cigarettes-smoking-current?change=True"
Expand Down Expand Up @@ -419,9 +419,102 @@ Feature: Smoking history pages
And I submit the form

Then I am on "/cigarettes-smoked-increased-years?change=True"
When I submit the form

When I go to "/check-your-answers"
Then I am on "/cigarettes-smoking-decreased-frequency?change=True"
When I submit the form

Then I am on "/cigarettes-smoked-decreased-amount?change=True"
When I submit the form

Then I am on "/cigarettes-smoked-decreased-years?change=True"
When I submit the form

Then I am on "/check-your-answers"
Then I see "17 years" as a response to "Total number of years you smoked cigarettes" under "Cigarette smoking history"
And I see "25 cigarettes a month" as a response to "Current cigarette smoking" under "Cigarette smoking history"

And I see "40 cigarettes a day for 5 years" as a response to "When you smoked more than 25 cigarettes a month" under "Cigarette smoking history"

# Change medium cigars with decreased
When I click the link to change "Medium cigar" smoking history

Then I am on "/medium-cigars-smoking-current?change=True"
When I submit the form

Then I am on "/medium-cigars-smoked-total-years?change=True"
When I submit the form

Then I am on "/medium-cigars-smoking-frequency?change=True"
When I submit the form

Then I am on "/medium-cigars-smoked-amount?change=True"
When I submit the form

Then I am on "/medium-cigars-smoking-change?change=True"
When I submit the form

Then I am on "/medium-cigars-smoking-decreased-frequency?change=True"
When I submit the form

Then I am on "/medium-cigars-smoked-decreased-amount?change=True"
When I submit the form

Then I am on "/medium-cigars-smoked-decreased-years?change=True"
When I submit the form

Then I am on "/check-your-answers"

# Change cigarillos with increased
When I click the link to change "Cigarillo" smoking history

Then I am on "/cigarillos-smoking-current?change=True"
When I submit the form

Then I am on "/cigarillos-smoked-total-years?change=True"
When I submit the form

Then I am on "/cigarillos-smoking-frequency?change=True"
When I submit the form

Then I am on "/cigarillos-smoked-amount?change=True"
When I submit the form

Then I am on "/cigarillos-smoking-change?change=True"
When I submit the form

Then I am on "/cigarillos-smoking-increased-frequency?change=True"
When I submit the form

Then I am on "/cigarillos-smoked-increased-amount?change=True"
When I submit the form

Then I am on "/cigarillos-smoked-increased-years?change=True"
When I submit the form

Then I am on "/check-your-answers"

# Change cigarettes change to no change
When I click the link to change "Cigarette" smoking history

Then I am on "/cigarettes-smoking-current?change=True"
When I submit the form

Then I am on "/cigarettes-smoked-total-years?change=True"
When I submit the form

Then I am on "/cigarettes-smoking-frequency?change=True"
When I submit the form

Then I am on "/cigarettes-smoked-amount?change=True"
When I submit the form

Then I am on "/cigarettes-smoking-change?change=True"
When I uncheck "Yes, I used to smoke more than 25 cigarettes a month"
And I uncheck "Yes, I used to smoke fewer than 25 cigarettes a month"
And I check "No, it has not changed"
When I submit the form

Then I am on "/check-your-answers"


68 changes: 66 additions & 2 deletions lung_cancer_screening/questions/tests/unit/views/test_smoked_total_years.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ def test_creates_a_smoked_total_years_response(self):
)


def test_redirects_to_frequency_by_default(self):
def test_redirects_to_frequency_if_level_is_normal(self):
response = self.client.post(
reverse("questions:smoked_total_years", kwargs = {
"tobacco_type": TobaccoSmokingHistoryTypes.CIGARETTES.value.lower()
Expand Down Expand Up @@ -348,7 +348,7 @@ def test_redirects_to_responses_if_the_smoking_history_change_item_is_increased_
self.assertRedirects(response, reverse("questions:responses"))


def test_redirects_to_the_next_type_if_the_smoking_history_change_item_is_increased_and_there_is_another_type_of_tobacco_smoking_history(self):
def test_redirects_to_the_next_type_if_level_is_increased_and_there_is_another_type_of_tobacco_smoking_history(self):
increased = TobaccoSmokingHistoryFactory.create(
response_set=self.response_set,
type=self.tobacco_smoking_history.type,
Expand Down Expand Up @@ -497,6 +497,70 @@ def test_redirects_to_next_question_forwarding_the_change_query_param(self):
)


def test_redirects_to_responses_if_increased_level_and_change_true_and_no_decreased_and_another_type_exists(self):
self.tobacco_smoking_history.delete()
TobaccoSmokingHistoryFactory.create(
response_set=self.response_set,
small_cigars=True,
complete=True,
normal=True,
)
normal = TobaccoSmokingHistoryFactory.create(
response_set=self.response_set,
cigarettes=True,
complete=True,
normal=True,
)
increased = TobaccoSmokingHistoryFactory.create(
response_set=self.response_set,
type=normal.type,
complete=True,
increased=True,
)

response = self.client.post(
reverse("questions:smoked_total_years", kwargs = {
"tobacco_type": increased.url_type(),
"level": increased.level,
}),
{**self.valid_params, "change": "True"}
)

self.assertRedirects(response, reverse("questions:responses"))


def test_redirects_to_response_if_decreased_level_and_change_true_and_another_type_exists(self):
self.tobacco_smoking_history.delete()
TobaccoSmokingHistoryFactory.create(
response_set=self.response_set,
small_cigars=True,
complete=True,
normal=True,
)
normal = TobaccoSmokingHistoryFactory.create(
response_set=self.response_set,
cigarettes=True,
complete=True,
normal=True,
)
decreased = TobaccoSmokingHistoryFactory.create(
response_set=self.response_set,
type=normal.type,
complete=True,
decreased=True,
)

response = self.client.post(
reverse("questions:smoked_total_years", kwargs = {
"tobacco_type": decreased.url_type(),
"level": decreased.level,
}),
{**self.valid_params, "change": "True"}
)

self.assertRedirects(response, reverse("questions:responses"))


def test_responds_with_422_if_the_response_fails_to_create(self):
response = self.client.post(
reverse("questions:smoked_total_years", kwargs = {
Expand Down
25 changes: 25 additions & 0 deletions lung_cancer_screening/questions/tests/unit/views/test_smoking_change.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,31 @@ def test_redirects_to_the_next_question_given_level_decreased_only(self):
}))


def test_redirects_to_responses_if_change_true_and_no_change_is_selected_and_another_type_exists(self):
Copy link
Copy Markdown
Contributor

@jamiefalcus jamiefalcus Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

duplicate of previous test

self.tobacco_smoking_history.delete()
TobaccoSmokingHistoryFactory.create(
response_set=self.response_set,
small_cigars=True,
complete=True,
normal=True,
)
normal = TobaccoSmokingHistoryFactory.create(
response_set=self.response_set,
cigarettes=True,
complete=True,
normal=True,
)

response = self.client.post(
reverse("questions:smoking_change", kwargs = {
"tobacco_type": normal.url_type()
}),
{"value": [TobaccoSmokingHistory.Levels.NO_CHANGE], "change": "True"}
)

self.assertRedirects(response, reverse("questions:responses"))


def test_creates_a_smoking_change_response(self):
self.client.post(
reverse("questions:smoking_change", kwargs = {
Expand Down
15 changes: 8 additions & 7 deletions lung_cancer_screening/questions/views/smoked_total_years.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,14 @@ def get_context_data(self, **kwargs):
return context


def has_decreased_level(self):
return self.request.response_set.tobacco_smoking_history.filter(
type=self.tobacco_smoking_history_item().type,
).decreased().exists()


def get_success_url(self):
# Total years is the first question of a normal smoking hitory
if self.tobacco_smoking_history_item().is_normal():
return reverse(
"questions:smoking_frequency",
Expand All @@ -66,7 +73,7 @@ def get_success_url(self):
query=self.get_change_query_params(),
)

if self.next_unanswered_history():
if self.next_unanswered_history() and not self.should_redirect_to_responses(self.request):
return reverse(
"questions:smoking_current",
kwargs={
Expand All @@ -93,12 +100,6 @@ def get_back_link_url(self):
)


def has_decreased_level(self):
return self.request.response_set.tobacco_smoking_history.filter(
type=self.tobacco_smoking_history_item().type,
).decreased().exists()


def prerequisite_responses(self):
if self.tobacco_smoking_history_item().is_normal():
return [
Expand Down
17 changes: 10 additions & 7 deletions lung_cancer_screening/questions/views/smoking_change.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,16 @@ def form_valid(self, form):
def get_success_url(self):
if self.next_smoking_history():
if self.next_smoking_history().is_normal():
return reverse(
"questions:smoking_current",
kwargs={
"tobacco_type": self.next_smoking_history().url_type(),
},
query=self.get_change_query_params(),
)
if self.should_redirect_to_responses(self.request):
return reverse("questions:responses")
else:
return reverse(
"questions:smoking_current",
kwargs={
"tobacco_type": self.next_smoking_history().url_type(),
},
query=self.get_change_query_params(),
)
else:
return reverse(
"questions:smoking_frequency",
Expand Down
Loading