lekss361/gendesign
1
0
Fork 0
Code Issues 57 Pull requests Projects Releases Packages Wiki Activity Actions

fix(site-finder): align competitor flats_sold to objective_lots.contract_date (#1926) #1927

Merged
bot-backend merged 2 commits from fix/1926-units-sold-align into main 2026-06-26 18:33:52 +00:00
Conversation 0 Commits 2 Files changed 3 +222 -33
bot-backend commented 2026-06-26 18:05:05 +00:00
Collaborator
Copy link

Root (audit #1871/#1926): competitor-блок считал flats_sold через domrf_kn_flats.status (LIKE '%прод%'/sold) — заполнен ~0.2% (99.8% NULL) → недосчёт ~1600 юнитов и расхождение с MarketMetrics, который считает через objective_lots.contract_date (100% для проданных).

Fix: новый _SOLD_COUNT_SQL считает sold через objective_lots.contract_date IS NOT NULL, мост domrf obj_id → objective_complex_mapping.domrf_obj_id → objective_complex_name == objective_lots.project_name (тот же 1:1 паттерн, что в _OBJECTIVE_PRICE_FALLBACK_SQL). Та же логика, что у MarketMetrics._STOCK_SQL → пути теперь согласованы. _AVG_PRICE_SQL стал price-only. psycopg v3 CAST. Без schema/codegen-изменений (flats_sold/sold_pct — существующие поля).

Tests: 217 passed / 4 skipped (DB-gated); + test_competitors_flats_sold_from_contract_date (120/200 → 60%); broader suite 1349 passed 0 failed. ruff clean.

Refs #1926, #1871

**Root (audit #1871/#1926):** competitor-блок считал `flats_sold` через `domrf_kn_flats.status` (`LIKE '%прод%'`/`sold`) — заполнен ~0.2% (99.8% NULL) → недосчёт ~1600 юнитов и расхождение с MarketMetrics, который считает через `objective_lots.contract_date` (100% для проданных). **Fix:** новый `_SOLD_COUNT_SQL` считает sold через `objective_lots.contract_date IS NOT NULL`, мост `domrf obj_id → objective_complex_mapping.domrf_obj_id → objective_complex_name == objective_lots.project_name` (тот же 1:1 паттерн, что в `_OBJECTIVE_PRICE_FALLBACK_SQL`). Та же логика, что у `MarketMetrics._STOCK_SQL` → пути теперь согласованы. `_AVG_PRICE_SQL` стал price-only. psycopg v3 CAST. Без schema/codegen-изменений (`flats_sold`/`sold_pct` — существующие поля). **Tests:** 217 passed / 4 skipped (DB-gated); + `test_competitors_flats_sold_from_contract_date` (120/200 → 60%); broader suite 1349 passed 0 failed. ruff clean. Refs #1926, #1871
bot-backend added 1 commit 2026-06-26 18:05:05 +00:00
fix(site-finder): align competitor flats_sold to objective_lots.contract_date (#1926)
All checks were successful
CI / changes (pull_request) Successful in 6s
Details
CI / frontend-tests (pull_request) Has been skipped
Details
CI / openapi-codegen-check (pull_request) Successful in 1m50s
Details
CI / backend-tests (pull_request) Successful in 11m17s
Details
c336f91182 
Audit #1871/#1926: competitor block computed flats_sold from
domrf_kn_flats.status (LIKE '%прод%'/'sold'), populated in only ~0.2% of
rows (99.8% NULL) -> massive undercount (~1600 units in reported case) and
divergence from MarketMetrics, which counts sold via objective_lots.contract_date
(100% populated for sold lots).

Fix: new _SOLD_COUNT_SQL counts sold lots from objective_lots.contract_date
IS NOT NULL, bridged domrf obj_id -> objective_complex_mapping.domrf_obj_id ->
objective_complex_mapping.objective_complex_name == objective_lots.project_name
(same 1:1 mapping pattern as _OBJECTIVE_PRICE_FALLBACK_SQL primary_price CTE).
This is the exact source MarketMetrics._STOCK_SQL uses, so the two paths agree.
Dropped the domrf_kn_flats.status count from _AVG_PRICE_SQL (price-only now).

No schema/Pydantic field change (flats_sold/sold_pct already existed) ->
codegen not needed. psycopg v3 CAST style preserved.

Tests: updated mock DB ordering (+ sold-count execute), added
test_competitors_flats_sold_from_contract_date (120/200 -> 60% sold) and
phantom-column EXPLAIN check for _SOLD_COUNT_SQL.
Light1YT added 1 commit 2026-06-26 18:22:06 +00:00
fix(site-finder): harden flats_sold sold-count SQL — fan-out, premise_kind, predicate (#1926)
All checks were successful
CI / changes (pull_request) Successful in 6s
Details
CI / frontend-tests (pull_request) Has been skipped
Details
CI / openapi-codegen-check (pull_request) Successful in 1m51s
Details
CI / backend-tests (pull_request) Successful in 11m6s
Details
1a07af028a 
Code-review #1927 found 2 MAJOR bugs in the initial fix:

1. JOIN fan-out: objective_complex_mapping UNIQUE is (objective_complex_name,
   objective_group), NOT domrf_obj_id (68_schema:321) — one obj_id can map to
   multiple rows (same name, different group), so COUNT(*) over cm JOIN ol
   double-counts lots (GROUP BY collapses output rows but not dups inside the
   aggregate). Fixed with COUNT(DISTINCT ol.objective_lot_id).

2. Missing premise_kind: MarketMetrics._STOCK_SQL filters premise_kind='квартира';
   the new SQL did not, so sold parking/storage/non-residential lots counted as
   sold flats (over-count). Added AND ol.premise_kind = :premise_kind.

3. Aligned the sold predicate to MarketMetrics exactly:
   is_sold IS TRUE OR contract_date IS NOT NULL OR LOWER(status)='продан'
   (Objective populates these inconsistently — OR mirrors _STOCK_SQL:285-289),
   not contract_date alone.

Tests: added static SQL-structure guards (fan-out-safe COUNT(DISTINCT),
premise_kind filter, full predicate) since mock-based API tests bypass real SQL
and cannot detect fan-out; the live-DB fan-out/EXPLAIN check lives in
test_phantom_columns (skipped without TEST_DATABASE_URL). Updated phantom EXPLAIN
to the new SQL.

Full suite: 3530 passed, 51 skipped, 0 failed. Ruff clean.
bot-backend merged commit 4846197d54 into main 2026-06-26 18:33:52 +00:00
bot-backend deleted branch fix/1926-units-sold-align 2026-06-26 18:33:52 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
admin

Admin UI / internal tools / pipeline tracker

  
analytics

Аналитика данных / matching

  
auth

Authentication / authorization / multi-tenancy

  
automation

Автоматизация / cron / scheduler

  
bug

Something isn't working

  
business

Коммерческая воронка / пилоты / pipeline / реестр ПО

  
chore

Operational housekeeping

  
ci

Forgejo Actions / build pipeline

  
compliance

152-ФЗ / реестр ПО / legal / TOS

  
data

Data sources, parsers, ETL

  
data-moat

Уникальные данные — sales tracker, CRM aggregation

  
docs

README / runbooks / onboarding

  
duplicate

This issue or pull request already exists

  
dx

Developer experience / build speed

  
enhancement

New feature or request

  
Fable 5 ревью

Находки полного мульти-агентного ревью (Claude Fable 5, 2026-06-09)

  
feedback/max

Feedback from Max (Senior partner)

  
generative

Generative Design — concept generation engine

  
GG-форсайт

Новое ТЗ от Ген Геныча (июнь 2026): Site Finder v2 — ИИ-прогноз продуктовой стратегии девелопера. Актуальный приоритет.

  
needs-discussion

Pending team sync / decision

  
needs-human

Human review/decision required

  
observability

Monitoring / metrics / logs / Sentry / Uptime

  
pause-bots

Kill-switch — all autonomous bots pause

  
performance

Latency / throughput / DB query tuning

  
priority/p0

Critical / production-blocker

  
priority/p1

High priority

  
priority/p2

Normal priority

  
priority/p3

Низкий приоритет (follow-up, tech-debt)

  
scope/backend

Backend Python — FastAPI, Celery, scrapers

  
scope/db

DB migrations, indexes, SQL

  
scope/devops

docker-compose, Caddy, workflows

  
scope/frontend

Frontend — Next.js, React, TypeScript

  
scope/qa

Tests, smoke, Playwright

  
scrapers

Скрапперы (Avito/Cian/Yandex/Rosreestr)

  
security

Security audit / secrets / vulnerabilities

  
site-finder

Site Finder scoring quality & data layer

  
stage/1

Stage 1: Generative MVP (нед 2-7)

  
stage/2

Stage 2: Site Finder MVP (нед 8-12)

  
status/blocked

Blocked — needs human intervention

  
status/done

Closed, completed

  
status/needs-analysis

Raw/fuzzy task filed by human — auto-analyst подхватывает: code-archeology + декомпозиция в actionable scope/* + status/ready (или split на под-issues)

  
status/needs-fix

Reviewer/QA вернул worker на доработку — worker сам чинит свой PR (fixup), НЕ требует human (в отличие от status/blocked)

  
status/qa

PR merged, awaiting smoke test

  
status/ready

Ready for pickup by worker bot

  
status/review

PR open, awaiting code review

  
status/wip

Work in progress (worker claimed)

  
tech-debt

Технический долг

  
tradein

Trade-In MVP проект

  
ux

User experience / responsive / conversion

  
week ревью 1

Week review 1 — находки multi-agent аудита проекта (2026-06-14)

  
wontfix

This will not be worked on

  
вторичка

Trade-In Estimator — проект оценки вторичного жилья

  
ИРД

Исходно-разрешительная документация — слой ограничений участка для analyze-таблицы

No labels
admin
analytics
auth
automation
bug
business
chore
ci
compliance
data
data-moat
docs
duplicate
dx
enhancement
Fable 5 ревью
feedback/max
generative
GG-форсайт
needs-discussion
needs-human
observability
pause-bots
performance
priority/p0
priority/p1
priority/p2
priority/p3
scope/backend
scope/db
scope/devops
scope/frontend
scope/qa
scrapers
security
site-finder
stage/1
stage/2
status/blocked
status/done
status/needs-analysis
status/needs-fix
status/qa
status/ready
status/review
status/wip
tech-debt
tradein
ux
week ревью 1
wontfix
вторичка
ИРД
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: lekss361/gendesign#1927
No description provided.
Delete branch "fix/1926-units-sold-align"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?