Skip to content

Commit 180bf56

Browse files
committed
Revert unneeded changes to original metadata
1 parent b502eb5 commit 180bf56

4 files changed

Lines changed: 2 additions & 18 deletions

File tree

backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ open class SubmissionController(
449449
organism,
450450
groupIdsFilter?.takeIf { it.isNotEmpty() },
451451
statusesFilter?.takeIf { it.isNotEmpty() },
452-
null,
453452
)
454453
headers.add(X_TOTAL_RECORDS, totalRecords.toString())
455454
// TODO(https://github.com/loculus-project/loculus/issues/2778)
@@ -465,7 +464,6 @@ open class SubmissionController(
465464
groupIdsFilter?.takeIf { it.isNotEmpty() },
466465
statusesFilter?.takeIf { it.isNotEmpty() },
467466
fields?.takeIf { it.isNotEmpty() },
468-
null,
469467
)
470468
}
471469

backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,6 @@ class SubmissionDatabaseService(
12311231
organism: Organism,
12321232
groupIdsFilter: List<Int>?,
12331233
statusesFilter: List<Status>?,
1234-
accessionVersionsFilter: List<AccessionVersion>?,
12351234
): Op<Boolean> {
12361235
val organismCondition = SequenceEntriesView.organismIs(organism)
12371236
val groupCondition = getGroupCondition(groupIdsFilter, authenticatedUser)
@@ -1240,12 +1239,7 @@ class SubmissionDatabaseService(
12401239
} else {
12411240
Op.TRUE
12421241
}
1243-
val accessionVersionCondition = if (accessionVersionsFilter != null) {
1244-
SequenceEntriesView.accessionVersionIsIn(accessionVersionsFilter)
1245-
} else {
1246-
Op.TRUE
1247-
}
1248-
val conditions = organismCondition and groupCondition and statusCondition and accessionVersionCondition
1242+
val conditions = organismCondition and groupCondition and statusCondition
12491243

12501244
return conditions
12511245
}
@@ -1255,7 +1249,6 @@ class SubmissionDatabaseService(
12551249
organism: Organism,
12561250
groupIdsFilter: List<Int>?,
12571251
statusesFilter: List<Status>?,
1258-
accessionVersionsFilter: List<AccessionVersion>?,
12591252
): Long = SequenceEntriesView
12601253
.selectAll()
12611254
.where(
@@ -1264,7 +1257,6 @@ class SubmissionDatabaseService(
12641257
organism,
12651258
groupIdsFilter,
12661259
statusesFilter,
1267-
accessionVersionsFilter,
12681260
),
12691261
)
12701262
.count()
@@ -1275,7 +1267,6 @@ class SubmissionDatabaseService(
12751267
groupIdsFilter: List<Int>?,
12761268
statusesFilter: List<Status>?,
12771269
fields: List<String>?,
1278-
accessionVersionsFilter: List<AccessionVersion>?,
12791270
): Sequence<AccessionVersionUnprocessedMetadata> {
12801271
val unprocessedMetadata = SequenceEntriesView.unprocessedDataColumn
12811272
// It's actually <Map<String, String>?> but exposed does not support nullable types here
@@ -1296,7 +1287,6 @@ class SubmissionDatabaseService(
12961287
organism,
12971288
groupIdsFilter,
12981289
statusesFilter,
1299-
accessionVersionsFilter,
13001290
),
13011291
)
13021292
.fetchSize(streamBatchSize)

backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionControllerClient.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ class SubmissionControllerClient(private val mockMvc: MockMvc, private val objec
309309
statusesFilter: List<Status>? = null,
310310
fields: List<String>? = null,
311311
compression: String? = null,
312-
accessionVersionsFilter: List<String>? = null,
313312
): ResultActions = mockMvc.perform(
314313
get(addOrganismToPath("/get-unprocessed-metadata", organism = organism))
315314
.withAuth(jwt)
@@ -321,8 +320,7 @@ class SubmissionControllerClient(private val mockMvc: MockMvc, private val objec
321320
}
322321
.param("groupIdsFilter", groupIdsFilter?.joinToString(",") { it.toString() })
323322
.param("statusesFilter", statusesFilter?.joinToString(",") { it.name })
324-
.param("fields", fields?.joinToString(","))
325-
.param("accessionVersionsFilter", accessionVersionsFilter?.joinToString(",")),
323+
.param("fields", fields?.joinToString(",")),
326324
)
327325

328326
fun getOriginalData(

backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmissionConvenienceClient.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,6 @@ class SubmissionConvenienceClient(
506506
statusesFilter: List<Status>? = null,
507507
fields: List<String>? = null,
508508
compression: String? = null,
509-
accessionVersionsFilter: List<String>? = null,
510509
) = client
511510
.getUnprocessedMetadata(
512511
organism = organism,
@@ -515,7 +514,6 @@ class SubmissionConvenienceClient(
515514
statusesFilter = statusesFilter,
516515
fields = fields,
517516
compression = compression,
518-
accessionVersionsFilter = accessionVersionsFilter,
519517
)
520518
.expectNdjsonAndGetContent<AccessionVersionUnprocessedMetadata>()
521519

0 commit comments

Comments
 (0)