Improve number parsing and handle a few more events

Author: RealCLanger

pytr/event.py

@@ -6,6 +6,8 @@
 
 from babel.numbers import NumberFormatError, parse_decimal
 
+from pytr.utils import get_logger
+
 
 class EventType(Enum):
     pass
@@ -51,15 +53,14 @@ class PPEventType(EventType):
     # Dividends
     "CREDIT": PPEventType.DIVIDEND,
     "ssp_corporate_action_invoice_cash": PPEventType.DIVIDEND,
-    # Failed card transactions
-    "card_failed_transaction": PPEventType.REMOVAL,
     # Interests
     "INTEREST_PAYOUT": PPEventType.INTEREST,
     "INTEREST_PAYOUT_CREATED": PPEventType.INTEREST,
     # Removals
     "OUTGOING_TRANSFER": PPEventType.REMOVAL,
     "OUTGOING_TRANSFER_DELEGATION": PPEventType.REMOVAL,
     "PAYMENT_OUTBOUND": PPEventType.REMOVAL,
+    "card_failed_transaction": PPEventType.REMOVAL,
     "card_order_billed": PPEventType.REMOVAL,
     "card_successful_atm_withdrawal": PPEventType.REMOVAL,
     "card_successful_transaction": PPEventType.REMOVAL,
@@ -72,10 +73,37 @@ class PPEventType(EventType):
     "ORDER_EXECUTED": ConditionalEventType.TRADE_INVOICE,
     "SAVINGS_PLAN_EXECUTED": ConditionalEventType.TRADE_INVOICE,
     "SAVINGS_PLAN_INVOICE_CREATED": ConditionalEventType.TRADE_INVOICE,
+    "trading_savingsplan_executed": ConditionalEventType.TRADE_INVOICE,
     "benefits_spare_change_execution": ConditionalEventType.TRADE_INVOICE,
     "TRADE_INVOICE": ConditionalEventType.TRADE_INVOICE,
+    "TRADE_CORRECTED": ConditionalEventType.TRADE_INVOICE,
 }
 
+log = get_logger(__name__)
+
+events_known_ignored = [
+    "CUSTOMER_CREATED",
+    "DEVICE_RESET",
+    "DOCUMENTS_ACCEPTED",
+    "DOCUMENTS_CREATED",
+    "EMAIL_VALIDATED",
+    "ORDER_CANCELED",
+    "ORDER_CREATED",
+    "ORDER_EXPIRED",
+    "ORDER_REJECTED",
+    "PUK_CREATED",
+    "REFERENCE_ACCOUNT_CHANGED",
+    "SECURITIES_ACCOUNT_CREATED",
+    "VERIFICATION_TRANSFER_ACCEPTED",
+    "card_failed_verification",
+    "card_successful_verification",
+    "current_account_activated",
+    "new_tr_iban",
+    "ssp_corporate_action_informative_notification",
+    "ssp_corporate_action_invoice_shares",
+    "ssp_dividend_option_customer_instruction",
+]
+
 
 @dataclass
 class Event:
@@ -110,9 +138,14 @@ def from_dict(cls, event_dict: Dict[Any, Any]):
 
     @staticmethod
     def _parse_type(event_dict: Dict[Any, Any]) -> Optional[EventType]:
-        event_type: Optional[EventType] = tr_event_type_mapping.get(event_dict.get("eventType", ""), None)
-        if event_dict.get("status", "").lower() == "canceled":
-            event_type = None
+        eventTypeStr = event_dict.get("eventType", "")
+        event_type: Optional[EventType] = tr_event_type_mapping.get(eventTypeStr, None)
+        if event_type is not None:
+            if event_dict.get("status", "").lower() == "canceled":
+                event_type = None
+        else:
+            if eventTypeStr not in events_known_ignored:
+                log.warning(f"Ignoring event {eventTypeStr}")
         return event_type
 
     @classmethod
@@ -247,13 +280,12 @@ def _parse_float_from_detail(elem_dict: Dict[str, Any]) -> Optional[float]:
             Optional[float]: parsed float value or None
         """
         unparsed_val = elem_dict.get("detail", {}).get("text", "")
+        if unparsed_val == "":
+            return None
         parsed_val = re.sub(r"[^\,\.\d-]", "", unparsed_val)
 
-        # Try the locale that will fail more likely first.
-        if "." not in parsed_val:
-            locales = ("en", "de")
-        else:
-            locales = ("de", "en")
+        # Prefer german locale.
+        locales = ("de", "en")
 
         try:
             result = float(parse_decimal(parsed_val, locales[0], strict=True))

tests/test_parsing.py

@@ -25,6 +25,20 @@ def test(data: Dict[str, Any], number: float):
         9400.0,
     )
 
+    test(
+        {
+            "title": "Anteile",
+            "detail": {
+                "text": "1,875",
+                "trend": None,
+                "action": None,
+                "type": "text"
+            },
+            "style": "plain",
+        },
+        1.875,
+    )
+
     test(
         {
             "title": "Aktien",