-
{% translate "Mailing address" %}
-
diff --git a/efile_app/efile/tests/test_efsp_errors.py b/efile_app/efile/tests/test_efsp_errors.py
index 04084397..1e4df9c3 100644
--- a/efile_app/efile/tests/test_efsp_errors.py
+++ b/efile_app/efile/tests/test_efsp_errors.py
@@ -76,6 +76,23 @@ def test_required_var_is_reported_as_missing():
assert "no case type was given" in message
+def test_live_other_party_address_error_says_which_party_and_field_to_fix():
+ body = {
+ "wrong_vars": [
+ {
+ "name": "other_parties[0].address.state",
+ "description": ": no match found",
+ "currentVal": "",
+ }
+ ]
+ }
+
+ message = describe_efsp_error(FakeResponse(400, body))
+
+ assert "state is required" in message
+ assert "other party 1" in message
+
+
def test_several_problems_are_all_reported():
body = {
"wrong_vars": [
diff --git a/efile_app/efile/tests/test_extracted_parties.py b/efile_app/efile/tests/test_extracted_parties.py
index a5635b22..5971a678 100644
--- a/efile_app/efile/tests/test_extracted_parties.py
+++ b/efile_app/efile/tests/test_extracted_parties.py
@@ -383,9 +383,9 @@ def test_the_party_screen_maps_sides_and_asks_only_for_what_is_missing(client, r
responding.refresh_from_db()
# The extracted defendant already covers the required defendant party type,
- # so no blank placeholder is created alongside them -- the filer is sent to
- # finish the person the document actually named.
+ # so no blank placeholder is created alongside them. Their name and mapped
+ # role are enough when this filing has no rule requiring an address.
assert responding.party_type == "defendant"
assert FilingParty.objects.filter(draft=review_draft, role="other").count() == 1
assert response.status_code == 302
- assert response.url.endswith(f"?party={responding.pk}")
+ assert response.url == reverse("payment", kwargs={"jurisdiction": "illinois"})
diff --git a/efile_app/efile/tests/test_party_address_requirements.py b/efile_app/efile/tests/test_party_address_requirements.py
new file mode 100644
index 00000000..84128ca0
--- /dev/null
+++ b/efile_app/efile/tests/test_party_address_requirements.py
@@ -0,0 +1,89 @@
+from unittest.mock import patch
+
+import pytest
+
+from efile.models import FilingDocument, FilingDraft, FilingParty
+from efile.services.party_requirements import party_address_requirement
+from efile.services.people import party_is_complete
+
+
+@pytest.fixture
+def draft(django_user_model):
+ user = django_user_model.objects.create_user(username="address-rules")
+ return FilingDraft.objects.create(
+ user=user,
+ jurisdiction="illinois",
+ court_code="court-1",
+ case_type_code="case-1",
+ case_type_name="Example case",
+ )
+
+
+@pytest.mark.django_db
+def test_blank_address_is_complete_by_default_but_partial_address_is_not(draft):
+ party = FilingParty.objects.create(
+ draft=draft,
+ role="other",
+ party_type="DEF",
+ first_name="Morgan",
+ last_name="Lee",
+ )
+
+ assert party_is_complete(party)
+ party.state = "IL"
+ assert not party_is_complete(party)
+
+
+@pytest.mark.django_db
+def test_live_party_metadata_can_require_the_address(draft):
+ party = FilingParty.objects.create(
+ draft=draft,
+ role="other",
+ party_type="DEF",
+ first_name="Morgan",
+ last_name="Lee",
+ )
+
+ requirement = party_address_requirement(
+ draft,
+ party,
+ party_types=[{"code": "DEF", "address_required": True}],
+ )
+
+ assert requirement.required
+
+
+@pytest.mark.django_db
+@pytest.mark.parametrize(
+ ("rule", "document_values"),
+ [
+ ({"required_for_party_types": ["DEF"]}, {}),
+ ({"required_for_filing_types": ["FILE-1"]}, {"filing_type_code": "FILE-1"}),
+ ({"required_for_services": ["SERVICE-1"]}, {"requested_optional_services": ["SERVICE-1"]}),
+ ],
+)
+def test_layered_config_can_require_address_by_party_filing_or_service(draft, rule, document_values):
+ party = FilingParty.objects.create(
+ draft=draft,
+ role="other",
+ party_type="DEF",
+ first_name="Morgan",
+ last_name="Lee",
+ )
+ if document_values:
+ FilingDocument.objects.create(draft=draft, role=FilingDocument.Role.LEAD, **document_values)
+
+ with (
+ patch(
+ "efile.services.party_requirements.config_loader.load_jurisdiction_config",
+ return_value={"defaults": {"party_address": {"required": False}}},
+ ),
+ patch(
+ "efile.services.party_requirements.config_loader.get_case_type_config",
+ return_value={"party_address": {**rule, "reason": "This filing needs an address."}},
+ ),
+ ):
+ requirement = party_address_requirement(draft, party)
+
+ assert requirement.required
+ assert requirement.reason == "This filing needs an address."
diff --git a/efile_app/efile/tests/test_people_flow.py b/efile_app/efile/tests/test_people_flow.py
index 8f890c11..4e79efca 100644
--- a/efile_app/efile/tests/test_people_flow.py
+++ b/efile_app/efile/tests/test_people_flow.py
@@ -7,6 +7,7 @@
from efile.models import FilingDocument, FilingDraft, FilingParty
from efile.services.current_drafts import CURRENT_DRAFT_SESSION_KEY
from efile.services.drafts import read_case_data
+from efile.services.party_requirements import AddressRequirement
from efile.services.people import guess_filer_party_type
from efile.workflow import ExistingCase, WorkflowStepKey
@@ -286,6 +287,144 @@ def test_party_details_saves_party_and_advances_to_payment_when_no_questions(cli
assert people_draft.current_step == WorkflowStepKey.PAYMENT
+@pytest.mark.django_db
+def test_party_details_saves_an_other_party_without_an_optional_address(client, people_draft):
+ FilingParty.objects.create(
+ draft=people_draft,
+ role="filer",
+ sort_order=0,
+ party_type="plaintiff",
+ first_name="Jamie",
+ last_name="Rivera",
+ address_line_1="100 State Street",
+ city="Chicago",
+ state="IL",
+ zip_code="60601",
+ )
+ party = FilingParty.objects.create(
+ draft=people_draft,
+ role="other",
+ sort_order=0,
+ party_type="defendant",
+ party_type_name="Defendant",
+ )
+
+ with patch("efile.views.party_details.get_party_types", return_value=PARTY_TYPES):
+ response = client.post(
+ f"{reverse('party_details', kwargs={'jurisdiction': 'illinois'})}?party={party.pk}",
+ {
+ "party_kind": "person",
+ "party_type": "defendant",
+ "first_name": "Morgan",
+ "last_name": "Lee",
+ },
+ )
+
+ party.refresh_from_db()
+ assert response.status_code == 302
+ assert response.url == reverse("payment", kwargs={"jurisdiction": "illinois"})
+ assert party.first_name == "Morgan"
+ assert party.address_line_1 == ""
+
+
+@pytest.mark.django_db
+def test_party_details_does_not_discard_a_saved_optional_address(client, people_draft):
+ party = FilingParty.objects.create(
+ draft=people_draft,
+ role="other",
+ sort_order=0,
+ party_type="defendant",
+ party_type_name="Defendant",
+ first_name="Morgan",
+ last_name="Lee",
+ address_line_1="200 Court Avenue",
+ city="Chicago",
+ state="IL",
+ zip_code="60602",
+ )
+
+ with patch("efile.views.party_details.get_party_types", return_value=PARTY_TYPES):
+ response = client.get(f"{reverse('party_details', kwargs={'jurisdiction': 'illinois'})}?party={party.pk}")
+
+ content = response.content.decode()
+ assert 'value="200 Court Avenue"' in content
+ assert 'value="60602"' in content
+ address_toggle = re.search(r'
]*id="add-party-address"[^>]*>', content)
+ assert address_toggle is not None
+ assert "checked" in address_toggle.group()
+ address_fields = re.search(r']*id="party-address-fields"[^>]*>', content)
+ assert address_fields is not None
+ assert "hidden" not in address_fields.group()
+
+
+@pytest.mark.django_db
+def test_optional_address_fields_start_hidden_with_checkbox_and_help(client, people_draft):
+ party = FilingParty.objects.create(
+ draft=people_draft,
+ role="other",
+ sort_order=0,
+ party_type="defendant",
+ party_type_name="Defendant",
+ first_name="Morgan",
+ last_name="Lee",
+ )
+
+ with patch("efile.views.party_details.get_party_types", return_value=PARTY_TYPES):
+ response = client.get(f"{reverse('party_details', kwargs={'jurisdiction': 'illinois'})}?party={party.pk}")
+
+ content = response.content.decode()
+ address_toggle = re.search(r']*id="add-party-address"[^>]*>', content)
+ assert address_toggle is not None
+ assert "checked" not in address_toggle.group()
+ address_fields = re.search(r']*id="party-address-fields"[^>]*>', content)
+ assert address_fields is not None
+ assert "hidden" in address_fields.group()
+ assert "Do I need to list an address?" in content
+ assert "Many filings do not require you to list an address for the opposing party" in content
+
+
+@pytest.mark.django_db
+def test_party_details_rejects_a_partial_optional_address(client, people_draft):
+ party = FilingParty.objects.create(draft=people_draft, role="other", sort_order=0)
+
+ with patch("efile.views.party_details.get_party_types", return_value=PARTY_TYPES):
+ response = client.post(
+ f"{reverse('party_details', kwargs={'jurisdiction': 'illinois'})}?party={party.pk}",
+ {
+ "party_kind": "person",
+ "party_type": "defendant",
+ "first_name": "Morgan",
+ "last_name": "Lee",
+ "state": "IL",
+ },
+ )
+
+ assert response.status_code == 200
+ assert b"Complete the optional mailing address" in response.content
+
+
+@pytest.mark.django_db
+def test_party_details_explains_a_configured_required_address(client, people_draft):
+ party = FilingParty.objects.create(draft=people_draft, role="other", sort_order=0)
+ requirement = AddressRequirement(True, "The court needs this address for service.")
+
+ with (
+ patch("efile.views.party_details.get_party_types", return_value=PARTY_TYPES),
+ patch("efile.views.party_details.party_address_requirement", return_value=requirement),
+ ):
+ response = client.get(f"{reverse('party_details', kwargs={'jurisdiction': 'illinois'})}?party={party.pk}")
+
+ content = response.content.decode()
+ assert "The court needs this address for service." in content
+ street = re.search(r']*name="address_line_1"[^>]*>', content)
+ assert street is not None
+ assert "required" in street.group()
+ assert 'id="add-party-address"' not in content
+ address_fields = re.search(r']*id="party-address-fields"[^>]*>', content)
+ assert address_fields is not None
+ assert "hidden" not in address_fields.group()
+
+
@pytest.mark.django_db
def test_party_details_returns_to_review_when_edited_from_there(client, people_draft):
FilingParty.objects.create(
diff --git a/efile_app/efile/tests/test_workflow.py b/efile_app/efile/tests/test_workflow.py
index ab721624..3bd3dc73 100644
--- a/efile_app/efile/tests/test_workflow.py
+++ b/efile_app/efile/tests/test_workflow.py
@@ -27,6 +27,8 @@ def draft(**overrides):
"existing_case": ExistingCase.NEW,
"case_questions_required": False,
"parties": [],
+ "court_code": "",
+ "case_type_code": "",
}
values.update(overrides)
return SimpleNamespace(**values)
@@ -137,6 +139,32 @@ def test_party_details_only_appear_for_incomplete_parties():
assert WorkflowStepKey.PARTY_DETAILS not in keys(get_visible_workflow(draft(parties=[complete])))
+def test_party_details_appear_when_live_party_metadata_requires_address(monkeypatch):
+ party = SimpleNamespace(
+ party_type="DEF",
+ first_name="Morgan",
+ last_name="Lee",
+ organization_name="",
+ address_line_1="",
+ city="",
+ state="",
+ zip_code="",
+ address_line_2="",
+ )
+ current_draft = draft(
+ parties=[party],
+ jurisdiction="illinois",
+ court_code="court-1",
+ case_type_code="case-1",
+ )
+ monkeypatch.setattr(
+ "efile.services.people.get_party_types",
+ lambda _draft: [{"code": "DEF", "name": "Defendant", "address_required": True}],
+ )
+
+ assert WorkflowStepKey.PARTY_DETAILS in keys(get_visible_workflow(current_draft))
+
+
def test_case_questions_only_appear_when_required():
assert WorkflowStepKey.CASE_QUESTIONS not in keys(get_visible_workflow(draft()))
assert WorkflowStepKey.CASE_QUESTIONS in keys(get_visible_workflow(draft(case_questions_required=True)))
diff --git a/efile_app/efile/views/parties.py b/efile_app/efile/views/parties.py
index debef8f1..29dc1a8f 100644
--- a/efile_app/efile/views/parties.py
+++ b/efile_app/efile/views/parties.py
@@ -84,7 +84,7 @@ def parties(request, jurisdiction):
filer.party_type_name = party_type_names.get(filer_type, filer.party_type_name)
filer.save(update_fields=["party_type", "party_type_name", "updated_at"])
ensure_required_parties(draft, party_types)
- incomplete = incomplete_parties(draft)
+ incomplete = incomplete_parties(draft, party_types=party_types)
if incomplete:
draft.current_step = WorkflowStepKey.PARTY_DETAILS
draft.save(update_fields=["current_step", "updated_at"])
@@ -103,7 +103,8 @@ def parties(request, jurisdiction):
return redirect(get_step_url(draft.current_step, jurisdiction))
roster = [
- {"party": party, "complete": party_is_complete(party)} for party in FilingParty.objects.filter(draft=draft)
+ {"party": party, "complete": party_is_complete(party, party_types=party_types)}
+ for party in FilingParty.objects.filter(draft=draft)
]
guessed_party_type = None if filer.party_type else guess_filer_party_type(draft, party_types)
context = {
diff --git a/efile_app/efile/views/party_details.py b/efile_app/efile/views/party_details.py
index 6a71b7d5..447616b5 100644
--- a/efile_app/efile/views/party_details.py
+++ b/efile_app/efile/views/party_details.py
@@ -8,7 +8,13 @@
from efile.party_sides import PartySide, side_for_party_type_name
from efile.services.current_drafts import ensure_current_draft
from efile.services.drafts import draft_snapshot
-from efile.services.people import get_case_questions, get_party_types, incomplete_parties, needs_amount_in_controversy
+from efile.services.party_requirements import address_is_blank, party_address_requirement
+from efile.services.people import (
+ get_case_questions,
+ get_party_types,
+ incomplete_parties,
+ needs_amount_in_controversy,
+)
from efile.workflow import RETURN_TO_REVIEW, WorkflowStepKey, get_step_url, get_workflow_context, with_return_to
@@ -26,6 +32,7 @@ def party_details(request, jurisdiction):
party = get_object_or_404(FilingParty, draft=draft, role="other", pk=request.GET.get("party"))
party_types = get_party_types(draft)
party_type_names = {item["code"]: item["name"] for item in party_types}
+ show_optional_address = not address_is_blank(party)
if request.method == "POST":
party_kind = request.POST.get("party_kind", "person")
@@ -35,15 +42,36 @@ def party_details(request, jurisdiction):
first_name = request.POST.get("first_name", "").strip()
last_name = request.POST.get("last_name", "").strip()
organization_name = request.POST.get("organization_name", "").strip()
- required_address = {
+ address = {
"address_line_1": request.POST.get("address_line_1", "").strip(),
"city": request.POST.get("city", "").strip(),
"state": request.POST.get("state", "").strip(),
"zip_code": request.POST.get("zip_code", "").strip(),
}
+ address_line_2 = request.POST.get("address_line_2", "").strip()
+ selected_party = FilingParty(
+ draft=draft,
+ party_type=party_type,
+ party_type_name=party_type_names.get(party_type, ""),
+ )
+ address_requirement = party_address_requirement(draft, selected_party, party_types=party_types)
+ address_started = any(address.values()) or bool(address_line_2)
+ address_complete = all(address.values())
+ show_optional_address = address_started
has_name = organization_name if party_kind == "organization" else first_name and last_name
- if not party_type or not has_name or not all(required_address.values()):
- messages.error(request, "Complete the party role, name, and mailing address.")
+ if not party_type or not has_name:
+ messages.error(request, "Complete the party role and name.")
+ elif (address_requirement.required or address_started) and not address_complete:
+ # Keep the attempted address visible when returning validation
+ # errors. These assignments only affect this rendered instance;
+ # nothing is saved until every required part is present.
+ for field, value in address.items():
+ setattr(party, field, value)
+ party.address_line_2 = address_line_2
+ if address_requirement.required:
+ messages.error(request, f"Complete the mailing address. {address_requirement.reason}")
+ else:
+ messages.error(request, "Complete the optional mailing address, or clear all of its fields.")
else:
party.party_type = party_type
party.party_type_name = party_type_names.get(party_type, party.party_type_name)
@@ -56,15 +84,15 @@ def party_details(request, jurisdiction):
party.middle_name = request.POST.get("middle_name", "").strip() if party_kind == "person" else ""
party.last_name = last_name if party_kind == "person" else ""
party.suffix = request.POST.get("suffix", "").strip() if party_kind == "person" else ""
- for field, value in required_address.items():
+ for field, value in address.items():
setattr(party, field, value)
- party.address_line_2 = request.POST.get("address_line_2", "").strip()
+ party.address_line_2 = address_line_2
party.email = request.POST.get("email", "").strip()
party.phone = request.POST.get("phone", "").strip()
party.save()
return_to = request.POST.get("return_to")
- remaining = [item for item in incomplete_parties(draft) if item.pk != party.pk]
+ remaining = [item for item in incomplete_parties(draft, party_types=party_types) if item.pk != party.pk]
if remaining:
url = reverse("party_details", kwargs={"jurisdiction": jurisdiction})
return redirect(with_return_to(f"{url}?party={remaining[0].pk}", return_to))
@@ -81,6 +109,7 @@ def party_details(request, jurisdiction):
draft.save(update_fields=["supplemental_fields", "current_step", "updated_at"])
return redirect(get_step_url(draft.current_step, jurisdiction))
+ address_requirement = party_address_requirement(draft, party, party_types=party_types)
context = {
"is_logged_in": True,
"filing_draft": draft_snapshot(draft),
@@ -89,6 +118,9 @@ def party_details(request, jurisdiction):
"party_kind": "organization" if party.organization_name else "person",
"return_to": request.GET.get("return_to", ""),
"court_code": draft.court_code,
+ "address_required": address_requirement.required,
+ "address_reason": address_requirement.reason,
+ "show_optional_address": show_optional_address,
}
context.update(get_workflow_context(WorkflowStepKey.PARTY_DETAILS, jurisdiction, draft))
return render(request, "efile/party_details.html", context)
diff --git a/efile_app/efile/workflow.py b/efile_app/efile/workflow.py
index 5d734c76..ba837afa 100644
--- a/efile_app/efile/workflow.py
+++ b/efile_app/efile/workflow.py
@@ -13,7 +13,6 @@
from enum import StrEnum
from typing import Any
-from django.db.models import Q
from django.urls import reverse
@@ -190,31 +189,19 @@ def _has_incomplete_parties(draft: Any | None) -> bool:
parties = getattr(draft, "parties", None)
if parties is None:
return bool(_draft_value(draft, "has_incomplete_parties", False))
+ from efile.services.people import get_party_types, party_is_complete
+
+ party_types = []
+ if _draft_value(draft, "court_code") and _draft_value(draft, "case_type_code"):
+ party_types = get_party_types(draft)
if hasattr(parties, "filter"):
- incomplete = (
- Q(party_type="")
- | (Q(organization_name="") & (Q(first_name="") | Q(last_name="")))
- | Q(address_line_1="")
- | Q(city="")
- | Q(state="")
- | Q(zip_code="")
- )
- return parties.filter(incomplete).exists()
+ return any(not party_is_complete(party, draft=draft, party_types=party_types) for party in parties.all())
try:
party_list = list(parties.all())
except (AttributeError, TypeError):
party_list = list(parties)
- return any(
- not (
- party.party_type
- and (party.organization_name or (party.first_name and party.last_name))
- and party.address_line_1
- and party.city
- and party.state
- and party.zip_code
- )
- for party in party_list
- )
+
+ return any(not party_is_complete(party, draft=draft, party_types=party_types) for party in party_list)
def _has_case_questions(draft: Any | None) -> bool:
diff --git a/efile_app/js-tests/filing-payload.test.js b/efile_app/js-tests/filing-payload.test.js
index de66f9d6..0761523e 100644
--- a/efile_app/js-tests/filing-payload.test.js
+++ b/efile_app/js-tests/filing-payload.test.js
@@ -295,6 +295,33 @@ test("durable non-filer parties are included without collapsing to one legacy pa
assert.strictEqual(result.other_parties.length, 2);
assert.strictEqual(result.other_parties[0].name.first, "Alex");
assert.strictEqual(result.other_parties[1].name.first, "Example LLC");
+ assert.strictEqual("address" in result.other_parties[0], false);
+ assert.strictEqual("address" in result.other_parties[1], false);
+});
+
+test("a saved optional other-party address remains in the filing payload", () => {
+ const handler = makeHandler();
+ const party = {
+ party_type: "DEF",
+ first_name: "Alex",
+ last_name: "Morgan",
+ address_line_1: "10 State Street",
+ address_line_2: "Unit 2",
+ city: "Chicago",
+ state: "IL",
+ zip_code: "60601"
+ };
+
+ const result = handler.partyFromDraft(party);
+
+ assert.deepStrictEqual(result.address, {
+ address: "10 State Street",
+ unit: "Unit 2",
+ city: "Chicago",
+ state: "IL",
+ zip: "60601",
+ country: "US"
+ });
});
test("optional services for lead and supporting documents are included in bundles", () => {