feat: adopt solution and close ticket

This commit is contained in:
hailin
2026-07-03 16:36:46 +08:00
parent 40ab7ca548
commit 6132d383ae
7 changed files with 325 additions and 10 deletions

View File

@@ -1,15 +1,18 @@
from django.db import transaction
from django.utils import timezone
from ninja import Router
from apps.accounts.api import require_permission
from apps.solutions.models import Solution, TicketSolutionLink
from apps.solutions.schemas import (
AdoptSolutionIn,
SolutionIn,
SolutionOut,
TicketSolutionLinkIn,
TicketSolutionLinkOut,
TicketSolutionOut,
)
from apps.tickets.models import Ticket
from apps.tickets.models import Ticket, TicketEvent
router = Router(tags=["solutions"])
@@ -89,3 +92,62 @@ def link_solution_to_ticket(request, solution_id: int, payload: TicketSolutionLi
"solution_usage_count": solution.usage_count,
"created_at": link.created_at,
}
@router.post("/{solution_id}/adopt-ticket", response=TicketSolutionLinkOut)
def adopt_solution_and_close_ticket(request, solution_id: int, payload: AdoptSolutionIn):
require_permission(request, "solution.manage")
operator = request.user if request.user.is_authenticated else None
with transaction.atomic():
solution = Solution.objects.select_for_update().get(id=solution_id)
ticket = Ticket.objects.select_for_update().get(id=payload.ticket_id)
link, _ = TicketSolutionLink.objects.get_or_create(
ticket=ticket,
solution=solution,
link_type="adopted",
defaults={"created_by": operator},
)
now = timezone.now()
from_status = ticket.status
ticket.status = "closed"
ticket.resolution_summary = solution.solution
ticket.is_resolved = True
ticket.replied_to_customer = payload.replied_to_customer
ticket.resolved_at = ticket.resolved_at or now
ticket.closed_at = now
ticket.save(
update_fields=[
"status",
"resolution_summary",
"is_resolved",
"replied_to_customer",
"resolved_at",
"closed_at",
"updated_at",
]
)
solution.usage_count = solution.ticket_links.filter(link_type="adopted").count()
solution.save(update_fields=["usage_count", "updated_at"])
TicketEvent.objects.create(
ticket=ticket,
event_type="solution_adopted",
from_value={"status": from_status},
to_value={
"status": ticket.status,
"solution_id": solution.id,
"solution_title": solution.title,
"resolution": ticket.resolution_summary,
"is_resolved": ticket.is_resolved,
"replied_to_customer": ticket.replied_to_customer,
},
operator=operator,
remark=payload.remark,
)
return {
"id": link.id,
"ticket_id": ticket.id,
"solution_id": solution.id,
"link_type": link.link_type,
"solution_usage_count": solution.usage_count,
"created_at": link.created_at,
}

View File

@@ -35,6 +35,12 @@ class TicketSolutionLinkIn(Schema):
agent_run_id: int | None = None
class AdoptSolutionIn(Schema):
ticket_id: int
remark: str = "采纳解决方案并关闭工单"
replied_to_customer: bool = True
class TicketSolutionLinkOut(Schema):
id: int
ticket_id: int

View File

@@ -1,3 +1,4 @@
from apps.solutions.models import Solution, TicketSolutionLink
from apps.tickets.models import Ticket
@@ -66,3 +67,48 @@ def test_list_ticket_solutions_returns_linked_solution_details(admin_client, db)
payload = response.json()
assert payload[0]["link_type"] == "adopted"
assert payload[0]["solution"]["title"] == "Restart callback worker"
def test_adopt_solution_closes_ticket_and_records_resolution(admin_client, db):
ticket = Ticket.objects.create(
ticket_no="TK202607030300",
title="查询采集进度",
description="客户需要确认采集进度",
status="pending",
)
solution = Solution.objects.create(
title="查询采集进度处理方案",
problem_signature="采集进度查询",
root_cause="税局采集链路不稳定",
solution="查询 Python 日志,确认税局不稳定,仍在采集中。",
status="published",
)
response = admin_client.post(
f"/api/solutions/{solution.id}/adopt-ticket",
data={
"ticket_id": ticket.id,
"replied_to_customer": True,
"remark": "采纳方案并回复客户",
},
content_type="application/json",
)
assert response.status_code == 200
payload = response.json()
assert payload["link_type"] == "adopted"
assert payload["solution_usage_count"] == 1
ticket.refresh_from_db()
assert ticket.status == "closed"
assert ticket.resolution_summary == solution.solution
assert ticket.is_resolved is True
assert ticket.replied_to_customer is True
assert ticket.resolved_at is not None
assert ticket.closed_at is not None
assert TicketSolutionLink.objects.filter(
ticket=ticket,
solution=solution,
link_type="adopted",
).exists()
assert ticket.events.filter(event_type="solution_adopted").exists()