Fix cleanup after failed convert_to_wkw job (#8426)

Author: fm3

app/controllers/WKRemoteWorkerController.scala

@@ -28,7 +28,7 @@ class WKRemoteWorkerController @Inject()(jobDAO: JobDAO,
 
   def requestJobs(key: String): Action[AnyContent] = Action.async { implicit request =>
     for {
-      worker <- workerDAO.findOneByKey(key) ?~> "jobs.worker.notFound"
+      worker <- workerDAO.findOneByKey(key) ?~> "job.worker.notFound"
       _ = workerDAO.updateHeartBeat(worker._id)
       _ <- reserveNextJobs(worker, pendingIterationCount = 10)
       assignedUnfinishedJobs: List[Job] <- jobDAO.findAllUnfinishedByWorker(worker._id)
@@ -75,19 +75,19 @@ class WKRemoteWorkerController @Inject()(jobDAO: JobDAO,
   def updateJobStatus(key: String, id: ObjectId): Action[JobStatus] = Action.async(validateJson[JobStatus]) {
     implicit request =>
       for {
-        _ <- workerDAO.findOneByKey(key) ?~> "jobs.worker.notFound"
+        _ <- workerDAO.findOneByKey(key) ?~> "job.worker.notFound"
         jobBeforeChange <- jobDAO.findOne(id)(GlobalAccessContext)
         _ <- jobDAO.updateStatus(id, request.body)
-        jobAfterChange <- jobDAO.findOne(id)(GlobalAccessContext)
+        jobAfterChange <- jobDAO.findOne(id)(GlobalAccessContext) ?~> "job.notFound"
         _ = jobService.trackStatusChange(jobBeforeChange, jobAfterChange)
-        _ <- jobService.cleanUpIfFailed(jobAfterChange)
+        _ <- jobService.cleanUpIfFailed(jobAfterChange) ?~> "job.cleanup.failed"
       } yield Ok
   }
 
   def attachVoxelyticsWorkflow(key: String, id: ObjectId): Action[String] = Action.async(validateJson[String]) {
     implicit request =>
       for {
-        _ <- workerDAO.findOneByKey(key) ?~> "jobs.worker.notFound"
+        _ <- workerDAO.findOneByKey(key) ?~> "job.worker.notFound"
         _ <- bool2Fox(wkConf.Features.voxelyticsEnabled) ?~> "voxelytics.disabled"
         organizationId <- jobDAO.organizationIdForJobId(id) ?~> "job.notFound"
         workflowHash = request.body
@@ -105,7 +105,7 @@ class WKRemoteWorkerController @Inject()(jobDAO: JobDAO,
     Action.async(validateJson[String]) { implicit request =>
       implicit val ctx: DBAccessContext = GlobalAccessContext
       for {
-        _ <- workerDAO.findOneByKey(key) ?~> "jobs.worker.notFound"
+        _ <- workerDAO.findOneByKey(key) ?~> "job.worker.notFound"
         organizationId <- jobDAO.organizationIdForJobId(id) ?~> "job.notFound"
         dataset <- datasetDAO.findOneByDirectoryNameAndOrganization(request.body, organizationId)
         aiInference <- aiInferenceDAO.findOneByJobId(id) ?~> "aiInference.notFound"

app/models/job/JobService.scala

@@ -149,11 +149,12 @@ class JobService @Inject()(wkConf: WkConf,
 
   def cleanUpIfFailed(job: Job): Fox[Unit] =
     if (job.state == JobState.FAILURE && job.command == JobCommand.convert_to_wkw) {
-      logger.info(s"WKW conversion job ${job._id} failed. Deleting dataset from the database, freeing the name...")
+      logger.info(
+        s"WKW conversion job ${job._id} failed. Deleting dataset from the database, freeing the directoryName...")
       val commandArgs = job.commandArgs.value
       for {
         datasetDirectoryName <- commandArgs.get("dataset_directory_name").map(_.as[String]).toFox
-        organizationId <- commandArgs.get("organization_name").map(_.as[String]).toFox
+        organizationId <- commandArgs.get("organization_id").map(_.as[String]).toFox
         dataset <- datasetDAO.findOneByDirectoryNameAndOrganization(datasetDirectoryName, organizationId)(
           GlobalAccessContext)
         _ <- datasetDAO.deleteDataset(dataset._id)