feat: consolidate ticket domain baseline

backend/apps/solutions/api.py

@@ -1,8 +1,9 @@
-from django.db import transaction
-from django.utils import timezone
 from ninja import Router
+from ninja.errors import HttpError
 
 from apps.accounts.api import require_permission
+from apps.knowledge.governance import ensure_governed_asset
+from apps.knowledge.models import GovernedAssetType
 from apps.solutions.models import Solution, TicketSolutionLink
 from apps.solutions.schemas import (
     AdoptSolutionIn,
@@ -12,7 +13,14 @@ from apps.solutions.schemas import (
     TicketSolutionLinkOut,
     TicketSolutionOut,
 )
-from apps.tickets.models import Ticket, TicketEvent
+from apps.tickets.models import Ticket
+from apps.tickets.services import (
+    TicketDataError,
+    TicketStatusError,
+)
+from apps.tickets.services import (
+    adopt_solution_for_ticket as adopt_solution_for_ticket_service,
+)
 
 router = Router(tags=["solutions"])
 
@@ -28,13 +36,18 @@ def create_solution(request, payload: SolutionIn):
         root_cause=payload.root_cause,
         solution=payload.solution,
         risk_note=payload.risk_note,
-        status=payload.status,
+        status="draft",
+        allow_auto_resolve=payload.allow_auto_resolve,
+        requires_human_action=payload.requires_human_action,
+        requires_external_confirmation=payload.requires_external_confirmation,
+        requires_production_change=payload.requires_production_change,
         created_by=request.user if request.user.is_authenticated else None,
     )
-    if solution.status == "published":
-        from apps.knowledge.services import index_published_solution
-
-        index_published_solution(solution)
+    ensure_governed_asset(
+        GovernedAssetType.SOLUTION,
+        solution,
+        actor=request.user if request.user.is_authenticated else None,
+    )
     return solution
 
 
@@ -75,6 +88,8 @@ def get_solution(request, solution_id: int):
 @router.post("/{solution_id}/link-ticket", response=TicketSolutionLinkOut)
 def link_solution_to_ticket(request, solution_id: int, payload: TicketSolutionLinkIn):
     require_permission(request, "solution.manage")
+    if payload.link_type == "adopted":
+        raise HttpError(400, "Use adopt-ticket to adopt a solution")
     solution = Solution.objects.get(id=solution_id)
     ticket = Ticket.objects.get(id=payload.ticket_id)
     link, _ = TicketSolutionLink.objects.get_or_create(
@@ -86,9 +101,6 @@ def link_solution_to_ticket(request, solution_id: int, payload: TicketSolutionLi
             "created_by": request.user if request.user.is_authenticated else None,
         },
     )
-    if payload.link_type == "adopted":
-        solution.usage_count = solution.ticket_links.filter(link_type="adopted").count()
-        solution.save(update_fields=["usage_count", "updated_at"])
     return {
         "id": link.id,
         "ticket_id": ticket.id,
@@ -100,54 +112,22 @@ def link_solution_to_ticket(request, solution_id: int, payload: TicketSolutionLi
 
 
 @router.post("/{solution_id}/adopt-ticket", response=TicketSolutionLinkOut)
-def adopt_solution_and_close_ticket(request, solution_id: int, payload: AdoptSolutionIn):
+def adopt_solution_for_ticket(request, solution_id: int, payload: AdoptSolutionIn):
     require_permission(request, "solution.manage")
+    require_permission(request, "ticket.resolve")
     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,
+    try:
+        solution = Solution.objects.get(id=solution_id)
+        ticket, link = adopt_solution_for_ticket_service(
+            Ticket.objects.get(id=payload.ticket_id),
+            solution,
+            operator,
             remark=payload.remark,
+            replied_to_customer=payload.replied_to_customer,
         )
+        solution.refresh_from_db(fields=["usage_count"])
+    except (TicketDataError, TicketStatusError) as error:
+        raise HttpError(400, str(error)) from error
     return {
         "id": link.id,
         "ticket_id": ticket.id,