Separate normal task review from AQMM review

app/modules/partner_dashboard/ui.py

@@ -15,7 +15,7 @@ from app.modules.partner_dashboard.service import (
     get_next_partner_review_task_id,
     get_partner_review_workspace,
 )
-from app.modules.services.execution import apply_task_review
+from app.modules.services.execution import apply_normal_task_review, apply_task_review
 from app.modules.alerts.workflow_escalations import update_workflow_escalation
 
 router = APIRouter(prefix="/partner", tags=["partner-dashboard-v2-ui"])
@@ -137,7 +137,7 @@ def partner_review_task_submit(
             return RedirectResponse(url=f"/partner/reviews/engagements/{subscription_id}?review_error=task", status_code=303)
         if active.get("is_locked") or workspace.get("is_locked"):
             return RedirectResponse(url=f"/partner/reviews/engagements/{subscription_id}?task_id={task_id}&review_error=locked", status_code=303)
-        if not active.get("can_review") or active.get("review_level") not in {"partner", "review_partner"}:
+        if not active.get("can_review") or active.get("review_level") not in {"normal_partner", "partner", "review_partner"}:
             return RedirectResponse(url=f"/partner/reviews/engagements/{subscription_id}?task_id={task_id}&review_error=not_ready", status_code=303)
 
         from sqlalchemy import select
@@ -149,14 +149,23 @@ def partner_review_task_submit(
         if not task:
             return RedirectResponse(url="/partner/dashboard?tab=review", status_code=303)
         try:
-            apply_task_review(
-                db,
-                task=task,
-                review_level=active["review_level"],
-                decision=decision,
-                note=review_note,
-                user_id=current_user.id,
-            )
+            if active.get("review_level") == "normal_partner":
+                apply_normal_task_review(
+                    db,
+                    task=task,
+                    decision=decision,
+                    note=review_note,
+                    user_id=current_user.id,
+                )
+            else:
+                apply_task_review(
+                    db,
+                    task=task,
+                    review_level=active["review_level"],
+                    decision=decision,
+                    note=review_note,
+                    user_id=current_user.id,
+                )
             db.commit()
         except ValueError:
             db.rollback()