x
").write_pdf() + except (OSError, ImportError) as e: + return False, str(e) + return True, "" + + +_WP_OK, _WP_ERR = _weasyprint_native_libs_available() +_skip_if_no_weasyprint = pytest.mark.skipif( + not _WP_OK, reason=f"WeasyPrint native libs missing: {_WP_ERR}" +) + # Шесть ожидаемых заголовков блоков (по одному на содержательную секцию §13). _EXPECTED_TITLES: tuple[str, ...] = ( _TITLE_SUMMARY, @@ -133,6 +160,7 @@ def _full_report() -> SiteFinderReport: # ── Полный отчёт: PDF-байты (магия %PDF), нетривиальная длина ─────────────────── +@_skip_if_no_weasyprint class TestFullReportExport: def test_returns_pdf_magic_bytes(self) -> None: payload = export_report_pdf(_full_report()) @@ -195,6 +223,7 @@ class TestRenderedHtmlContent: class TestGracefulPartialReport: + @_skip_if_no_weasyprint def test_empty_report_still_valid_pdf(self) -> None: # Полностью дефолтный (пустой) отчёт — валидный PDF, не падает. payload = export_report_pdf(SiteFinderReport()) @@ -208,6 +237,7 @@ class TestGracefulPartialReport: # ADVISORY-маркер остаётся даже у пустого отчёта. assert "ADVISORY" in html_str + @_skip_if_no_weasyprint def test_partial_report_some_sections(self) -> None: # Заполнены только meta + exec_summary — остальные пусты, PDF валиден. report = SiteFinderReport( @@ -220,6 +250,7 @@ class TestGracefulPartialReport: assert "Тонкий анализ" in html_str assert "66:41:0000000:2" in html_str + @_skip_if_no_weasyprint def test_garbage_input_does_not_crash(self) -> None: # Мусор (None / не-отчёт) → пустой, но валидный PDF (нормализация в {}). for junk in (None, 123, "not a report"): diff --git a/backend/tests/services/test_cadastre_bulk.py b/backend/tests/services/test_cadastre_bulk.py index 952a8891..7659aaf4 100644 --- a/backend/tests/services/test_cadastre_bulk.py +++ b/backend/tests/services/test_cadastre_bulk.py @@ -391,7 +391,7 @@ def test_upsert_parcel_sql_uses_st_multi_for_multipolygon_schema() -> None: db = MagicMock() executed_sqls: list[str] = [] - db.execute = lambda stmt, params=None: (executed_sqls.append(str(stmt)) or MagicMock()) + db.execute = lambda stmt, params=None: executed_sqls.append(str(stmt)) or MagicMock() upsert_parcel(db, _make_parcel_feature(), source="search") @@ -423,13 +423,23 @@ async def test_harvest_quarter_does_not_early_exit_on_shared_phase_done() -> Non ) db = MagicMock() - # Симулируем shared phase_state с phase=done от ДРУГОГО quarter + # Симулируем shared phase_state с phase=done от ДРУГОГО quarter. + # xmin=None → quarter_bbox_3857 (grid-walk geometry helper) вернёт None → + # grid-walk + territorial_zones фазы корректно пропускаются (тест про + # snapshot/idempotency, не про geometry). Тот же dict возвращается на ВСЕ + # db.execute().mappings().first() в этом тесте. db.execute = MagicMock( return_value=MagicMock( mappings=MagicMock( return_value=MagicMock( first=MagicMock( - return_value={"phase_state": {"phase": "done", "quarter": "66:41:9999999"}} + return_value={ + "phase_state": {"phase": "done", "quarter": "66:41:9999999"}, + "xmin": None, + "ymin": None, + "xmax": None, + "ymax": None, + } ) ) ) @@ -479,10 +489,24 @@ async def test_harvest_quarter_calls_upsert_features() -> None: db = MagicMock() # phase_state = None → начинаем с нуля + # xmin=None → quarter_bbox_3857 (grid-walk geometry helper) вернёт None → + # grid-walk + territorial_zones фазы пропускаются (тесты про snapshot / + # per-cat-probe, не про geometry). Тот же dict на ВСЕ + # db.execute().mappings().first() вызовы. db.execute = MagicMock( return_value=MagicMock( mappings=MagicMock( - return_value=MagicMock(first=MagicMock(return_value={"phase_state": None})) + return_value=MagicMock( + first=MagicMock( + return_value={ + "phase_state": None, + "xmin": None, + "ymin": None, + "xmax": None, + "ymax": None, + } + ) + ) ) ) ) @@ -669,10 +693,24 @@ async def test_harvest_quarter_calls_per_cat_probe_for_zouit_when_meta_nonzero() ) db = MagicMock() + # xmin=None → quarter_bbox_3857 (grid-walk geometry helper) вернёт None → + # grid-walk + territorial_zones фазы пропускаются (тесты про snapshot / + # per-cat-probe, не про geometry). Тот же dict на ВСЕ + # db.execute().mappings().first() вызовы. db.execute = MagicMock( return_value=MagicMock( mappings=MagicMock( - return_value=MagicMock(first=MagicMock(return_value={"phase_state": None})) + return_value=MagicMock( + first=MagicMock( + return_value={ + "phase_state": None, + "xmin": None, + "ymin": None, + "xmax": None, + "ymax": None, + } + ) + ) ) ) ) @@ -730,10 +768,24 @@ async def test_harvest_quarter_skips_per_cat_probe_when_meta_zero() -> None: ) db = MagicMock() + # xmin=None → quarter_bbox_3857 (grid-walk geometry helper) вернёт None → + # grid-walk + territorial_zones фазы пропускаются (тесты про snapshot / + # per-cat-probe, не про geometry). Тот же dict на ВСЕ + # db.execute().mappings().first() вызовы. db.execute = MagicMock( return_value=MagicMock( mappings=MagicMock( - return_value=MagicMock(first=MagicMock(return_value={"phase_state": None})) + return_value=MagicMock( + first=MagicMock( + return_value={ + "phase_state": None, + "xmin": None, + "ymin": None, + "xmax": None, + "ymax": None, + } + ) + ) ) ) ) @@ -786,10 +838,24 @@ async def test_harvest_quarter_per_cat_probe_enk_called_when_meta_nonzero() -> N ) db = MagicMock() + # xmin=None → quarter_bbox_3857 (grid-walk geometry helper) вернёт None → + # grid-walk + territorial_zones фазы пропускаются (тесты про snapshot / + # per-cat-probe, не про geometry). Тот же dict на ВСЕ + # db.execute().mappings().first() вызовы. db.execute = MagicMock( return_value=MagicMock( mappings=MagicMock( - return_value=MagicMock(first=MagicMock(return_value={"phase_state": None})) + return_value=MagicMock( + first=MagicMock( + return_value={ + "phase_state": None, + "xmin": None, + "ymin": None, + "xmax": None, + "ymax": None, + } + ) + ) ) ) ) @@ -1091,10 +1157,24 @@ async def test_harvest_quarter_geom_heal_failure_does_not_propagate() -> None: ) db = MagicMock() + # xmin=None → quarter_bbox_3857 (grid-walk geometry helper) вернёт None → + # grid-walk + territorial_zones фазы пропускаются (тесты про snapshot / + # per-cat-probe, не про geometry). Тот же dict на ВСЕ + # db.execute().mappings().first() вызовы. db.execute = MagicMock( return_value=MagicMock( mappings=MagicMock( - return_value=MagicMock(first=MagicMock(return_value={"phase_state": None})) + return_value=MagicMock( + first=MagicMock( + return_value={ + "phase_state": None, + "xmin": None, + "ymin": None, + "xmax": None, + "ymax": None, + } + ) + ) ) ) ) diff --git a/backend/tests/sql/test_mv_layout_velocity_weighted_avg.py b/backend/tests/sql/test_mv_layout_velocity_weighted_avg.py index 4dd7a2b0..47d97da7 100644 --- a/backend/tests/sql/test_mv_layout_velocity_weighted_avg.py +++ b/backend/tests/sql/test_mv_layout_velocity_weighted_avg.py @@ -9,23 +9,53 @@ Uses psycopg v3 (never psycopg2) with a temporary table containing known data. All bind parameters use CAST(:x AS type) — never :x::type. """ +import os from decimal import Decimal import psycopg import pytest +# --------------------------------------------------------------------------- +# DSN + skip guard +# +# This is an INTEGRATION test — it needs a real PostgreSQL (it CREATE TEMP TABLE +# and runs the weighted-AVG SQL). On CI (Docker) Postgres is reachable; on a dev +# laptop without the SSH tunnel it is not. We: +# 1. Prefer TEST_DATABASE_URL (mirror tests/integration/conftest.py), then +# DATABASE_URL — but normalize the SQLAlchemy dialect suffix `+psycopg`, +# which psycopg.connect() cannot parse (other test modules set DATABASE_URL +# to `postgresql+psycopg://...` via os.environ.setdefault → ProgrammingError). +# 2. Probe connectivity at import time; if the DB is unreachable, SKIP the whole +# module cleanly (never ERROR). On CI the probe succeeds → tests run, so the +# #295 weighted-AVG regression stays guarded. +# --------------------------------------------------------------------------- -# --------------------------------------------------------------------------- -# Fixture: connect to the test / local DB via env-var DATABASE_URL, -# fall back to the tunnel URL used in local dev. -# --------------------------------------------------------------------------- def _get_dsn() -> str: - import os - return os.environ.get( + raw = os.environ.get("TEST_DATABASE_URL") or os.environ.get( "DATABASE_URL", "postgresql://gendesign@localhost:15432/gendesign", ) + # SQLAlchemy dialect form `postgresql+psycopg://` → plain libpq DSN for psycopg. + return raw.replace("+psycopg", "") + + +def _db_reachable() -> tuple[bool, str]: + try: + with psycopg.connect(_get_dsn(), connect_timeout=3): + return True, "" + except Exception as e: # OperationalError / ProgrammingError / etc. + return False, str(e) + + +_DB_OK, _DB_ERR = _db_reachable() +pytestmark = pytest.mark.skipif( + not _DB_OK, + reason=( + "Нет доступной plain-postgres БД (TEST_DATABASE_URL/DATABASE_URL) — " + f"интеграционный тест #295 пропущен off-CI: {_DB_ERR}" + ), +) @pytest.fixture() @@ -79,6 +109,7 @@ ORDER BY room_bucket; # Test cases # --------------------------------------------------------------------------- + class TestWeightedAvgFormula: """Unit-level verification of the count-weighted formula using a temp table.""" @@ -98,8 +129,8 @@ class TestWeightedAvgFormula: cur.execute(_CREATE_TEMP) rows = [ ("studio", 10, 25.0, 180.0), - ("studio", 0, 0.0, 0.0), - ("studio", 0, 0.0, 0.0), + ("studio", 0, 0.0, 0.0), + ("studio", 0, 0.0, 0.0), ] cur.executemany(_INSERT_ROW, rows) cur.execute(_WEIGHTED_QUERY) @@ -131,9 +162,7 @@ class TestWeightedAvgFormula: assert weighted_area != naive_area assert weighted_price != naive_price - def test_weighted_differs_from_naive_sparse_project( - self, conn: psycopg.Connection - ) -> None: + def test_weighted_differs_from_naive_sparse_project(self, conn: psycopg.Connection) -> None: """ Scenario inspired by real data: 3-room flat, project with 5 deals spread across 5 active months out of 15 total months. @@ -150,7 +179,7 @@ class TestWeightedAvgFormula: result = cur.fetchone() assert result is not None - room, total_deals, naive_area, weighted_area, naive_price, weighted_price = result + room, total_deals, naive_area, weighted_area, _naive_price, weighted_price = result assert room == "3" assert total_deals == 5 @@ -164,13 +193,9 @@ class TestWeightedAvgFormula: # Correction factor > 2x ratio = float(weighted_area) / float(naive_area) - assert ratio > 2.5, ( - f"Expected correction factor > 2.5x for sparse project, got {ratio:.2f}" - ) + assert ratio > 2.5, f"Expected correction factor > 2.5x for sparse project, got {ratio:.2f}" - def test_no_zero_months_weighted_equals_naive( - self, conn: psycopg.Connection - ) -> None: + def test_no_zero_months_weighted_equals_naive(self, conn: psycopg.Connection) -> None: """ When every month has deals, weighted and naive AVG should be equal (within numeric(10,2) rounding) only if counts are uniform. @@ -199,9 +224,7 @@ class TestWeightedAvgFormula: ) assert weighted_price == naive_price - def test_nullif_prevents_division_by_zero( - self, conn: psycopg.Connection - ) -> None: + def test_nullif_prevents_division_by_zero(self, conn: psycopg.Connection) -> None: """ When all months have 0 deals, NULLIF(SUM(cnt), 0) → NULL instead of divide-by-zero. The buggy AVG() also returns 0 (not NULL) for all-zero rows, which is arguably @@ -218,7 +241,7 @@ class TestWeightedAvgFormula: result = cur.fetchone() assert result is not None - _, total_deals, naive_area, weighted_area, naive_price, weighted_price = result + _, total_deals, naive_area, weighted_area, _naive_price, weighted_price = result assert total_deals == 0 # Weighted formula returns NULL for all-zero-deal case (correct — no real data) @@ -231,9 +254,7 @@ class TestWeightedAvgFormula: # Naive AVG returns 0.00 — a misleading non-NULL value assert naive_area == Decimal("0.00") - def test_hand_computed_weighted_average( - self, conn: psycopg.Connection - ) -> None: + def test_hand_computed_weighted_average(self, conn: psycopg.Connection) -> None: """ End-to-end hand-computed check with multiple room buckets and mixed deal counts to verify the formula is exactly correct. @@ -247,11 +268,11 @@ class TestWeightedAvgFormula: with conn.cursor() as cur: cur.execute(_CREATE_TEMP) rows = [ - ("studio", 8, 30.0, 160.0), + ("studio", 8, 30.0, 160.0), ("studio", 12, 28.0, 170.0), - ("studio", 3, 27.0, 155.0), - ("1", 15, 38.0, 175.0), - ("1", 5, 40.0, 180.0), + ("studio", 3, 27.0, 155.0), + ("1", 15, 38.0, 175.0), + ("1", 5, 40.0, 180.0), ] cur.executemany(_INSERT_ROW, rows) cur.execute(_WEIGHTED_QUERY) diff --git a/backend/tests/test_admin_weight_profiles.py b/backend/tests/test_admin_weight_profiles.py index c3bad23a..da53c58d 100644 --- a/backend/tests/test_admin_weight_profiles.py +++ b/backend/tests/test_admin_weight_profiles.py @@ -404,8 +404,18 @@ def test_list_profiles_with_system_service(monkeypatch: pytest.MonkeyPatch) -> N # ── Auth ─────────────────────────────────────────────────────────────────────── +_TOKEN_REMOVED_REASON = ( + "App-level X-Admin-Token header удалён 2026-05-23 (см. docstring " + "app/api/v1/admin_weight_profiles.py: Caddy basic_auth PR #426 + RBAC достаточны, " + "двойная auth избыточна). Endpoint больше не несёт verify_admin_token dependency. " + "В test-mode RBAC bypass'ится (CI-rehab 1/3) → 401 здесь недостижим без реверта " + "security-решения. Тест проверял удалённое поведение." +) + + +@pytest.mark.skip(reason=_TOKEN_REMOVED_REASON) def test_unauthorized_no_token(monkeypatch: pytest.MonkeyPatch) -> None: - """Запрос без X-Admin-Token → 401 (или 503 если токен не задан в settings).""" + """Запрос без X-Admin-Token → 401 (устарело: токен-гейт удалён 2026-05-23).""" monkeypatch.setattr("app.core.config.settings.scrape_admin_token", _ADMIN_TOKEN) client = TestClient(app) r = client.get( @@ -416,8 +426,9 @@ def test_unauthorized_no_token(monkeypatch: pytest.MonkeyPatch) -> None: assert r.status_code == 401 +@pytest.mark.skip(reason=_TOKEN_REMOVED_REASON) def test_unauthorized_wrong_token(monkeypatch: pytest.MonkeyPatch) -> None: - """Неверный X-Admin-Token → 401.""" + """Неверный X-Admin-Token → 401 (устарело: токен-гейт удалён 2026-05-23).""" monkeypatch.setattr("app.core.config.settings.scrape_admin_token", _ADMIN_TOKEN) client = TestClient(app) r = client.get( diff --git a/backend/tests/test_layout_tz_pdf.py b/backend/tests/test_layout_tz_pdf.py index 1fbe2dd2..b65833f5 100644 --- a/backend/tests/test_layout_tz_pdf.py +++ b/backend/tests/test_layout_tz_pdf.py @@ -9,19 +9,40 @@ import datetime as dt import pytest -# Attempt to import the module under test; skip entire module if native libs missing. -try: - from app.services.exporters.layout_tz_pdf import render_layout_tz_pdf -except (OSError, ImportError) as _e: # GTK libs missing on Windows, or weasyprint not installed - pytest.skip(f"WeasyPrint deps missing: {_e}", allow_module_level=True) -from app.schemas.parcel import ( +def _weasyprint_native_libs_available() -> tuple[bool, str]: + """Probe whether WeasyPrint can actually render (native GTK/Pango/GObject libs). + + WeasyPrint is lazy-imported inside render_layout_tz_pdf, so a plain module + import no longer surfaces the missing-native-lib OSError. The native libs + (libgobject/libpango) are present in the Docker/CI image (Linux) but absent + on macOS/Windows dev machines — the OSError fires only at write_pdf() time. + We probe by rendering a trivial document; failure ⇒ skip on dev, but the + suite still runs the PDF path on CI where the libs exist. + """ + try: + from weasyprint import HTML + + HTML(string="x
").write_pdf() + except (OSError, ImportError) as e: + return False, str(e) + return True, "" + + +_WP_OK, _WP_ERR = _weasyprint_native_libs_available() +if not _WP_OK: + pytest.skip(f"WeasyPrint native libs missing: {_WP_ERR}", allow_module_level=True) + +# Импорты app-модулей ПОСЛЕ module-level skip guard выше — иначе на macOS без +# native libs импорт схемы не нужен (модуль skip'ается). E402 здесь намеренный. +from app.schemas.parcel import ( # noqa: E402 BestLayoutsResponse, LayoutDataQuality, LayoutTzMixRow, LayoutTzRecommendation, TopLayoutRow, ) +from app.services.exporters.layout_tz_pdf import render_layout_tz_pdf # noqa: E402 def _sample_response() -> BestLayoutsResponse: @@ -40,6 +61,7 @@ def _sample_response() -> BestLayoutsResponse: avg_area_m2=38.5, supply_units_in_radius=312, sold_pct_of_supply=21.5, + is_oversold=False, ), TopLayoutRow( rank=2, @@ -54,6 +76,7 @@ def _sample_response() -> BestLayoutsResponse: avg_area_m2=22.0, supply_units_in_radius=100, sold_pct_of_supply=40.0, + is_oversold=False, ), ], recommendation_for_tz=LayoutTzRecommendation( diff --git a/backend/tests/test_nspd_client.py b/backend/tests/test_nspd_client.py index 9fa82d81..efc9f796 100644 --- a/backend/tests/test_nspd_client.py +++ b/backend/tests/test_nspd_client.py @@ -412,6 +412,7 @@ def test_quarter_dump_total_features() -> None: "flooding": [_make_feat("fl1"), _make_feat("fl2"), _make_feat("fl3")], # 3 "landslide": [_make_feat("ls1")], # 1 }, + opportunity={}, # 0 layers_fetched=("search", "parcels", "buildings"), bbox_3857=(6700000.0, 7700000.0, 6800000.0, 7800000.0), fetched_at_utc="2026-05-12T00:00:00+00:00", @@ -432,6 +433,7 @@ def test_quarter_dump_frozen() -> None: engineering_structures=[], zouit={}, risks={}, + opportunity={}, layers_fetched=("search",), bbox_3857=None, fetched_at_utc="2026-05-12T00:00:00+00:00", diff --git a/backend/tests/test_quarter_dump_lookup.py b/backend/tests/test_quarter_dump_lookup.py index d5c09d23..35b75d84 100644 --- a/backend/tests/test_quarter_dump_lookup.py +++ b/backend/tests/test_quarter_dump_lookup.py @@ -92,8 +92,9 @@ def test_get_quarter_dump_stale() -> None: """Дамп старше 180 дней → stale=True, harvest triggered, available=False.""" old_date = datetime.now(UTC) - timedelta(days=200) # row: (quarter_cad, fetched_at_utc, total_features, harvest_error, - # territorial_zones_count, zouit_count, engineering_count) - db = _make_db_mock(row=("66:41:0204016", old_date, 50, None, 5, 2, 1)) + # territorial_zones_count, zouit_count, engineering_count, + # risks_count, opportunity_count, red_lines_count) + db = _make_db_mock(row=("66:41:0204016", old_date, 50, None, 5, 2, 1, 0, 0, 0)) with patch( "app.services.site_finder.quarter_dump_lookup._trigger_harvest", @@ -111,7 +112,7 @@ def test_get_quarter_dump_stale() -> None: def test_get_quarter_dump_with_harvest_error() -> None: """Дамп с harvest_error → harvest_triggered=True, available=False.""" fresh_date = datetime.now(UTC) - timedelta(days=10) - db = _make_db_mock(row=("66:41:0204016", fresh_date, 0, "WAF 429", 0, 0, 0)) + db = _make_db_mock(row=("66:41:0204016", fresh_date, 0, "WAF 429", 0, 0, 0, 0, 0, 0)) with patch( "app.services.site_finder.quarter_dump_lookup._trigger_harvest", @@ -130,7 +131,7 @@ def test_get_quarter_dump_with_harvest_error() -> None: def test_get_quarter_dump_no_parcel_geometry() -> None: """parcel_wkt=None → metadata only, нет spatial queries.""" fresh_date = datetime.now(UTC) - timedelta(days=5) - db = _make_db_mock(row=("66:41:0204016", fresh_date, 120, None, 10, 3, 2)) + db = _make_db_mock(row=("66:41:0204016", fresh_date, 120, None, 10, 3, 2, 0, 0, 0)) result = get_quarter_dump_data(db, "66:41:0204016", parcel_wkt=None) @@ -162,9 +163,10 @@ def _make_db_mock_with_spatial( Хрупко при реорганизации порядка запросов в production-коде. При изменении порядка в get_quarter_dump_data — обновить индексы call_count здесь. - dump_row должен быть 7-элементным tuple: + dump_row должен быть 10-элементным tuple: (quarter_cad, fetched_at_utc, total_features, harvest_error, - territorial_zones_count, zouit_count, engineering_count). + territorial_zones_count, zouit_count, engineering_count, + risks_count, opportunity_count, red_lines_count). """ db = MagicMock() call_count = 0 @@ -196,7 +198,7 @@ def _make_db_mock_with_spatial( def test_get_quarter_dump_fresh_zoning() -> None: """Свежий дамп с territorial_zone → nspd_zoning populated.""" fresh_date = datetime.now(UTC) - timedelta(days=30) - dump_row = ("66:41:0204016", fresh_date, 100, None, 5, 0, 0) + dump_row = ("66:41:0204016", fresh_date, 100, None, 5, 0, 0, 0, 0, 0) # zone_props JSONB в виде dict (SQLAlchemy вернёт dict) zone_props: dict[str, Any] = { "reg_numb_border": "Ж-3", @@ -225,7 +227,7 @@ def test_get_quarter_dump_fresh_zoning() -> None: def test_get_quarter_dump_fresh_zoning_no_match() -> None: """Свежий дамп, centroid вне всех territorial_zones → nspd_zoning=None.""" fresh_date = datetime.now(UTC) - timedelta(days=30) - dump_row = ("66:41:0204016", fresh_date, 100, None, 3, 0, 0) + dump_row = ("66:41:0204016", fresh_date, 100, None, 3, 0, 0, 0, 0, 0) db = _make_db_mock_with_spatial( dump_row=dump_row, @@ -247,7 +249,7 @@ def test_get_quarter_dump_fresh_zouit_overlaps() -> None: fresh_date = datetime.now(UTC) - timedelta(days=10) # territorial_zones_count > 0 чтобы все 3 spatial запроса вызывались # (иначе call_count в mock смещается и zouit попадает не в тот слот) - dump_row = ("66:41:0204016", fresh_date, 200, None, 1, 5, 0) + dump_row = ("66:41:0204016", fresh_date, 200, None, 1, 5, 0, 0, 0, 0) props1: dict[str, Any] = {"name": "ОКН Дом купца", "subcategory": "okn"} props2: dict[str, Any] = {"name": "ОЗ газопровода", "subcategory": "engineering"} @@ -280,7 +282,7 @@ def test_get_quarter_dump_fresh_zouit_overlaps() -> None: def test_get_quarter_dump_includes_nspd_fields() -> None: """Базовая проверка что все 4 nspd-ключа присутствуют в возвращаемом dict.""" fresh_date = datetime.now(UTC) - timedelta(days=1) - dump_row = ("66:41:0204016", fresh_date, 55, None, 2, 1, 0) + dump_row = ("66:41:0204016", fresh_date, 55, None, 2, 1, 0, 0, 0, 0) db = _make_db_mock_with_spatial( dump_row=dump_row, @@ -345,7 +347,7 @@ def test_early_exit_all_counts_zero_no_spatial_queries() -> None: """Если все denormalized counts == 0 — spatial queries не вызываются.""" fresh_date = datetime.now(UTC) - timedelta(days=5) # territorial_zones_count=0, zouit_count=0, engineering_count=0 - dump_row = ("66:41:0204016", fresh_date, 50, None, 0, 0, 0) + dump_row = ("66:41:0204016", fresh_date, 50, None, 0, 0, 0, 0, 0, 0) db = _make_db_mock_with_spatial(dump_row=dump_row) @@ -353,8 +355,11 @@ def test_early_exit_all_counts_zero_no_spatial_queries() -> None: db, "66:41:0204016", parcel_wkt="POLYGON ((60.6 56.8, 60.7 56.8, 60.7 56.9, 60.6 56.8))" ) - # Только 1 execute-вызов — чтение dump row; spatial helpers пропущены - assert db.execute.call_count == 1 + # 2 execute-вызова: чтение dump row (0) + cad_zouit fallback (#232) — при + # zouit_count==0 _get_zouit_overlaps не early-exit'ит, а делает fallback на + # cad_zouit. Остальные spatial helpers (zoning/engineering/risk/opportunity/ + # red_lines) пропущены по своим нулевым счётчикам. + assert db.execute.call_count == 2 assert result["nspd_zoning"] is None assert result["nspd_zouit_overlaps"] == [] assert result["nspd_engineering_nearby"] == [] @@ -365,7 +370,7 @@ def test_early_exit_partial_counts() -> None: """territorial_zones_count > 0, zouit_count == 0 → zoning query вызывается, zouit и engineering — нет.""" fresh_date = datetime.now(UTC) - timedelta(days=5) - dump_row = ("66:41:0204016", fresh_date, 30, None, 3, 0, 0) + dump_row = ("66:41:0204016", fresh_date, 30, None, 3, 0, 0, 0, 0, 0) zone_props: dict[str, Any] = {"reg_numb_border": "Ж-1", "type_zone": "Зона жилая"} zoning_row_mock = MagicMock() zoning_row_mock.__getitem__ = lambda self, i: zone_props if i == 0 else None @@ -381,8 +386,11 @@ def test_early_exit_partial_counts() -> None: db, "66:41:0204016", parcel_wkt="POLYGON ((60.6 56.8, 60.7 56.8, 60.7 56.9, 60.6 56.8))" ) - # dump lookup (0) + zoning (1) = 2 вызова; zouit и engineering — пропущены - assert db.execute.call_count == 2 + # dump lookup (0) + zoning (1) + cad_zouit fallback (2) = 3 вызова; + # engineering/risk/opportunity/red_lines — пропущены по нулевым счётчикам. + # zouit_count==0 → _get_zouit_overlaps делает fallback на cad_zouit (#232), + # который возвращает [] (mock fetchall пуст). + assert db.execute.call_count == 3 assert result["nspd_zoning"] is not None assert result["nspd_zoning"]["zone_code"] == "Ж-1" assert result["nspd_zouit_overlaps"] == []