Skip to content

Commit 1514df7

Browse files
author
Jonas Kellerer
committed
feat: add dataFormat to swaggerUI for GET requests
1 parent ce0a6e1 commit 1514df7

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

lapis2/src/main/kotlin/org/genspectrum/lapis/OpenApiDocs.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import org.genspectrum.lapis.controller.DETAILS_REQUEST_SCHEMA
1818
import org.genspectrum.lapis.controller.DETAILS_RESPONSE_SCHEMA
1919
import org.genspectrum.lapis.controller.FIELDS_PROPERTY
2020
import org.genspectrum.lapis.controller.FORMAT_PROPERTY
21+
import org.genspectrum.lapis.controller.FORMAT_SCHEMA
2122
import org.genspectrum.lapis.controller.LIMIT_DESCRIPTION
2223
import org.genspectrum.lapis.controller.LIMIT_PROPERTY
2324
import org.genspectrum.lapis.controller.LIMIT_SCHEMA
@@ -106,7 +107,8 @@ fun buildOpenApiSchema(sequenceFilterFields: SequenceFilterFields, databaseConfi
106107
.addSchemas(AMINO_ACID_MUTATIONS_SCHEMA, aminoAcidMutations())
107108
.addSchemas(ORDER_BY_FIELDS_SCHEMA, orderByGetSchema())
108109
.addSchemas(LIMIT_SCHEMA, limitSchema())
109-
.addSchemas(OFFSET_SCHEMA, offsetSchema()),
110+
.addSchemas(OFFSET_SCHEMA, offsetSchema())
111+
.addSchemas(FORMAT_SCHEMA, formatSchema()),
110112
)
111113
}
112114

lapis2/src/main/kotlin/org/genspectrum/lapis/controller/LapisController.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ const val AMINO_ACID_MUTATIONS_SCHEMA = "AminoAcidMutations"
3737
const val ORDER_BY_FIELDS_SCHEMA = "OrderByFields"
3838
const val LIMIT_SCHEMA = "Limit"
3939
const val OFFSET_SCHEMA = "Offset"
40+
const val FORMAT_SCHEMA = "DataFormat"
4041

4142
const val DETAILS_ENDPOINT_DESCRIPTION = "Returns the specified metadata fields of sequences matching the filter."
4243
const val AGGREGATED_ENDPONT_DESCRIPTION = "Returns the number of sequences matching the specified sequence filters"
@@ -95,6 +96,12 @@ class LapisController(
9596
)
9697
@RequestParam
9798
offset: Int? = null,
99+
@Parameter(
100+
schema = Schema(ref = "#/components/schemas/$FORMAT_SCHEMA"),
101+
description = "The format of the response.",
102+
)
103+
@RequestParam
104+
dataFormat: String? = null,
98105
): LapisResponse<List<AggregationData>> {
99106
val request = SequenceFiltersRequestWithFields(
100107
sequenceFilters?.filter { !SPECIAL_REQUEST_PROPERTIES.contains(it.key) } ?: emptyMap(),
@@ -366,6 +373,12 @@ class LapisController(
366373
)
367374
@RequestParam
368375
offset: Int? = null,
376+
@Parameter(
377+
schema = Schema(ref = "#/components/schemas/$FORMAT_SCHEMA"),
378+
description = "The format of the response.",
379+
)
380+
@RequestParam
381+
dataFormat: String? = null,
369382
): LapisResponse<List<DetailsData>> {
370383
val request = SequenceFiltersRequestWithFields(
371384
sequenceFilters?.filter { !SPECIAL_REQUEST_PROPERTIES.contains(it.key) } ?: emptyMap(),

0 commit comments

Comments
 (0)