@@ -12,6 +12,7 @@ import org.genspectrum.lapis.controller.AGGREGATED_GROUP_BY_FIELDS_DESCRIPTION
12
12
import org.genspectrum.lapis.controller.AGGREGATED_REQUEST_SCHEMA
13
13
import org.genspectrum.lapis.controller.AGGREGATED_RESPONSE_SCHEMA
14
14
import org.genspectrum.lapis.controller.AMINO_ACID_INSERTIONS_PROPERTY
15
+ import org.genspectrum.lapis.controller.AMINO_ACID_INSERTIONS_RESPONSE_SCHEMA
15
16
import org.genspectrum.lapis.controller.AMINO_ACID_INSERTIONS_SCHEMA
16
17
import org.genspectrum.lapis.controller.AMINO_ACID_MUTATIONS_PROPERTY
17
18
import org.genspectrum.lapis.controller.AMINO_ACID_MUTATIONS_RESPONSE_SCHEMA
@@ -23,14 +24,14 @@ import org.genspectrum.lapis.controller.FIELDS_PROPERTY
23
24
import org.genspectrum.lapis.controller.FORMAT_DESCRIPTION
24
25
import org.genspectrum.lapis.controller.FORMAT_PROPERTY
25
26
import org.genspectrum.lapis.controller.FORMAT_SCHEMA
27
+ import org.genspectrum.lapis.controller.INSERTIONS_REQUEST_SCHEMA
26
28
import org.genspectrum.lapis.controller.LIMIT_DESCRIPTION
27
29
import org.genspectrum.lapis.controller.LIMIT_PROPERTY
28
30
import org.genspectrum.lapis.controller.LIMIT_SCHEMA
29
31
import org.genspectrum.lapis.controller.MIN_PROPORTION_PROPERTY
30
32
import org.genspectrum.lapis.controller.NUCLEOTIDE_INSERTIONS_PROPERTY
31
- import org.genspectrum.lapis.controller.NUCLEOTIDE_INSERTIONS_REQUEST_SCHEMA
32
- import org.genspectrum.lapis.controller.NUCLEOTIDE_INSERTIONS_SCHEMA
33
33
import org.genspectrum.lapis.controller.NUCLEOTIDE_INSERTIONS_RESPONSE_SCHEMA
34
+ import org.genspectrum.lapis.controller.NUCLEOTIDE_INSERTIONS_SCHEMA
34
35
import org.genspectrum.lapis.controller.NUCLEOTIDE_MUTATIONS_PROPERTY
35
36
import org.genspectrum.lapis.controller.NUCLEOTIDE_MUTATIONS_RESPONSE_SCHEMA
36
37
import org.genspectrum.lapis.controller.NUCLEOTIDE_MUTATIONS_SCHEMA
@@ -92,9 +93,9 @@ fun buildOpenApiSchema(sequenceFilterFields: SequenceFilterFields, databaseConfi
92
93
requestSchemaWithFields(sequenceFilters, DETAILS_FIELDS_DESCRIPTION ),
93
94
)
94
95
.addSchemas(
95
- NUCLEOTIDE_INSERTIONS_REQUEST_SCHEMA ,
96
- requestSchemaForCommonSequencenFilters (sequenceFilters),
97
- )
96
+ INSERTIONS_REQUEST_SCHEMA ,
97
+ requestSchemaForCommonSequenceFilters (sequenceFilters),
98
+ )
98
99
.addSchemas(
99
100
AGGREGATED_RESPONSE_SCHEMA ,
100
101
lapisResponseSchema(
@@ -152,6 +153,15 @@ fun buildOpenApiSchema(sequenceFilterFields: SequenceFilterFields, databaseConfi
152
153
.properties(nucleotideInsertionSchema()),
153
154
),
154
155
)
156
+ .addSchemas(
157
+ AMINO_ACID_INSERTIONS_RESPONSE_SCHEMA ,
158
+ lapisResponseSchema(
159
+ Schema <String >()
160
+ .type(" object" )
161
+ .description(" Amino Acid Insertion data." )
162
+ .properties(aminoAcidInsertionSchema()),
163
+ ),
164
+ )
155
165
.addSchemas(AMINO_ACID_MUTATIONS_SCHEMA , aminoAcidMutations())
156
166
.addSchemas(NUCLEOTIDE_INSERTIONS_SCHEMA , nucleotideInsertions())
157
167
.addSchemas(AMINO_ACID_INSERTIONS_SCHEMA , aminoAcidInsertions())
@@ -194,7 +204,7 @@ private fun primitiveSequenceFilterFieldSchemas(sequenceFilterFields: SequenceFi
194
204
.map { (fieldName, fieldType) -> fieldName to Schema <String >().type(fieldType.openApiType) }
195
205
.toMap()
196
206
197
- private fun requestSchemaForCommonSequencenFilters (
207
+ private fun requestSchemaForCommonSequenceFilters (
198
208
requestProperties : Map <SequenceFilterFieldName , Schema <out Any >>,
199
209
): Schema <* > =
200
210
Schema <String >()
@@ -254,6 +264,15 @@ private fun nucleotideInsertionSchema() =
254
264
.description(" The number of sequences matching having the insertion." ),
255
265
)
256
266
267
+ private fun aminoAcidInsertionSchema () =
268
+ mapOf (
269
+ " insertion" to Schema <String >().type(" string" )
270
+ .example(" ins_gene:123:AAT" )
271
+ .description(" The insertion that was found." ),
272
+ " count" to Schema <String >().type(" number" )
273
+ .description(" The number of sequences matching having the insertion." ),
274
+ )
275
+
257
276
private fun nucleotideMutations () =
258
277
Schema <List <NucleotideMutation >>()
259
278
.type(" array" )
0 commit comments