refactor: remove db.commit() from business services, callers use UnitOfWork (Tier 3)

This commit is contained in:
2026-02-20 14:42:20 +01:00
parent 339d669498
commit 14d995b40c
7 changed files with 48 additions and 33 deletions

View File

@@ -10,6 +10,16 @@ Usage in routers::
If an exception propagates, ``__exit__`` issues a rollback automatically. If an exception propagates, ``__exit__`` issues a rollback automatically.
Services should **never** call ``db.commit()``; they use ``db.add()`` / Services should **never** call ``db.commit()``; they use ``db.add()`` /
``db.flush()`` to stage work and let the caller decide when to commit. ``db.flush()`` to stage work and let the caller decide when to commit.
**Documented exceptions** (services that may commit internally):
- ``audit_service.log_action`` — called from 15+ routers; commits to ensure
audit records persist even when callers do not.
- Import services (atomic_import, sigma_import, etc.) — self-contained sync ops.
- Background jobs (campaign_scheduler, intel_service, stale_detection,
mitre_sync) — self-contained operations.
- Self-contained batch ops (e.g. detection_rule_service.auto_associate_rules,
snapshot_service.create_snapshot, campaign_service.generate_campaign_from_*,
osint_enrichment_service.enrich_technique_with_cves).
""" """
from __future__ import annotations from __future__ import annotations

View File

@@ -10,6 +10,7 @@ from sqlalchemy.orm import Session
from app.database import get_db from app.database import get_db
from app.dependencies.auth import get_current_user, require_any_role from app.dependencies.auth import get_current_user, require_any_role
from app.domain.unit_of_work import UnitOfWork
from app.models.user import User from app.models.user import User
from app.services.osint_enrichment_service import ( from app.services.osint_enrichment_service import (
enrich_technique_with_cves, enrich_technique_with_cves,
@@ -82,12 +83,14 @@ def review_osint_item(
user: User = Depends(get_current_user), user: User = Depends(get_current_user),
): ):
"""Mark an OSINT item as reviewed.""" """Mark an OSINT item as reviewed."""
item = mark_osint_reviewed(db, str(item_id)) with UnitOfWork(db) as uow:
if not item: item = mark_osint_reviewed(db, str(item_id))
raise HTTPException( if not item:
status_code=status.HTTP_404_NOT_FOUND, raise HTTPException(
detail="OSINT item not found", status_code=status.HTTP_404_NOT_FOUND,
) detail="OSINT item not found",
)
uow.commit()
return {"id": str(item.id), "reviewed": True} return {"id": str(item.id), "reviewed": True}

View File

@@ -11,6 +11,7 @@ from sqlalchemy.orm import Session
from app.database import get_db from app.database import get_db
from app.dependencies.auth import get_current_user, require_role from app.dependencies.auth import get_current_user, require_role
from app.domain.unit_of_work import UnitOfWork
from app.models.user import User from app.models.user import User
from app.services.scoring_service import ( from app.services.scoring_service import (
score_technique_by_mitre_id, score_technique_by_mitre_id,
@@ -127,14 +128,16 @@ def update_scoring_config(
Weights are persisted in the database and survive restarts. Weights are persisted in the database and survive restarts.
Validation enforces that all weights are non-negative and sum to 100. Validation enforces that all weights are non-negative and sum to 100.
""" """
result = update_scoring_weights( with UnitOfWork(db) as uow:
db, result = update_scoring_weights(
tests=payload.tests, db,
detection_rules=payload.detection_rules, tests=payload.tests,
d3fend=payload.d3fend, detection_rules=payload.detection_rules,
freshness=payload.freshness, d3fend=payload.d3fend,
platform_diversity=payload.platform_diversity, freshness=payload.freshness,
) platform_diversity=payload.platform_diversity,
)
uow.commit()
from app.services.score_cache import invalidate from app.services.score_cache import invalidate
invalidate() invalidate()

View File

@@ -10,6 +10,7 @@ from sqlalchemy.orm import Session
from app.database import get_db from app.database import get_db
from app.dependencies.auth import get_current_user, require_any_role from app.dependencies.auth import get_current_user, require_any_role
from app.domain.unit_of_work import UnitOfWork
from app.models.user import User from app.models.user import User
from app.services import worklog_service from app.services import worklog_service
@@ -57,17 +58,20 @@ def create(
user: User = Depends(require_any_role("red_tech", "blue_tech", "red_lead", "blue_lead")), user: User = Depends(require_any_role("red_tech", "blue_tech", "red_lead", "blue_lead")),
): ):
"""Create a manually-logged worklog entry.""" """Create a manually-logged worklog entry."""
wl = worklog_service.create_worklog( with UnitOfWork(db) as uow:
db, wl = worklog_service.create_worklog(
entity_type=body.entity_type, db,
entity_id=body.entity_id, entity_type=body.entity_type,
user_id=user.id, entity_id=body.entity_id,
activity_type=body.activity_type, user_id=user.id,
started_at=body.started_at, activity_type=body.activity_type,
ended_at=body.ended_at, started_at=body.started_at,
duration_seconds=body.duration_seconds, ended_at=body.ended_at,
description=body.description, duration_seconds=body.duration_seconds,
) description=body.description,
)
uow.commit()
db.refresh(wl)
return wl return wl

View File

@@ -181,12 +181,10 @@ def get_osint_items_for_technique(
def mark_osint_reviewed(db: Session, item_id: str) -> OsintItem | None: def mark_osint_reviewed(db: Session, item_id: str) -> OsintItem | None:
"""Mark an OSINT item as reviewed.""" """Mark an OSINT item as reviewed. Does not commit; caller uses UnitOfWork."""
item = db.query(OsintItem).filter(OsintItem.id == item_id).first() item = db.query(OsintItem).filter(OsintItem.id == item_id).first()
if item: if item:
item.reviewed = True item.reviewed = True
db.commit()
db.refresh(item)
return item return item

View File

@@ -82,9 +82,7 @@ def update_scoring_weights(
row.weight_freshness = new.freshness row.weight_freshness = new.freshness
row.weight_platform_diversity = new.platform_diversity row.weight_platform_diversity = new.platform_diversity
db.commit() # Does not commit; caller (router) uses UnitOfWork.
db.refresh(row)
return _weights_dict(new) return _weights_dict(new)

View File

@@ -39,8 +39,7 @@ def create_worklog(
) )
wl.integrity_hash = _compute_hash(wl) wl.integrity_hash = _compute_hash(wl)
db.add(wl) db.add(wl)
db.commit() # Does not commit; caller (router) uses UnitOfWork.
db.refresh(wl)
return wl return wl