resolves #362

lib/cache-db/src/main/kotlin/vdi/component/db/cache/CacheDB.kt

@@ -42,8 +42,7 @@ interface CacheDB {
 
   fun selectDatasetForUser(userID: UserID, datasetID: DatasetID): DatasetRecord?
 
-  // TODO: this is only used to list dataset IDs, very wasteful!!!
-  fun selectDatasetsForUser(userID: UserID): List<DatasetRecord>
+  fun selectUndeletedDatasetIDsForUser(userID: UserID): List<DatasetID>
 
   fun selectNonPrivateDatasets(): List<DatasetRecord>
 

lib/cache-db/src/main/kotlin/vdi/component/db/cache/CacheDBImpl.kt

@@ -84,7 +84,7 @@ internal object CacheDBImpl: CacheDB {
   override fun selectDatasetForUser(userID: UserID, datasetID: DatasetID) =
     connection.use { it.selectDatasetForUser(userID, datasetID) }
 
-  override fun selectDatasetsForUser(userID: UserID) = connection.use { it.selectDatasetsForUser(userID) }
+  override fun selectUndeletedDatasetIDsForUser(userID: UserID) = connection.use { it.selectUndeletedDatasetIDsForUser(userID) }
 
   override fun selectNonPrivateDatasets() = connection.use { it.selectNonPrivateDatasets() }
 

lib/cache-db/src/main/kotlin/vdi/component/db/cache/sql/select/select-undeleted-dataset-ids-for-user.kt

@@ -0,0 +1,24 @@
+package vdi.component.db.cache.sql.select
+
+import org.veupathdb.vdi.lib.common.field.DatasetID
+import org.veupathdb.vdi.lib.common.field.UserID
+import vdi.component.db.cache.util.*
+import java.sql.Connection
+
+// language=postgresql
+private const val SQL = """
+SELECT
+  d.dataset_id
+FROM
+  vdi.datasets AS d
+WHERE
+  d.owner_id = ?
+  AND d.is_deleted = FALSE
+"""
+
+internal fun Connection.selectUndeletedDatasetIDsForUser(userID: UserID): List<DatasetID> {
+  return withPreparedStatement(SQL) {
+    setUserID(1, userID)
+    withResults { map { getDatasetID("dataset_id") } }
+  }
+}

lib/test-utils/src/main/kotlin/vdi/test/cache-db.kt

@@ -23,7 +23,7 @@ fun mockCacheDB(
   onSelectUploadFileSummaries: (List<DatasetID>) -> Map<DatasetID, DatasetFileSummary> = ::oneParamMap,
   onSelectDatasetList: (DatasetListQuery) -> List<DatasetRecord> = ::oneParamList,
   onSelectDatasetForUser: (UserID, DatasetID) -> DatasetRecord? = ::twoParamNull,
-  onSelectDatasetsForUser: (UserID) -> List<DatasetRecord> = ::oneParamList,
+  onSelectDatasetsForUser: (UserID) -> List<DatasetID> = ::oneParamList,
   onSelectNonPrivateDatasets: () -> List<DatasetRecord> = ::noParamList,
   onSelectSharesForDataset: DSGetter<List<DatasetShare>> = ::oneParamList,
   onSelectSharesForDatasets: (List<DatasetID>) -> Map<DatasetID, List<DatasetShare>> = ::oneParamMap,
@@ -52,7 +52,7 @@ fun mockCacheDB(
     on { selectUploadFileSummaries(any()) } doAnswer { onSelectUploadFileSummaries(it.getArgument(0)) }
     on { selectDatasetList(any()) } doAnswer { onSelectDatasetList(it.getArgument(0)) }
     on { selectDatasetForUser(any(), any()) } doAnswer { onSelectDatasetForUser(it.getArgument(0), it.getArgument(1)) }
-    on { selectDatasetsForUser(any()) } doAnswer { onSelectDatasetsForUser(it.getArgument(0)) }
+    on { selectUndeletedDatasetIDsForUser(any()) } doAnswer { onSelectDatasetsForUser(it.getArgument(0)) }
     on { selectNonPrivateDatasets() } doAnswer { onSelectNonPrivateDatasets() }
     on { selectSharesForDataset(any()) } doAnswer { onSelectSharesForDataset(it.getArgument(0)) }
     on { selectSharesForDatasets(any()) } doAnswer { onSelectSharesForDatasets(it.getArgument(0)) }

service/rest-service/src/main/kotlin/org/veupathdb/service/vdi/service/users/get-meta.kt

@@ -23,9 +23,8 @@ private fun getUserQuotaInfo(userID: UserID): UserQuotaDetails =
 internal fun getCurrentQuotaUsage(userID: UserID): Long {
   val sizes = DatasetStore.listDatasetImportReadyZipSizes(userID)
 
-  return CacheDB().selectDatasetsForUser(userID)
+  return CacheDB().selectUndeletedDatasetIDsForUser(userID)
     .asSequence()
-    .filter { !it.isDeleted }
-    .map { sizes[it.datasetID] ?: 0L }
+    .map { sizes[it] ?: 0L }
     .sum()
 }