fix task status issues

maproulette · Nov 12, 2024 · 7c24f85 · 7c24f85
1 parent 1692552
commit 7c24f85
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/app/org/maproulette/framework/controller/TaskBundleController.scala b/app/org/maproulette/framework/controller/TaskBundleController.scala
@@ -286,11 +286,10 @@ class TaskBundleController @Inject() (
     */
   def unbundleTasks(
       id: Long,
-      taskIds: List[Long],
-      preventTaskIdUnlocks: List[Long]
+      taskIds: List[Long]
   ): Action[AnyContent] = Action.async { implicit request =>
     this.sessionManager.authenticatedRequest { implicit user =>
-      this.serviceManager.taskBundle.unbundleTasks(user, id, taskIds, preventTaskIdUnlocks)
+      this.serviceManager.taskBundle.unbundleTasks(user, id, taskIds)
       Ok(Json.toJson(this.serviceManager.taskBundle.getTaskBundle(user, id)))
     }
   }

diff --git a/app/org/maproulette/framework/repository/TaskBundleRepository.scala b/app/org/maproulette/framework/repository/TaskBundleRepository.scala
@@ -91,13 +91,7 @@ class TaskBundleRepository @Inject() (
           val parameters = lockedTasks.map(task => Seq[NamedParameter]("taskId" -> task.id))
           BatchSql(sqlInsertTaskBundles, parameters.head, parameters.tail: _*).execute()
 
-          // Lock each of the new tasks to indicate they are part of the bundle
           for (task <- lockedTasks) {
-            try {
-              this.lockItem(user, task)
-            } catch {
-              case e: Exception => this.logger.warn(e.getMessage)
-            }
             taskRepository.cacheManager.cache.remove(task.id)
           }
 
@@ -134,7 +128,7 @@ class TaskBundleRepository @Inject() (
       val tasksToRemove = currentTaskIds.filter(taskId => !taskIds.contains(taskId))
 
       if (tasksToRemove.nonEmpty) {
-        this.unbundleTasks(user, bundleId, tasksToRemove, List.empty)
+        this.unbundleTasks(user, bundleId, tasksToRemove)
       }
 
       // Filter for tasks that need to be added back to the bundle.
@@ -226,8 +220,7 @@ class TaskBundleRepository @Inject() (
   def unbundleTasks(
       user: User,
       bundleId: Long,
-      taskIds: List[Long],
-      preventTaskIdUnlocks: List[Long]
+      taskIds: List[Long]
   ): Unit = {
     this.withMRConnection { implicit c =>
       val tasks = this.retrieveTasks(
@@ -265,12 +258,10 @@ class TaskBundleRepository @Inject() (
                 )
                 .executeUpdate()
 
-              if (!preventTaskIdUnlocks.contains(task.id)) {
-                try {
-                  this.unlockItem(user, task)
-                } catch {
-                  case e: Exception => this.logger.warn(e.getMessage)
-                }
+              try {
+                this.unlockItem(user, task)
+              } catch {
+                case e: Exception => this.logger.warn(e.getMessage)
               }
               taskRepository.cacheManager.cache.remove(task.id)
             case None => // do nothing
@@ -306,8 +297,19 @@ class TaskBundleRepository @Inject() (
         .on("bundleId" -> bundleId)
         .executeUpdate()
 
+      // Update cache for each task
       tasks.foreach { task =>
         if (!task.isBundlePrimary.getOrElse(false)) {
+          SQL(
+            """UPDATE tasks 
+                  SET status = {status} 
+                  WHERE id = {taskId}
+              """
+          ).on(
+              "taskId" -> task.id,
+              "status" -> STATUS_CREATED
+            )
+            .executeUpdate()
           try {
             this.unlockItem(user, task)
           } catch {

diff --git a/app/org/maproulette/framework/service/TaskBundleService.scala b/app/org/maproulette/framework/service/TaskBundleService.scala
@@ -120,8 +120,7 @@ class TaskBundleService @Inject() (
   def unbundleTasks(
       user: User,
       bundleId: Long,
-      taskIds: List[Long],
-      preventTaskIdUnlocks: List[Long]
+      taskIds: List[Long]
   )(): TaskBundle = {
     val bundle = this.getTaskBundle(user, bundleId)
 
@@ -132,7 +131,7 @@ class TaskBundleService @Inject() (
       )
     }
 
-    this.repository.unbundleTasks(user, bundleId, taskIds, preventTaskIdUnlocks)
+    this.repository.unbundleTasks(user, bundleId, taskIds)
     this.getTaskBundle(user, bundleId)
   }
 

diff --git a/conf/v2_route/bundle.api b/conf/v2_route/bundle.api
@@ -104,9 +104,5 @@ DELETE     /taskBundle/:id                          @org.maproulette.framework.c
 #     in: query
 #     description: The list of task ids to remove from the bundle
 #     required: true
-#   - name: preventTaskIdUnlocks
-#     in: query
-#     description: The list of task ids to keep locked when removed from bundle
-#     required: true
 ###
-POST       /taskBundle/:id/unbundle                 @org.maproulette.framework.controller.TaskBundleController.unbundleTasks(id:Long, taskIds:List[Long], preventTaskIdUnlocks:List[Long])
+POST       /taskBundle/:id/unbundle                 @org.maproulette.framework.controller.TaskBundleController.unbundleTasks(id:Long, taskIds:List[Long])
diff --git a/test/org/maproulette/framework/service/TaskBundleServiceSpec.scala b/test/org/maproulette/framework/service/TaskBundleServiceSpec.scala
@@ -239,7 +239,7 @@ class TaskBundleServiceSpec(implicit val application: Application) extends Frame
         primaryTaskId = Some(task1.id)
       )
 
-      this.service.unbundleTasks(User.superUser, bundle.bundleId, List(task2.id), List(task1.id))()
+      this.service.unbundleTasks(User.superUser, bundle.bundleId, List(task2.id))()
       val response = this.service.getTaskBundle(User.superUser, bundle.bundleId)
       response.taskIds.length mustEqual 1
       response.taskIds.head mustEqual task1.id
@@ -281,7 +281,7 @@ class TaskBundleServiceSpec(implicit val application: Application) extends Frame
 
       // Random user is not allowed to delete this bundle
       an[IllegalAccessException] should be thrownBy
-        this.service.unbundleTasks(randomUser, bundle.bundleId, List(task2.id), List())()
+        this.service.unbundleTasks(randomUser, bundle.bundleId, List(task2.id))()
     }
 
   }