Use status instead of column

scalableminds · Nov 13, 2023 · 5349251 · 5349251
1 parent bc220c4
commit 5349251
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 56 deletions.
diff --git a/app/models/dataset/Dataset.scala b/app/models/dataset/Dataset.scala
@@ -34,32 +34,30 @@ import utils.ObjectId
 
 import scala.concurrent.ExecutionContext
 
-case class Dataset(
-    _id: ObjectId,
-    _dataStore: String,
-    _organization: ObjectId,
-    _publication: Option[ObjectId],
-    _uploader: Option[ObjectId],
-    _folder: ObjectId,
-    inboxSourceHash: Option[Int],
-    defaultViewConfiguration: Option[DatasetViewConfiguration] = None,
-    adminViewConfiguration: Option[DatasetViewConfiguration] = None,
-    description: Option[String] = None,
-    displayName: Option[String] = None,
-    isPublic: Boolean,
-    isUsable: Boolean,
-    name: String,
-    scale: Option[Vec3Double],
-    sharingToken: Option[String],
-    status: String,
-    logoUrl: Option[String],
-    sortingKey: Instant = Instant.now,
-    details: Option[JsObject] = None,
-    tags: Set[String] = Set.empty,
-    created: Instant = Instant.now,
-    isDeleted: Boolean = false,
-    isRemovedOnDisk: Boolean = false
-) extends FoxImplicits {
+case class Dataset(_id: ObjectId,
+                   _dataStore: String,
+                   _organization: ObjectId,
+                   _publication: Option[ObjectId],
+                   _uploader: Option[ObjectId],
+                   _folder: ObjectId,
+                   inboxSourceHash: Option[Int],
+                   defaultViewConfiguration: Option[DatasetViewConfiguration] = None,
+                   adminViewConfiguration: Option[DatasetViewConfiguration] = None,
+                   description: Option[String] = None,
+                   displayName: Option[String] = None,
+                   isPublic: Boolean,
+                   isUsable: Boolean,
+                   name: String,
+                   scale: Option[Vec3Double],
+                   sharingToken: Option[String],
+                   status: String,
+                   logoUrl: Option[String],
+                   sortingKey: Instant = Instant.now,
+                   details: Option[JsObject] = None,
+                   tags: Set[String] = Set.empty,
+                   created: Instant = Instant.now,
+                   isDeleted: Boolean = false)
+    extends FoxImplicits {
 
   def urlEncodedName: String =
     UriEncoding.encodePathSegment(name, "UTF-8")
@@ -94,6 +92,7 @@ class DatasetDAO @Inject()(sqlClient: SqlClient, datasetLayerDAO: DatasetLayerDA
   protected def isDeletedColumn(x: Datasets): Rep[Boolean] = x.isdeleted
 
   val unreportedStatus: String = "No longer available on datastore."
+  val deletedByUserStatus: String = "Deleted by user."
 
   private def parseScaleOpt(literalOpt: Option[String]): Fox[Option[Vec3Double]] = literalOpt match {
     case Some(literal) =>
@@ -135,8 +134,7 @@ class DatasetDAO @Inject()(sqlClient: SqlClient, datasetLayerDAO: DatasetLayerDA
         details,
         parseArrayLiteral(r.tags).toSet,
         Instant.fromSql(r.created),
-        r.isdeleted,
-        r.isremovedondisk
+        r.isdeleted
       )
     }
 
@@ -317,7 +315,7 @@ class DatasetDAO @Inject()(sqlClient: SqlClient, datasetLayerDAO: DatasetLayerDA
         .getOrElse(q"${true}")
       searchPredicate = buildSearchPredicate(searchQuery)
       isUnreportedPredicate = buildIsUnreportedPredicate(isUnreported)
-      excludeRemovedOnDiskPredicate = if (excludeRemovedOnDisk) q"isRemovedOnDisk != true" else q"${true}"
+      excludeRemovedOnDiskPredicate = if (excludeRemovedOnDisk) q"status != $deletedByUserStatus" else q"${true}"
     } yield q"""
             ($folderPredicate)
         AND ($uploaderPredicate)
@@ -573,7 +571,7 @@ class DatasetDAO @Inject()(sqlClient: SqlClient, datasetLayerDAO: DatasetLayerDA
     val deleteAllowedTeamsQuery = q"delete from webknossos.dataSet_allowedTeams where _dataset = $datasetId".asUpdate
     val deleteDatasetQuery =
       if (onlyMarkAsDeleted)
-        q"update webknossos.datasets set isRemovedOnDisk = true where _id = $datasetId".asUpdate
+        q"update webknossos.datasets set status = $deletedByUserStatus where _id = $datasetId".asUpdate
       else
         q"delete from webknossos.datasets where _id = $datasetId".asUpdate
 

diff --git a/conf/evolutions/110-mark-datasets-as-deleted-on-disk.sql b/conf/evolutions/110-mark-datasets-as-deleted-on-disk.sql
diff --git a/conf/evolutions/reversions/110-mark-dataset-as-deleted-on-disk.sql b/conf/evolutions/reversions/110-mark-dataset-as-deleted-on-disk.sql
diff --git a/tools/postgres/schema.sql b/tools/postgres/schema.sql
@@ -20,7 +20,7 @@ CREATE TABLE webknossos.releaseInformation (
   schemaVersion BIGINT NOT NULL
 );
 
-INSERT INTO webknossos.releaseInformation(schemaVersion) values(110);
+INSERT INTO webknossos.releaseInformation(schemaVersion) values(109);
 COMMIT TRANSACTION;
 
 
@@ -123,7 +123,6 @@ CREATE TABLE webknossos.dataSets(
   details JSONB,
   tags VARCHAR(256)[] NOT NULL DEFAULT '{}',
   created TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  isRemovedOnDisk BOOLEAN NOT NULL DEFAULT false,
   isDeleted BOOLEAN NOT NULL DEFAULT false,
   UNIQUE (name, _organization),
   CONSTRAINT defaultViewConfigurationIsJsonObject CHECK(jsonb_typeof(defaultViewConfiguration) = 'object'),