comdirect ingest: some code structurerefinement

src/models.py

@@ -4,20 +4,7 @@ from enum import Enum
 
 from pydantic import BaseModel, Field, field_validator
 
-IBAN_PATTERN = r"^[A-Z]{2}\d{2}[A-Z0-9]{11,30}$"
-
-
-class Currency(str, Enum):
-    EUR = "EUR"
-    USD = "USD"
-    GBP = "GBP"
-    CHF = "CHF"
-
-    def __str__(self):
-        return self.value
-
-    def __repr__(self):
-        return f"Currency.{self.name}"
+from src.settings.constants import IBAN_PATTERN, Currency
 
 
 class Sign(str, Enum):

src/reader.py

@@ -3,8 +3,9 @@ import re
 from enum import Enum, auto
 from pathlib import Path
 
+from settings import BANK_ACCOUNTS
 from src.models import B4wExport
-from src.settings.account_ingest import ACCOUNT_INGESTION_FUNCTIONS
+from src.settings.models import AccountInfo
 
 
 def _reader_raw(path: Path):
@@ -29,18 +30,16 @@ class EXPECT_LINE(Enum):
     DATA = auto()
 
 
+COMDIRECT_ACCOUNTS = BANK_ACCOUNTS.get("comdirect", {})
+assert isinstance(COMDIRECT_ACCOUNTS, dict)
+
 def reader_comdirect(path: Path):
-    bank_name = "comdirect"
-    ingestion_functions = ACCOUNT_INGESTION_FUNCTIONS.get(bank_name)
-    assert ingestion_functions
-    
     result = {}
     raw = _reader_raw_comdirect(path)
     for account_name, account_data in raw.items():
-        ingestion_function = ingestion_functions.get(account_name)
-        assert ingestion_function
-        result[account_name] = list(map(ingestion_function, account_data))
-
+        account = COMDIRECT_ACCOUNTS.get(account_name)
+        assert isinstance(account, AccountInfo)
+        result[account_name] = list(map(account.ingestion_function, account_data))
     return result
 
 def _reader_raw_comdirect(path: Path):

src/settings/account_ingest.py

@@ -1,10 +0,0 @@
-from src.models import ComdirectCreditCard, ComdirectDepot, ComdirectGiro
-
-ACCOUNT_INGESTION_FUNCTIONS = {
-    "comdirect": {
-        "Girokonto": lambda x: ComdirectGiro.model_validate(x),
-        "Visa-Karte (Kreditkarte)": lambda x: ComdirectCreditCard.model_validate(x),
-        "Tagesgeld PLUS-Konto": lambda x: ComdirectGiro.model_validate(x),
-        "Depot": lambda x: ComdirectDepot.model_validate(x),
-    }
-}

src/settings/constants.py

@@ -0,0 +1,18 @@
+
+from enum import Enum
+
+IBAN_PATTERN = r"^[A-Z]{2}\d{2}[A-Z0-9]{11,30}$"
+
+class Currency(str, Enum):
+    EUR = "EUR"
+    USD = "USD"
+    GBP = "GBP"
+    CHF = "CHF"
+
+    def __str__(self):
+        return self.value
+
+    def __repr__(self):
+        return f"Currency.{self.name}"
+
+

src/settings/models.py

@@ -0,0 +1,14 @@
+from collections.abc import Callable
+
+from pydantic import BaseModel, Field
+
+from src.settings.constants import IBAN_PATTERN, Currency
+
+
+class AccountInfo(BaseModel):
+    iban: str = Field(pattern=IBAN_PATTERN)
+    ingestion_function: Callable
+    currency: Currency
+
+
+