backend/app/workers/celery_app.py

@@ -302,6 +302,9 @@ def _resume_zombie_runs(sender=None, **_kwargs) -> None:
                 )
             )
             _db.commit()
+        except Exception:
+            _db.rollback()
+            raise
         finally:
             _db.close()
     except Exception as _e:

backend/app/workers/tasks/nspd_sync.py

@@ -18,6 +18,7 @@ UPSERT pattern:
 
 from __future__ import annotations
 
+import datetime as _dt
 import json
 import logging
 import time
@@ -179,7 +180,7 @@ def _upsert_dump(
                 "risks_count": _build_risks_count(dump),
                 "total_features": dump.total_features,
                 "features_json": json.dumps(features_json or [], ensure_ascii=False),
-                "layers_fetched": "{" + ",".join(dump.layers_fetched) + "}",
+                "layers_fetched": list(dump.layers_fetched),
                 "fetched_at_utc": dump.fetched_at_utc,
                 "harvest_duration_ms": duration_ms,
                 "harvest_error": harvest_error,
@@ -187,8 +188,6 @@ def _upsert_dump(
             }
         else:
             # Error-only row: нулевые счётчики, harvest_error filled
-            import datetime as _dt
-
             params = {
                 "quarter_cad": quarter_cad,
                 "geom_json": None,
@@ -205,7 +204,7 @@ def _upsert_dump(
                 "risks_count": 0,
                 "total_features": 0,
                 "features_json": "[]",
-                "layers_fetched": "{}",
+                "layers_fetched": [],
                 "fetched_at_utc": _dt.datetime.now(_dt.UTC).isoformat(),
                 "harvest_duration_ms": duration_ms,
                 "harvest_error": harvest_error,
@@ -214,6 +213,9 @@ def _upsert_dump(
 
         db.execute(_UPSERT_SQL, params)
         db.commit()
+    except Exception:
+        db.rollback()
+        raise
     finally:
         db.close()
 
@@ -360,8 +362,7 @@ def harvest_stale_quarters(
                 """
                 SELECT cad_number
                   FROM cad_quarters_geom
-                 WHERE region_code = :rc
+                 WHERE cad_number NOT IN (
-                   AND cad_number NOT IN (
                        SELECT quarter_cad
                          FROM nspd_quarter_dumps
                         WHERE region_code = :rc

backend/tests/test_nspd_sync.py

@@ -296,8 +296,6 @@ def test_harvest_stale_quarters_fanout(
     # Mock DB session
     mock_db = MagicMock()
     mock_session_cls.return_value = mock_db
-    mock_db.__enter__ = MagicMock(return_value=mock_db)
-    mock_db.__exit__ = MagicMock(return_value=False)
     mock_db.execute.return_value.all.return_value = [(c,) for c in stale_cads]
 
     # harvest_quarter.apply_async — проверяем что вызван для каждого cad
@@ -324,8 +322,6 @@ def test_harvest_stale_quarters_empty(
     """Нет stale кварталов → 0 enqueued, apply_async не вызван."""
     mock_db = MagicMock()
     mock_session_cls.return_value = mock_db
-    mock_db.__enter__ = MagicMock(return_value=mock_db)
-    mock_db.__exit__ = MagicMock(return_value=False)
     mock_db.execute.return_value.all.return_value = []
 
     mock_task.apply_async = MagicMock()