simplify job sweep deletion

- qdel is not necessary on DB sweep
- no need to fetch the job on batch delete old jobs (only drawback is that the watchers will need to refresh in order to see it removed)

modules/cluster-api/src/main/scala/de/proteinevolution/cluster/api/Qdel.scala

@@ -23,6 +23,4 @@ object Qdel {
 
   def run(sgeJobId: String): Int = s"qdel $sgeJobId" !
 
-  def runMultiple(sgeJobIds: List[String]): Int = s"qdel ${sgeJobIds.mkString(" ")}" !
-
 }

modules/jobs/src/main/scala/de/proteinevolution/jobs/actors/JobActor.scala

@@ -45,9 +45,9 @@ import de.proteinevolution.tel.execution.{ExecutionContext, WrapperExecutionFact
 import de.proteinevolution.tel.runscripts.Runscript.Evaluation
 import de.proteinevolution.tel.runscripts._
 import javax.inject.Inject
+import play.api.Configuration
 import play.api.cache.{NamedCache, SyncCacheApi}
 import play.api.libs.mailer.MailerClient
-import play.api.Configuration
 import reactivemongo.api.bson.BSONDateTime
 
 import scala.concurrent.Future
@@ -152,7 +152,7 @@ class JobActor @Inject()(
     }
   }
 
-  private def removeJob(jobID: String): Unit = {
+  private def updateJobLogAndExecution(jobID: String): Unit = {
     // Save Job Event Log to the collection and remove it from the map afterwards
     if (currentJobLogs.contains(jobID)) {
       currentJobs = currentJobs.filter(_._1 != jobID)
@@ -169,18 +169,20 @@ class JobActor @Inject()(
     }
   }
 
-  private def delete(job: Job): Future[Unit] = {
-    s"${constants.jobPath}${job.jobID}".toFile.delete(swallowIOExceptions = true)
-    removeJob(job.jobID) // Remove the job from the current job map
-    val foundWatchers = job.watchList.flatMap(userID => wsActorCache.get(userID): Option[List[ActorRef]])
-    foundWatchers.flatten.foreach(_ ! ClearJob(job.jobID))
-    job.clusterData.foreach(clusterData => Qdel.run(clusterData.sgeID))
+  private def deleteJob(jobID: String): Future[Unit] = {
+    s"${constants.jobPath}${jobID}".toFile.delete(swallowIOExceptions = true)
+    updateJobLogAndExecution(jobID) // Remove the job from the current job map
     for {
-      _ <- jobDao.removeJob(job.jobID)
-      _ <- userDao.removeJob(job.jobID)
+      _ <- jobDao.removeJob(jobID)
+      _ <- userDao.removeJob(jobID)
     } yield ()
   }
 
+  private def sendClearEvent(job: Job): Unit = {
+    val foundWatchers = job.watchList.flatMap(userID => wsActorCache.get(userID): Option[List[ActorRef]])
+    foundWatchers.flatten.foreach(_ ! ClearJob(job.jobID))
+  }
+
   private def updateJobState(job: Job): Future[Job] = {
     // Push the updated job into the current jobs
     currentJobs = currentJobs.updated(job.jobID, job)
@@ -344,7 +346,7 @@ class JobActor @Inject()(
         case None => NotUsed
       }
 
-    case Delete(jobID, userIDOption) =>
+    case Delete(jobID, userID) =>
       val verbose = true // just switch this on / off for logging
       if (verbose) log.info(s"[JobActor[$jobActorNumber].Delete] Received Delete for $jobID")
       this
@@ -361,21 +363,19 @@ class JobActor @Inject()(
         .foreach {
           case Some(job) =>
             // Delete the job when the user is the owner and clear it otherwise
-            if (userIDOption.isEmpty || userIDOption.get == job.ownerID) {
+            if (userID == job.ownerID) {
               if (verbose)
                 log.info(s"[JobActor[$jobActorNumber].Delete] Found Job with ${job.jobID} - starting file deletion")
-              delete(job)
+              job.clusterData.foreach(clusterData => Qdel.run(clusterData.sgeID))
+              sendClearEvent(job)
+              deleteJob(job.jobID)
             } else {
-              userIDOption match {
-                case Some(userID) =>
-                  self ! RemoveFromWatchlist(jobID, userID)
-                case None => NotUsed
-              }
+              self ! RemoveFromWatchlist(jobID, userID)
             }
           case None => NotUsed
         }
 
-    case DeleteList(jobList, _) => val _ = Qdel.runMultiple(jobList)
+    case DeleteList(jobList) => jobList.foreach(deleteJob)
 
     case CheckIPHash(jobID) =>
       getCurrentJob(jobID).foreach {
@@ -568,7 +568,7 @@ class JobActor @Inject()(
             // Now we can update the JobState and remove it, once the update has completed
             updateJobState(job).map { job =>
               //Remove the job from the jobActor
-              removeJob(job.jobID)
+              updateJobLogAndExecution(job.jobID)
               // Tell the user that their job finished via eMail (can be either failed or done)
               sendJobUpdateMail(job)
             }
@@ -653,10 +653,10 @@ object JobActor {
   case class RemoveFromWatchlist(jobID: String, userID: String)
 
   // JobActor is requested to Delete the job
-  case class Delete(jobID: String, userID: Option[String] = None)
+  case class Delete(jobID: String, userID: String)
 
   // Delete multiple jobs at once
-  case class DeleteList(jobIDs: List[String], userID: Option[String] = None)
+  case class DeleteList(jobIDs: List[String])
 
   // Job Controller receives a job state change from the SGE or from any other valid source
   case class JobStateChanged(jobID: String, jobState: JobState)

modules/jobs/src/main/scala/de/proteinevolution/jobs/controllers/SubmissionController.scala

@@ -84,7 +84,7 @@ class SubmissionController @Inject()(
 
   def delete(jobID: String): Action[AnyContent] = userAction { implicit request =>
     logger.info("Delete Action in JobController reached")
-    jobActorAccess.sendToJobActor(jobID, Delete(jobID, Some(request.user.userID)))
+    jobActorAccess.sendToJobActor(jobID, Delete(jobID, request.user.userID))
     NoContent
   }