Your document package is ready.
" + f"It contains {included} document(s) across " + f"{properties} {noun}.{skip_note}
" + '' + f'Download documents
' + f'This link expires in {minutes} '
+ "minutes. If the button doesn't work, paste this URL into your browser:"
+ f'
{safe_url}
Download documents
", + ) + + # Assert — a multipart/alternative carrying both the plain text and the HTML. + message = created[0].messages[0] + assert message.get_content_type() == "multipart/alternative" + plain_part = message.get_body(preferencelist=("plain",)) + html_part = message.get_body(preferencelist=("html",)) + assert plain_part is not None and "plain text fallback" in plain_part.get_content() + assert html_part is not None and "Download documents" in html_part.get_content() + + def test_send_starts_tls_and_authenticates_before_sending() -> None: # Arrange — SES SMTP rejects unauthenticated, cleartext senders, so the # transport must STARTTLS and log in with the SMTP credentials. diff --git a/tests/orchestration/test_bulk_document_download_orchestrator.py b/tests/orchestration/test_bulk_document_download_orchestrator.py index 47a071c38..01cdf9634 100644 --- a/tests/orchestration/test_bulk_document_download_orchestrator.py +++ b/tests/orchestration/test_bulk_document_download_orchestrator.py @@ -56,10 +56,19 @@ class _FakeDocuments: class _RecordingEmail: def __init__(self) -> None: - self.sent: list[tuple[str, str, str]] = [] + self.sent: list[tuple[str, str, str, Optional[str]]] = [] - def send(self, *, to: str, subject: str, body: str) -> None: - self.sent.append((to, subject, body)) + def send( + self, *, to: str, subject: str, body: str, html_body: Optional[str] = None + ) -> None: + self.sent.append((to, subject, body, html_body)) + + +class _FailingEmail: + def send( + self, *, to: str, subject: str, body: str, html_body: Optional[str] = None + ) -> None: + raise RuntimeError("smtp unreachable") def _document( @@ -114,9 +123,38 @@ def test_builds_uploads_and_emails_a_download_package(packages: S3Client) -> Non # ...the presigned URL points at that object, and the requester is emailed it. assert result.package_s3_key in result.presigned_url assert len(email.sent) == 1 - to, _subject, body = email.sent[0] + to, subject, body, html_body = email.sent[0] assert to == "user@example.com" - assert result.presigned_url in body + assert "1 documents" in subject + assert result.presigned_url in body # raw URL in the plain-text fallback + assert html_body is not None + assert "Download documents" in html_body # clean link, not the raw URL + + +def test_an_email_failure_does_not_lose_the_built_package(packages: S3Client) -> None: + # Arrange — the package builds and uploads fine, but the email transport is + # down. Best-effort delivery (ADR-0060): the URL is still returned (→ outputs). + files = [_document("LP1", "src-bucket", "surveys/a.pdf")] + orchestrator = BulkDocumentDownloadOrchestrator( + uploaded_files=_FakeUploadedFiles(files), + addresses=_FakeAddresses({"LP1": "12 Oak Street"}), + documents=_FakeDocuments({("src-bucket", "surveys/a.pdf"): b"PDF-BYTES"}), + packages=packages, + email=_FailingEmail(), + url_ttl_seconds=3600, + ) + + # Act — must not raise despite the email failure. + result = orchestrator.run( + landlord_property_ids=["LP1"], + recipient_email="user@example.com", + package_name="email-down", + ) + + # Assert — the package was still uploaded and its URL returned. + assert result.included == 1 + assert result.package_s3_key in result.presigned_url + assert packages.get_object(result.package_s3_key) # uploaded despite email failure def test_a_selection_with_no_documents_is_a_recorded_failure( diff --git a/tests/repositories/property/test_landlord_address_resolver.py b/tests/repositories/property/test_landlord_address_resolver.py index 7dcbb98da..4bc67a76f 100644 --- a/tests/repositories/property/test_landlord_address_resolver.py +++ b/tests/repositories/property/test_landlord_address_resolver.py @@ -4,7 +4,7 @@ import pytest from sqlalchemy import Engine from sqlmodel import Session -from infrastructure.postgres.property_table import PropertyRow +from backend.app.db.models.hubspot_deal_data import HubspotDealData from repositories.property.landlord_address_resolver import LandlordAddressResolver @@ -14,22 +14,26 @@ def session(db_engine: Engine) -> Iterator[Session]: yield s -def test_resolves_known_addresses_and_falls_back_for_unknowns( +def test_resolves_deal_names_and_falls_back_for_unknowns( session: Session, ) -> None: - # arrange — two properties with addresses; a third id has no property row. + # arrange — two properties with deal names; a third id has no deal. session.add( - PropertyRow(portfolio_id=1, landlord_property_id="LP1", address="12 Oak Street") + HubspotDealData( + deal_id="d1", landlord_property_id="LP1", dealname="12 Oak Street" + ) ) session.add( - PropertyRow(portfolio_id=1, landlord_property_id="LP2", address="9 Elm Road") + HubspotDealData( + deal_id="d2", landlord_property_id="LP2", dealname="9 Elm Road" + ) ) session.flush() # act resolver = LandlordAddressResolver(session, ["LP1", "LP2", "LP3"]) - # assert + # assert — the deal name becomes the folder label; unknowns fall back. assert resolver.address_for("LP1") == "12 Oak Street" assert resolver.address_for("LP2") == "9 Elm Road" assert resolver.address_for("LP3") == "address unavailable"