heavy refactor

tests/test_helper_db.py

@@ -1,9 +1,9 @@
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from src.helper_db import upsert_category
+from src.ingest.b4w import upsert_category
 from src.models import Category
-from src.models_db import CategoryDb
+from src.models.b4w import CategoryDb
 
 
 def test_upsert_category_returns_orm_object(db_session: Session):

tests/test_reader.py

@@ -1,18 +1,23 @@
 from pathlib import Path
 
+import pytest
+
+from src.ingest.comdirect import COMDIRECT_ACCOUNT_PARSERS, reader_comdirect
 from src.models import ComdirectCreditCard, ComdirectDepot, ComdirectGiro
-from src.reader import COMDIRECT_ACCOUNTS, reader_comdirect
 
 TEST_DATA_PATH = ".local/data/comdirect/umsaetze_9773063005_20260906-2043.csv"
 
 
+@pytest.mark.skipif(
+    not Path(TEST_DATA_PATH).exists(),
+    reason=f"Testdaten fehlen: {TEST_DATA_PATH}",
+)
 def test_reader_comdirect():
     test_path = Path(TEST_DATA_PATH)
-    assert test_path.exists()
     data = reader_comdirect(test_path)
     assert data
-    assert len(data) == len(COMDIRECT_ACCOUNTS)
-    assert set(data) == set(COMDIRECT_ACCOUNTS)
+    assert len(data) == len(COMDIRECT_ACCOUNT_PARSERS)
+    assert set(data) == set(COMDIRECT_ACCOUNT_PARSERS)
     assert all(isinstance(row, ComdirectGiro) for row in data["Girokonto"])
     assert all(
         isinstance(row, ComdirectCreditCard) for row in data["Visa-Karte (Kreditkarte)"]