fix(projects): isolate quote acceptance status per project (decision-target based)
Bug: a multi-project quote accepted for «تست ۱» only also appeared under «تست ۲»'s پذیرفته شده column, because both the Projects page and /projects/{id}/stats classified quotes by their GLOBAL status over any project link.
Rule now: a quote counts as accepted/arrived for a project ONLY if at least one non-rejected line item's decision targets that project (item_decisions.project_id). A quote merely linked as a candidate — including one accepted for a different project — is categorized exclusively under پیشنهاد شده for that project. Legacy quotes without any decision targets keep the old global-status classification.
Backend: project_stats membership now spans all link kinds (legacy mirror, quote_projects, line_item_projects, decision targets) with the per-project decision-based bucketing above; bucket VALUES follow the same isolation (accepted/arrived value counts only items targeting the project; candidate items of a still-proposal quote stay in the offered bucket); the raw path string is normalized to UUID for the Python-side comparisons. /quotes?project_id=… now matches any relevant link kind instead of only the legacy mirror column.
Frontend: ProjectsPage gains acceptedForProject/hasTargets helpers; the three columns (پیشنهاد شده / پذیرفته شده / رسیده) and their value chips use per-project items (target-project items first, then candidates), so totals no longer leak other projects' items.
Verified end-to-end (2 projects × 1 quote × 2 items, accept item-1 for P1 only): P1 accepted=1 then arrived=1 after the PM receipt; P2 stays offered=1 / accepted=0 / arrived=0 at every step; /quotes?project_id=P2 still lists the quote. All fixture data removed; 7/7 checks pass. python compile + api/frontend builds clean.
This commit is contained in:
@@ -10,7 +10,16 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.db.engine import get_db
|
||||
from app.models.catalog import Material
|
||||
from app.models.procurement import ItemDecision, LineItem, Project, Quote, Supplier, Termsheet
|
||||
from app.models.procurement import (
|
||||
ItemDecision,
|
||||
LineItem,
|
||||
LineItemProjects,
|
||||
Project,
|
||||
Quote,
|
||||
QuoteProjects,
|
||||
Supplier,
|
||||
Termsheet,
|
||||
)
|
||||
from app.schemas.procurement import (
|
||||
AcceptQuoteIn,
|
||||
ArriveItemsIn,
|
||||
@@ -111,7 +120,23 @@ async def list_quotes(
|
||||
if supplier_id:
|
||||
stmt = stmt.where(Quote.supplier_id == supplier_id)
|
||||
if project_id:
|
||||
stmt = stmt.where(Quote.project_id == project_id)
|
||||
# any relevant link: legacy mirror, quote-level junction, line-item
|
||||
# candidates, or an accepted (decision) target — NOT just the mirror
|
||||
stmt = stmt.where(
|
||||
Quote.id.in_(
|
||||
select(Quote.id)
|
||||
.outerjoin(QuoteProjects, QuoteProjects.quote_id == Quote.id)
|
||||
.outerjoin(LineItem, LineItem.quote_id == Quote.id)
|
||||
.outerjoin(LineItemProjects, LineItemProjects.line_item_id == LineItem.id)
|
||||
.outerjoin(ItemDecision, ItemDecision.line_item_id == LineItem.id)
|
||||
.where(
|
||||
(Quote.project_id == project_id)
|
||||
| (QuoteProjects.project_id == project_id)
|
||||
| (LineItemProjects.project_id == project_id)
|
||||
| (ItemDecision.project_id == project_id)
|
||||
)
|
||||
)
|
||||
)
|
||||
if category_id:
|
||||
stmt = stmt.where(_quote_category_exists(category_id))
|
||||
if quote_date_from is not None:
|
||||
|
||||
Reference in New Issue
Block a user