From 7df15baa0e468f5c3e703c2e2ea90bae2363fc9c Mon Sep 17 00:00:00 2001
From: Collin Beczak <ctbeczak08@gmail.com>
Date: Mon, 2 Feb 2026 15:05:03 -0600
Subject: [PATCH] fix some task review status not found and locking bugs

---
 app/org/maproulette/framework/model/Task.scala         | 10 ++++++++--
 .../framework/service/TaskReviewService.scala          |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/org/maproulette/framework/model/Task.scala b/app/org/maproulette/framework/model/Task.scala
index 51e779bbe..23afc1ece 100644
--- a/app/org/maproulette/framework/model/Task.scala
+++ b/app/org/maproulette/framework/model/Task.scala
@@ -324,8 +324,14 @@ object Task extends CommonField {
           if (allowChange)
             toSet == STATUS_FIXED || toSet == STATUS_FALSE_POSITIVE || toSet == STATUS_TOO_HARD
           else false
-        case STATUS_ANSWERED  => false
-        case STATUS_VALIDATED => false
+        case STATUS_ANSWERED =>
+          if (allowChange)
+            toSet == STATUS_FIXED || toSet == STATUS_FALSE_POSITIVE || toSet == STATUS_ALREADY_FIXED || toSet == STATUS_TOO_HARD
+          else false
+        case STATUS_VALIDATED =>
+          if (allowChange)
+            toSet == STATUS_FIXED || toSet == STATUS_FALSE_POSITIVE || toSet == STATUS_ALREADY_FIXED || toSet == STATUS_TOO_HARD
+          else false
         case STATUS_DISABLED  => toSet == STATUS_CREATED
       }
     }
diff --git a/app/org/maproulette/framework/service/TaskReviewService.scala b/app/org/maproulette/framework/service/TaskReviewService.scala
index db687f181..64131f08b 100644
--- a/app/org/maproulette/framework/service/TaskReviewService.scala
+++ b/app/org/maproulette/framework/service/TaskReviewService.scala
@@ -940,7 +940,7 @@ class TaskReviewService @Inject() (
       excludeOtherReviewers
     )
 
-    addClaimedByFilter(query, user.id)
+    addLockedFilter(addClaimedByFilter(query, user.id))
   }
 
   private def addClaimedByFilter(query: Query, userId: Long): Query = {