Skip to content

Commit

Permalink
DST-955 - Sentry error on declaration (#307)
Browse files Browse the repository at this point in the history 
Co-authored-by: Abdallah Harun <[email protected]>
  • Loading branch information
@chris-pettinga @cencorroll
chris-pettinga and cencorroll authored Jan 21, 2025
1 parent f24358f commit c7b18d0
Show file tree
Hide file tree
Showing 24 changed files with 110 additions and 81 deletions.
2 changes: 1 addition & 1 deletion django_app/report_a_suspected_breach/views/generic.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def get_context_data(self, **kwargs):
tasklist = [
{"title": "Your details", "key": "reporter_details", "url": reverse_lazy("report_a_suspected_breach:start")},
{
"title": "2. Name and address of the person or business you're reporting",
"title": "Name and address of the person or business you're reporting",
"key": "about_the_person_or_business",
"help_text": "",
"url": reverse_lazy("report_a_suspected_breach:are_you_reporting_a_business_on_companies_house"),
Expand Down
9 changes: 4 additions & 5 deletions django_app/report_a_suspected_breach/views/views_end.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from core.document_storage import TemporaryDocumentStorage
from django.conf import settings
from django.core.exceptions import SuspiciousOperation
from django.urls import reverse, reverse_lazy
from django.urls import reverse_lazy
from report_a_suspected_breach.form_step_conditions import (
show_check_company_details_page_condition,
show_name_and_business_you_work_for_page,
Expand All @@ -19,7 +19,7 @@
from utils.breach_report import get_breach_context_data
from utils.notifier import send_email
from utils.s3 import get_all_session_files
from view_a_suspected_breach.utils import craft_view_a_suspected_breach_url
from view_a_suspected_breach.utils import get_view_a_suspected_breach_url


class CheckYourAnswersView(BaseTemplateView):
Expand Down Expand Up @@ -79,9 +79,8 @@ def form_valid(self, form):
context={"user name": new_breach_object.reporter_full_name, "reference number": new_breach_object.reference},
)
# Send confirmation email to OTSI staff
view_application_url = craft_view_a_suspected_breach_url(
reverse("view_a_suspected_breach:breach_report", kwargs={"reference": new_breach_object.reference})
)
view_application_url = get_view_a_suspected_breach_url(new_breach_object.reference)

for email in settings.NEW_BREACH_REPORTED_ALERT_RECIPIENTS:
send_email(
email=email,
Expand Down
4 changes: 4 additions & 0 deletions django_app/view_a_suspected_breach/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
def craft_view_a_suspected_breach_url(path: str) -> str:
"""Crafts and returns a full, complete URL for a path in the view_a_licence_app."""
return f"{settings.PROTOCOL}{settings.VIEW_A_SUSPECTED_BREACH_DOMAIN}{path}"


def get_view_a_suspected_breach_url(reference: str) -> str:
return craft_view_a_suspected_breach_url(f"/view/view-report/{reference}/")
4 changes: 2 additions & 2 deletions tests/test_frontend/conftest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,9 @@ def create_breach(self, page, breach_details):

# Tasklist
page.get_by_role("heading", name="Report a suspected breach of trade sanctions", exact=True).click()
page.get_by_role("link", name="2. Name and address of the person or").click()
page.get_by_role("link", name="Name and address of the person or").click()

# 2. Name and address of the person or business you're reporting
# Name and address of the person or business you're reporting

if breach_details["breacher_location"] == "uk":
self.create_uk_breacher(page)
Expand Down
10 changes: 5 additions & 5 deletions ...ch/test_about_the_person_or_business_you_are_reporting/test_business_or_person_details.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ class TestAboutThePersonOrBusinessUKAddress(conftest.PlaywrightTestBase):
def test_correct_input_returns_next_step_in_task_list(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_uk_breacher(self.page)
expect(self.page).to_have_url(re.compile(rf".*/{url_paths.OVERVIEW_OF_BREACH}"))

def test_no_input_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("No", exact=True).check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -45,7 +45,7 @@ def test_incorrect_uk_postcode_returns_error(self):
breacher_address["postcode"] = "AA"
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("No", exact=True).check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -69,14 +69,14 @@ class TestAboutThePersonOrBusinessNonUKAddress(conftest.PlaywrightTestBase):
def test_correct_input_returns_when_did_you_suspect(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_non_uk_breacher(self.page)
expect(self.page).to_have_url(re.compile(rf".*/{url_paths.OVERVIEW_OF_BREACH}"))

def test_no_input_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("No", exact=True).check()
self.page.get_by_role("button", name="Continue").click()
Expand Down
4 changes: 2 additions & 2 deletions ..._breach/test_about_the_person_or_business_you_are_reporting/test_check_company_details.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TestCheckCompanyDetails(conftest.PlaywrightTestBase):
def test_details_match(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("Yes").check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -36,7 +36,7 @@ def test_details_match(self):
def test_can_change_details(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("Yes").check()
self.page.get_by_role("button", name="Continue").click()
Expand Down
18 changes: 9 additions & 9 deletions ...pected_breach/test_about_the_person_or_business_you_are_reporting/test_companies_house.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TestAreYouReportingABusinessOnCompaniesHouse(conftest.PlaywrightTestBase):
def test_no_input_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_role("button", name="Continue").click()
expect(self.page.get_by_role("heading", name="There is a problem")).to_be_visible()
Expand All @@ -27,7 +27,7 @@ def test_no_input_returns_error(self):
def test_select_yes_returns_do_you_know_registered_company_number(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("Yes").check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -36,7 +36,7 @@ def test_select_yes_returns_do_you_know_registered_company_number(self):
def test_no_returns_business_or_person_details(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("No", exact=True).check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -45,7 +45,7 @@ def test_no_returns_business_or_person_details(self):
def test_i_do_not_know_returns_business_or_person_details(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("I do not know").check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -63,7 +63,7 @@ class TestDoYouKnowTheRegisteredCompanyNumber(conftest.PlaywrightTestBase):
def test_no_input_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("Yes").check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -77,7 +77,7 @@ def test_no_input_returns_error(self):
def test_yes_and_no_input_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("Yes").check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -91,7 +91,7 @@ def test_yes_and_no_input_returns_error(self):
def test_yes_and_wrong_input_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("Yes").check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -108,7 +108,7 @@ def test_yes_and_wrong_input_returns_error(self):
def test_yes_and_correct_input_returns_check_company_details(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("Yes").check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -122,7 +122,7 @@ def test_yes_and_correct_input_returns_check_company_details(self):
def test_no_returns_address_details_page(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("Yes").check()
self.page.get_by_role("button", name="Continue").click()
Expand Down
6 changes: 3 additions & 3 deletions ...rson_or_business_you_are_reporting/test_where_is_the_address_of_the_business_or_person.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TestWhereIsTheAddressOfTheBusinessOrPerson(conftest.PlaywrightTestBase):
def test_no_input_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("No", exact=True).check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -32,7 +32,7 @@ def test_no_input_returns_error(self):
def test_uk_option_returns_uk_address_capture(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("No", exact=True).check()
self.page.get_by_role("button", name="Continue").click()
Expand All @@ -47,7 +47,7 @@ def test_uk_option_returns_uk_address_capture(self):
def test_non_uk_option_returns_non_uk_address_capture(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.page.get_by_role("heading", name="Are you reporting a business").click()
self.page.get_by_label("No", exact=True).check()
self.page.get_by_role("button", name="Continue").click()
Expand Down
4 changes: 2 additions & 2 deletions ...ontend/test_report_a_suspected_breach/test_overview_of_breach/test_what_were_the_goods.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TestWhatWereTheGoods(conftest.PlaywrightTestBase):
def test_no_input_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_non_uk_breacher(self.page)
self.page.get_by_role("link", name="Overview of the suspected breach").click()
self.create_suspected_data(self.page, exact=True)
Expand All @@ -31,7 +31,7 @@ def test_no_input_returns_error(self):
def test_correct_input_goes_to_where_were_the_goods_supplied_from(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_non_uk_breacher(self.page)
self.page.get_by_role("link", name="Overview of the suspected breach").click()
self.create_suspected_data(self.page, exact=True)
Expand Down
12 changes: 6 additions & 6 deletions ...test_report_a_suspected_breach/test_overview_of_breach/test_when_did_you_first_suspect.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TestWhenDidYouFirstSuspect(conftest.PlaywrightTestBase):
def test_correct_input_returns_sanctions_regime_breached(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_non_uk_breacher(self.page)
self.page.get_by_role("link", name="Overview of the suspected breach").click()
self.page.get_by_role("heading", name="Date you first suspected the").click()
Expand All @@ -32,7 +32,7 @@ def test_correct_input_returns_sanctions_regime_breached(self):
def test_future_date_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_non_uk_breacher(self.page)
self.page.get_by_role("link", name="Overview of the suspected breach").click()
self.page.get_by_role("heading", name="Date you first suspected the").click()
Expand All @@ -53,7 +53,7 @@ def test_future_date_returns_error(self):
def test_incorrect_date_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_non_uk_breacher(self.page)
self.page.get_by_role("link", name="Overview of the suspected breach").click()
self.page.get_by_role("heading", name="Date you first suspected the").click()
Expand All @@ -74,7 +74,7 @@ def test_incorrect_date_returns_error(self):
def test_no_exact_date_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_non_uk_breacher(self.page)
self.page.get_by_role("link", name="Overview of the suspected breach").click()
self.page.get_by_role("heading", name="Date you first suspected the").click()
Expand All @@ -89,7 +89,7 @@ def test_no_exact_date_returns_error(self):
def test_no_approx_date_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_non_uk_breacher(self.page)
self.page.get_by_role("link", name="Overview of the suspected breach").click()
self.page.get_by_role("heading", name="Date you first suspected the").click()
Expand All @@ -104,7 +104,7 @@ def test_no_approx_date_returns_error(self):
def test_no_input_returns_error(self):
self.page.get_by_role("link", name="Your details").click()
self.create_reporter_details(self.page, "I'm an owner")
self.page.get_by_role("link", name="2. Name and address of the person or").click()
self.page.get_by_role("link", name="Name and address of the person or").click()
self.create_non_uk_breacher(self.page)
self.page.get_by_role("link", name="Overview of the suspected breach").click()
self.page.get_by_role("heading", name="Date you first suspected the").click()
Expand Down
Loading

0 comments on commit c7b18d0

Please sign in to comment.