Skip to content

Commit 58c1efd

Browse files
authored
SCRUM-3999 filter by source column (#1254)
1 parent f8d1cf2 commit 58c1efd

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

agr_api/src/main/java/org/alliancegenome/api/controller/AlleleController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public JsonResultResponse<AllelePhenotypeAnnotationDocument> getPhenotypePerAlle
116116
Pagination pagination = new Pagination(page, limit, sortBy, null);
117117
pagination.addFilterOption("phenotypeStatement", phenotype);
118118
pagination.addFilterOption("pubmedPubModIDs", reference);
119+
pagination.addFilterOption("primaryAnnotations.dataProvider.abbreviation", source);
119120
try {
120121
JsonResultResponse<AllelePhenotypeAnnotationDocument> phenotypes = phenotypeESService.getAllelePhenotypeAnnotations(id, pagination, false);
121122
phenotypes.setHttpServletRequest(null);

agr_api/src/main/java/org/alliancegenome/api/rest/interfaces/AlleleRESTInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ JsonResultResponse<Allele> getAllelesPerSpecies(
8888
JsonResultResponse<AllelePhenotypeAnnotationDocument> getPhenotypePerAllele(@Parameter(in = ParameterIn.PATH, name = "id", description = "Search for Phenotypes for a given Allele by ID", required = true, schema = @Schema(type = SchemaType.STRING)) @PathParam("id") String id,
8989
@Parameter(in = ParameterIn.QUERY, name = "limit", description = "Number of rows returned", schema = @Schema(type = SchemaType.INTEGER)) @DefaultValue("20") @QueryParam("limit") Integer limit,
9090
@Parameter(in = ParameterIn.QUERY, name = "page", description = "Page number", schema = @Schema(type = SchemaType.INTEGER)) @DefaultValue("1") @QueryParam("page") Integer page,
91-
@Parameter(in = ParameterIn.QUERY, name = "filter.termName", description = "termName annotation") @QueryParam("filter.termName") String phenotype, @Parameter(in = ParameterIn.QUERY, name = "filter.source", description = "Source")
92-
@QueryParam("filter.source") String source,
91+
@Parameter(in = ParameterIn.QUERY, name = "filter.termName", description = "termName annotation") @QueryParam("filter.termName") String phenotype,
92+
@Parameter(in = ParameterIn.QUERY, name = "filter.dataProvider", description = "Source", schema = @Schema(type = SchemaType.STRING)) @QueryParam("filter.dataProvider") String source,
9393
@Parameter(in = ParameterIn.QUERY, name = "filter.reference", description = "Reference number: PUBMED or a Pub ID from the MOD") @QueryParam("filter.reference") String reference,
9494
@Parameter(in = ParameterIn.QUERY, name = "sortBy", description = "Field name by which to sort", schema = @Schema(type = SchemaType.STRING)) @DefaultValue("symbol") @QueryParam("sortBy") String sortBy
9595

0 commit comments

Comments
 (0)