format

loculus-project · Jan 23, 2025 · fb9eff5 · fb9eff5
1 parent b6997b9
commit fb9eff5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/.../src/main/kotlin/org/loculus/backend/service/submission/CurrentProcessingPipelineTable.kt b/.../src/main/kotlin/org/loculus/backend/service/submission/CurrentProcessingPipelineTable.kt
@@ -12,12 +12,11 @@ object CurrentProcessingPipelineTable : Table(CURRENT_PROCESSING_PIPELINE_TABLE_
     val organismColumn = varchar("organism", 255)
     val startedUsingAtColumn = datetime("started_using_at")
 
-    fun pipelineNeedsUpdate(foundVersion: Long, organism: String) =
-        CurrentProcessingPipelineTable
-            .selectAll()
-            .where { CurrentProcessingPipelineTable.versionColumn neq foundVersion }
-            .andWhere { CurrentProcessingPipelineTable.organismColumn eq organism }
-            .limit(1)
-            .empty()
-            .not()
+    fun pipelineNeedsUpdate(foundVersion: Long, organism: String) = CurrentProcessingPipelineTable
+        .selectAll()
+        .where { CurrentProcessingPipelineTable.versionColumn neq foundVersion }
+        .andWhere { CurrentProcessingPipelineTable.organismColumn eq organism }
+        .limit(1)
+        .empty()
+        .not()
 }
diff --git a/backend/src/main/kotlin/org/loculus/backend/service/submission/SequenceEntriesTable.kt b/backend/src/main/kotlin/org/loculus/backend/service/submission/SequenceEntriesTable.kt
@@ -44,14 +44,13 @@ object SequenceEntriesTable : Table(SEQUENCE_ENTRIES_TABLE_NAME) {
         )
     }
 
-    fun distinctOrganisms() =
-        SequenceEntriesTable
-            .select(SequenceEntriesTable.organismColumn)
-            .withDistinct()
-            .asSequence()
-            .map {
-                it[SequenceEntriesTable.organismColumn]
-            }
+    fun distinctOrganisms() = SequenceEntriesTable
+        .select(SequenceEntriesTable.organismColumn)
+        .withDistinct()
+        .asSequence()
+        .map {
+            it[SequenceEntriesTable.organismColumn]
+        }
 
     fun accessionVersionIsIn(accessionVersions: List<AccessionVersionInterface>) =
         Pair(accessionColumn, versionColumn) inList accessionVersions.toPairs()

diff --git a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
@@ -15,7 +15,6 @@ import org.jetbrains.exposed.sql.Op
 import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.plus
-import org.jetbrains.exposed.sql.StringColumnType
 import org.jetbrains.exposed.sql.Transaction
 import org.jetbrains.exposed.sql.VarCharColumnType
 import org.jetbrains.exposed.sql.alias
@@ -1224,9 +1223,9 @@ private fun Transaction.findNewPreprocessingPipelineVersion(organism: String): L
             Pair(VarCharColumnType(), organism),
             Pair(VarCharColumnType(), organism),
             Pair(VarCharColumnType(), organism),
-            Pair(VarCharColumnType(), organism)
+            Pair(VarCharColumnType(), organism),
         ),
-        explicitStatementType = StatementType.SELECT
+        explicitStatementType = StatementType.SELECT,
     ) { resultSet ->
         if (!resultSet.next()) {
             return@exec null