Compare commits
No commits in common. "68d4832c2ed61a9e9c649e36b4d4e681561dfa22" and "98c47296228ed9b5f25c3a8eedf411677aa05979" have entirely different histories.
68d4832c2e
...
98c4729622
3 changed files with 5 additions and 73 deletions
|
|
@ -16,7 +16,6 @@ from __future__ import annotations
|
|||
import email
|
||||
import imaplib
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
import ssl
|
||||
from collections.abc import AsyncIterator, Iterator
|
||||
|
|
@ -153,12 +152,7 @@ def _fetch_all(creds: ImapCreds) -> Iterator[bytes]:
|
|||
|
||||
def fetch_activities(creds: ImapCreds) -> list[Activity]:
|
||||
out: list[Activity] = []
|
||||
ie_parsed = schwab_parsed = ie_skipped = skipped = 0
|
||||
exclude = {
|
||||
p.strip().lower()
|
||||
for p in os.environ.get("BROKER_SYNC_IMAP_EXCLUDE_PROVIDERS", "").split(",")
|
||||
if p.strip()
|
||||
}
|
||||
ie_parsed = schwab_parsed = skipped = 0
|
||||
for raw in _fetch_all(creds):
|
||||
try:
|
||||
msg = email.message_from_bytes(raw)
|
||||
|
|
@ -167,28 +161,17 @@ def fetch_activities(creds: ImapCreds) -> list[Activity]:
|
|||
continue
|
||||
sender = _extract_sender(msg)
|
||||
if sender in _IE_SENDERS or sender.endswith("@investengine.com"):
|
||||
if "invest-engine" in exclude or "invest_engine" in exclude:
|
||||
ie_skipped += 1
|
||||
continue
|
||||
out.extend(ie_parser.parse_invest_engine_email(raw))
|
||||
ie_parsed += 1
|
||||
elif (
|
||||
sender in _SCHWAB_SENDERS
|
||||
or sender.endswith("@schwab.com")
|
||||
or sender.endswith(".schwab.com") # e.g. donotreply@mail.schwab.com
|
||||
):
|
||||
if "schwab" in exclude:
|
||||
skipped += 1
|
||||
continue
|
||||
elif sender in _SCHWAB_SENDERS or sender.endswith("@schwab.com"):
|
||||
html = _html_or_text(msg)
|
||||
out.extend(parse_schwab_email(html))
|
||||
schwab_parsed += 1
|
||||
else:
|
||||
skipped += 1
|
||||
log.info(
|
||||
"imap: ie_parsed=%d ie_skipped=%d schwab_parsed=%d skipped=%d → %d activities",
|
||||
"imap: ie_parsed=%d schwab_parsed=%d skipped=%d → %d activities",
|
||||
ie_parsed,
|
||||
ie_skipped,
|
||||
schwab_parsed,
|
||||
skipped,
|
||||
len(out),
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ from broker_sync.providers.fidelity_planviewer import (
|
|||
gains_offset_delta_activity,
|
||||
)
|
||||
from broker_sync.providers.parsers.fidelity import (
|
||||
FidelityHolding,
|
||||
parse_transactions_html,
|
||||
parse_valuation_json,
|
||||
)
|
||||
|
|
@ -153,7 +152,8 @@ def test_provider_caches_holdings_for_cli_snapshot_push() -> None:
|
|||
# -- delta-shaped gains offset (the monthly accumulation mechanism) --
|
||||
|
||||
|
||||
def _holdings_summing_to(total: Decimal) -> list[FidelityHolding]:
|
||||
def _holdings_summing_to(total: Decimal) -> list:
|
||||
from broker_sync.providers.parsers.fidelity import FidelityHolding
|
||||
return [FidelityHolding(
|
||||
fund_code="KDOA", fund_name="Test", units=Decimal("100"),
|
||||
unit_price=total / Decimal("100"), currency="GBP", total_value=total,
|
||||
|
|
|
|||
|
|
@ -99,54 +99,3 @@ def test_non_ie_activities_passed_through_unchanged() -> None:
|
|||
routed = _split_ie_by_isa_cap([schwab_act])
|
||||
assert routed[0].account_id == "schwab-workplace"
|
||||
assert routed[0].account_type is AccountType.GIA
|
||||
|
||||
|
||||
def test_exclude_invest_engine_skips_ie_emails(monkeypatch) -> None:
|
||||
"""BROKER_SYNC_IMAP_EXCLUDE_PROVIDERS=invest-engine should skip IE messages
|
||||
so we don't duplicate IE buys already ingested via the bearer-token API path.
|
||||
Schwab routing must remain unaffected."""
|
||||
from broker_sync.providers import imap as imap_mod
|
||||
|
||||
ie_email = (
|
||||
b"From: noreply@investengine.com\r\n"
|
||||
b"Subject: VUAG Bought\r\n"
|
||||
b"Content-Type: text/plain\r\n\r\n"
|
||||
b"Vanguard S&P 500: VUAG Bought 10.0 @ 100.0 per share Total: 1000.00\r\n"
|
||||
)
|
||||
schwab_email = (
|
||||
b"From: donotreply@schwab.com\r\n"
|
||||
b"Subject: Order Confirmed\r\n"
|
||||
b"Content-Type: text/html\r\n\r\n"
|
||||
b"<html><body>no-op</body></html>\r\n"
|
||||
)
|
||||
monkeypatch.setattr(imap_mod, "_fetch_all", lambda _: [ie_email, schwab_email])
|
||||
monkeypatch.setattr(imap_mod.ie_parser, "parse_invest_engine_email",
|
||||
lambda raw: [object()])
|
||||
monkeypatch.setattr(imap_mod, "parse_schwab_email", lambda html: [object()])
|
||||
|
||||
creds = imap_mod.ImapCreds(host="h", user="u", password="p", directory="d")
|
||||
|
||||
monkeypatch.setenv("BROKER_SYNC_IMAP_EXCLUDE_PROVIDERS", "invest-engine")
|
||||
out_excluded = imap_mod.fetch_activities(creds)
|
||||
# IE skipped → only the schwab activity is emitted
|
||||
assert len(out_excluded) == 1
|
||||
|
||||
monkeypatch.delenv("BROKER_SYNC_IMAP_EXCLUDE_PROVIDERS", raising=False)
|
||||
out_default = imap_mod.fetch_activities(creds)
|
||||
# Both providers fire when env unset
|
||||
assert len(out_default) == 2
|
||||
|
||||
|
||||
def test_schwab_subdomain_sender_matches() -> None:
|
||||
"""Real Schwab trade emails come from `donotreply@mail.schwab.com`
|
||||
(subdomain), not just `donotreply@schwab.com`. The matcher must
|
||||
accept either form."""
|
||||
from broker_sync.providers.imap import _SCHWAB_SENDERS
|
||||
# Verify the static set works
|
||||
assert "donotreply@schwab.com" in _SCHWAB_SENDERS
|
||||
# Verify the subdomain suffix check
|
||||
for addr in (
|
||||
"donotreply@mail.schwab.com",
|
||||
"wealthnotify@equityawards.schwab.com",
|
||||
):
|
||||
assert addr.endswith(".schwab.com"), addr
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue