fixes

Author: denv3rr

modules/client_store.py

@@ -476,6 +476,12 @@ def bootstrap_clients_from_json() -> bool:
     create_db_and_tables()
     if not os.path.exists(CLIENTS_JSON_PATH):
         return False
+    session = SessionLocal()
+    try:
+        if session.query(models.Client).first() or session.query(models.Account).first():
+            return False
+    finally:
+        session.close()
     try:
         with open(CLIENTS_JSON_PATH, "r", encoding="ascii") as f:
             payload = json.load(f)

modules/market_data/trackers.py

@@ -338,11 +338,18 @@ def _fetch_opensky_rows() -> Tuple[List[Dict[str, Any]], List[str]]:
         warnings: List[str] = []
         now = time.time()
         min_refresh_env = os.getenv("OPENSKY_MIN_REFRESH")
+        has_oauth = bool(os.getenv("OPENSKY_CLIENT_ID") and os.getenv("OPENSKY_CLIENT_SECRET"))
         if min_refresh_env is None:
-            has_oauth = bool(os.getenv("OPENSKY_CLIENT_ID") and os.getenv("OPENSKY_CLIENT_SECRET"))
             min_refresh = 0 if has_oauth else 120
         else:
-            min_refresh = int(min_refresh_env or 0)
+            try:
+                min_refresh = int(min_refresh_env or 0)
+            except ValueError:
+                warnings.append("OpenSky min refresh must be an integer (seconds).")
+                min_refresh = 0 if has_oauth else 120
+        if min_refresh < 0:
+            warnings.append("OpenSky min refresh must be non-negative; using default.")
+            min_refresh = 0 if has_oauth else 120
         if min_refresh > 0 and (now - TrackerProviders._OPENSKY_LAST_REQUEST) < min_refresh:
             wait = int(min_refresh - (now - TrackerProviders._OPENSKY_LAST_REQUEST))
             warnings.append(f"OpenSky refresh throttled; retry in {wait}s.")

tests/test_client_store_bootstrap.py

@@ -0,0 +1,88 @@
+import json
+
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
+import core.database as database
+import core.db_management as db_management
+from core import models
+import modules.client_store as client_store
+
+
+def _setup_temp_db(tmp_path, monkeypatch):
+    db_path = tmp_path / "clients.db"
+    engine = create_engine(
+        f"sqlite:///{db_path}", connect_args={"check_same_thread": False}
+    )
+    session_local = sessionmaker(
+        autocommit=False, autoflush=False, bind=engine
+    )
+    monkeypatch.setattr(database, "engine", engine)
+    monkeypatch.setattr(database, "SessionLocal", session_local)
+    monkeypatch.setattr(db_management, "engine", engine)
+    monkeypatch.setattr(client_store, "SessionLocal", session_local)
+    return session_local
+
+
+def _write_clients_json(path, payload):
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(json.dumps(payload), encoding="ascii")
+
+
+def test_bootstrap_skips_when_db_not_empty(tmp_path, monkeypatch):
+    session_local = _setup_temp_db(tmp_path, monkeypatch)
+    db_management.create_db_and_tables()
+    session = session_local()
+    try:
+        session.add(models.Client(client_uid="c1", name="Existing Client"))
+        session.commit()
+    finally:
+        session.close()
+
+    clients_path = tmp_path / "clients.json"
+    _write_clients_json(
+        clients_path,
+        [{"client_id": "c2", "name": "Json Client", "accounts": []}],
+    )
+    monkeypatch.setattr(client_store, "CLIENTS_JSON_PATH", str(clients_path))
+
+    assert client_store.bootstrap_clients_from_json() is False
+
+    session = session_local()
+    try:
+        assert session.query(models.Client).count() == 1
+    finally:
+        session.close()
+
+
+def test_bootstrap_loads_when_db_empty(tmp_path, monkeypatch):
+    session_local = _setup_temp_db(tmp_path, monkeypatch)
+    db_management.create_db_and_tables()
+
+    clients_path = tmp_path / "clients.json"
+    _write_clients_json(
+        clients_path,
+        [
+            {
+                "client_id": "c1",
+                "name": "Json Client",
+                "accounts": [
+                    {
+                        "account_id": "a1",
+                        "account_name": "Main",
+                        "holdings": {"AAPL": 2},
+                    }
+                ],
+            }
+        ],
+    )
+    monkeypatch.setattr(client_store, "CLIENTS_JSON_PATH", str(clients_path))
+
+    assert client_store.bootstrap_clients_from_json() is True
+
+    session = session_local()
+    try:
+        assert session.query(models.Client).count() == 1
+        assert session.query(models.Account).count() == 1
+    finally:
+        session.close()

tests/test_tracker_feed.py

@@ -209,3 +209,49 @@ def json(self):
     assert points == []
     assert any("OpenSky HTTP 429" in warning for warning in warnings)
     assert TrackerProviders._OPENSKY_BACKOFF_UNTIL > time.time()
+
+
+def test_opensky_min_refresh_invalid_value(monkeypatch):
+    monkeypatch.delenv("FLIGHT_DATA_URL", raising=False)
+    monkeypatch.delenv("FLIGHT_DATA_PATH", raising=False)
+    monkeypatch.setenv("OPENSKY_MIN_REFRESH", "not-a-number")
+    monkeypatch.setenv("CLEAR_INCLUDE_COMMERCIAL", "1")
+    TrackerProviders._OPENSKY_BACKOFF_UNTIL = 0.0
+    TrackerProviders._OPENSKY_LAST_REQUEST = 0.0
+
+    class OpenSkyResponse:
+        status_code = 200
+
+        def json(self):
+            return {
+                "states": [
+                    [
+                        "abc123",
+                        "AAL123",
+                        "United States",
+                        1700000000,
+                        1700000001,
+                        -84.43,
+                        33.63,
+                        10000.0,
+                        False,
+                        200.0,
+                        90.0,
+                        0.0,
+                        None,
+                        11000.0,
+                        "1200",
+                        False,
+                        0,
+                    ]
+                ]
+            }
+
+    with mock.patch(
+        "modules.market_data.trackers.requests.get",
+        return_value=OpenSkyResponse(),
+    ) as mocked_get:
+        points, warnings = TrackerProviders.fetch_flights()
+    assert points
+    assert any("min refresh" in warning.lower() for warning in warnings)
+    mocked_get.assert_called_once()