Do not have virtual remote datasets deleted

Author: frcroth

app/models/dataset/DataStore.scala

@@ -79,7 +79,8 @@ class DataStoreService @Inject()(dataStoreDAO: DataStoreDAO, jobService: JobServ
 
   def validateAccess(name: String, key: String)(block: DataStore => Future[Result])(
       implicit m: MessagesProvider): Fox[Result] =
-    Fox.fromFuture((for {dataStore <- dataStoreDAO.findOneByName(name)(GlobalAccessContext)
+    Fox.fromFuture((for {
+      dataStore <- dataStoreDAO.findOneByName(name)(GlobalAccessContext)
       _ <- Fox.fromBool(key == dataStore.key)
       result <- Fox.fromFuture(block(dataStore))
     } yield result).getOrElse(Forbidden(Json.obj("granted" -> false, "msg" -> Messages("dataStore.notFound")))))

app/models/dataset/DatasetService.scala

@@ -37,7 +37,6 @@ import models.team._
 import models.user.{User, UserService}
 import net.liftweb.common.Box.tryo
 import net.liftweb.common.{Empty, EmptyBox, Full}
-import play.api.i18n.Messages
 import play.api.libs.json.{JsObject, Json}
 import security.RandomIDGenerator
 import utils.WkConf
@@ -65,7 +64,9 @@ class DatasetService @Inject()(organizationDAO: OrganizationDAO,
     with LazyLogging {
   private val unreportedStatus = datasetDAO.unreportedStatus
   private val notYetUploadedStatus = "Not yet fully uploaded."
-  private val inactiveStatusList = List(unreportedStatus, notYetUploadedStatus, datasetDAO.deletedByUserStatus)
+  private val virtualRemoteDatasetStatus = "Virtual remote dataset" // Virtual datasets should not be deleted when not reported
+  private val inactiveStatusList =
+    List(unreportedStatus, notYetUploadedStatus, datasetDAO.deletedByUserStatus, virtualRemoteDatasetStatus)
 
   def assertValidDatasetName(name: String): Fox[Unit] =
     for {
@@ -99,8 +100,6 @@ class DatasetService @Inject()(organizationDAO: OrganizationDAO,
     } yield newDataset
   }
 
-  private def virtualRemoteDatasetStatus = "Virtual remote dataset"
-
   def createVirtualDataset(datasetName: String,
                            organizationId: String,
                            dataStore: DataStore,

app/models/dataset/WKRemoteDataStoreClient.scala

@@ -9,14 +9,12 @@ import com.scalableminds.webknossos.datastore.explore.{
   ExploreRemoteLayerParameters
 }
 import com.scalableminds.webknossos.datastore.models.{AdditionalCoordinate, RawCuboidRequest}
-import com.scalableminds.webknossos.datastore.models.datasource.{DataLayer, GenericDataSource}
 import com.scalableminds.webknossos.datastore.rpc.RPC
 import com.scalableminds.webknossos.datastore.services.DirectoryStorageReport
 import com.typesafe.scalalogging.LazyLogging
 import controllers.RpcTokenHolder
 import play.api.libs.json.JsObject
 import play.utils.UriEncoding
-import com.scalableminds.util.objectid.ObjectId
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.DurationInt

app/models/dataset/explore/WKExploreRemoteLayerService.scala

@@ -121,6 +121,5 @@ class WKExploreRemoteLayerService @Inject()(credentialService: CredentialService
         folderId.map(_.toString),
         user
       )
-    } yield datasetId
-
+    } yield ()
 }