add resetTaskBundle endpoint

app/org/maproulette/framework/controller/TaskBundleController.scala

@@ -237,12 +237,13 @@ class TaskBundleController @Inject() (
     */
   def createTaskBundle(): Action[JsValue] = Action.async(bodyParsers.json) { implicit request =>
     this.sessionManager.authenticatedRequest { implicit user =>
-      val name = (request.body \ "name").asOpt[String].getOrElse("")
+      val name      = (request.body \ "name").asOpt[String].getOrElse("")
+      val primaryId = (request.body \ "primaryId").asOpt[Long]
       val taskIds = (request.body \ "taskIds").asOpt[List[Long]] match {
         case Some(tasks) => tasks
         case None        => throw new InvalidException("No task ids provided for task bundle")
       }
-      val bundle = this.serviceManager.taskBundle.createTaskBundle(user, name, taskIds)
+      val bundle = this.serviceManager.taskBundle.createTaskBundle(user, name, primaryId, taskIds)
       Created(Json.toJson(bundle))
     }
   }
@@ -253,8 +254,25 @@ class TaskBundleController @Inject() (
     * @param id The id for the bundle
     * @return Task Bundle
     */
-  def getTaskBundle(id: Long): Action[AnyContent] = Action.async { implicit request =>
+  def getTaskBundle(id: Long, lockTasks: Boolean): Action[AnyContent] = Action.async {
+    implicit request =>
+      this.sessionManager.authenticatedRequest { implicit user =>
+        Ok(Json.toJson(this.serviceManager.taskBundle.getTaskBundle(user, id, lockTasks)))
+      }
+  }
+
+  /**
+    *  Resets the bundle to the tasks provided, and unlock all tasks removed from current bundle
+    *
+    * @param bundleId The id of the bundle
+    * @param taskIds The task ids the bundle will reset to
+    */
+  def resetTaskBundle(
+      id: Long,
+      taskIds: List[Long]
+  ): Action[AnyContent] = Action.async { implicit request =>
     this.sessionManager.authenticatedRequest { implicit user =>
+      this.serviceManager.taskBundle.resetTaskBundle(user, id, taskIds)
       Ok(Json.toJson(this.serviceManager.taskBundle.getTaskBundle(user, id)))
     }
   }
@@ -266,24 +284,26 @@ class TaskBundleController @Inject() (
     * @param taskIds List of task ids to remove
     * @return Task Bundle
     */
-  def unbundleTasks(id: Long, taskIds: List[Long]): Action[AnyContent] = Action.async {
-    implicit request =>
-      this.sessionManager.authenticatedRequest { implicit user =>
-        this.serviceManager.taskBundle.unbundleTasks(user, id, taskIds)
-        Ok(Json.toJson(this.serviceManager.taskBundle.getTaskBundle(user, id)))
-      }
+  def unbundleTasks(
+      id: Long,
+      taskIds: List[Long],
+      preventTaskIdUnlocks: List[Long]
+  ): Action[AnyContent] = Action.async { implicit request =>
+    this.sessionManager.authenticatedRequest { implicit user =>
+      this.serviceManager.taskBundle.unbundleTasks(user, id, taskIds, preventTaskIdUnlocks)
+      Ok(Json.toJson(this.serviceManager.taskBundle.getTaskBundle(user, id)))
+    }
   }
 
   /**
     * Delete bundle.
     *
     * @param id        The id for the bundle
-    * @param primaryId optional task id to no unlock after deleting this bundle
     */
-  def deleteTaskBundle(id: Long, primaryId: Option[Long] = None): Action[AnyContent] =
+  def deleteTaskBundle(id: Long): Action[AnyContent] =
     Action.async { implicit request =>
       this.sessionManager.authenticatedRequest { implicit user =>
-        this.serviceManager.taskBundle.deleteTaskBundle(user, id, primaryId)
+        this.serviceManager.taskBundle.deleteTaskBundle(user, id)
         Ok
       }
     }

app/org/maproulette/framework/mixins/SearchParametersMixin.scala

@@ -40,6 +40,7 @@ trait SearchParametersMixin {
       this.filterChallengeStatus(params),
       this.filterChallengeRequiresLocal(params),
       this.filterBoundingGeometries(params),
+      this.filterBundleId(params),
       // For efficiency can only query on task properties with a parent challenge id
       this.filterTaskProps(params),
       this.filterChallenges(params),
@@ -324,6 +325,22 @@ trait SearchParametersMixin {
     }
   }
 
+  /**
+    * Filters by bundle id
+    * @param params with inverting on 'bid'
+    */
+  def filterBundleId(params: SearchParameters): FilterGroup = {
+    params.taskParams.bundleId match {
+      case Some(bid) =>
+        FilterGroup(
+          List(
+            CustomParameter(s"${Task.TABLE}.${Task.FIELD_BUNDLE_ID} = $bid")
+          )
+        )
+      case _ => FilterGroup(List())
+    }
+  }
+
   /**
     * Filters by tasks.priority
     * @param params with inverting on 'priorities'