From 92677ab66e5067a175215b44b9e19d2a3be4c356 Mon Sep 17 00:00:00 2001 From: Christian Pich Date: Wed, 5 Mar 2025 19:01:43 +0100 Subject: [PATCH] SCRUM-3999 filter by source column --- .../org/alliancegenome/api/controller/AlleleController.java | 1 + .../api/rest/interfaces/AlleleRESTInterface.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/agr_api/src/main/java/org/alliancegenome/api/controller/AlleleController.java b/agr_api/src/main/java/org/alliancegenome/api/controller/AlleleController.java index 305c0b8e6..bbdd24165 100644 --- a/agr_api/src/main/java/org/alliancegenome/api/controller/AlleleController.java +++ b/agr_api/src/main/java/org/alliancegenome/api/controller/AlleleController.java @@ -116,6 +116,7 @@ public JsonResultResponse getPhenotypePerAlle Pagination pagination = new Pagination(page, limit, sortBy, null); pagination.addFilterOption("phenotypeStatement", phenotype); pagination.addFilterOption("pubmedPubModIDs", reference); + pagination.addFilterOption("primaryAnnotations.dataProvider.abbreviation", source); try { JsonResultResponse phenotypes = phenotypeESService.getAllelePhenotypeAnnotations(id, pagination, false); phenotypes.setHttpServletRequest(null); diff --git a/agr_api/src/main/java/org/alliancegenome/api/rest/interfaces/AlleleRESTInterface.java b/agr_api/src/main/java/org/alliancegenome/api/rest/interfaces/AlleleRESTInterface.java index 09873eb4f..ae5d19975 100644 --- a/agr_api/src/main/java/org/alliancegenome/api/rest/interfaces/AlleleRESTInterface.java +++ b/agr_api/src/main/java/org/alliancegenome/api/rest/interfaces/AlleleRESTInterface.java @@ -88,8 +88,8 @@ JsonResultResponse getAllelesPerSpecies( JsonResultResponse 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, @Parameter(in = ParameterIn.QUERY, name = "limit", description = "Number of rows returned", schema = @Schema(type = SchemaType.INTEGER)) @DefaultValue("20") @QueryParam("limit") Integer limit, @Parameter(in = ParameterIn.QUERY, name = "page", description = "Page number", schema = @Schema(type = SchemaType.INTEGER)) @DefaultValue("1") @QueryParam("page") Integer page, - @Parameter(in = ParameterIn.QUERY, name = "filter.termName", description = "termName annotation") @QueryParam("filter.termName") String phenotype, @Parameter(in = ParameterIn.QUERY, name = "filter.source", description = "Source") - @QueryParam("filter.source") String source, + @Parameter(in = ParameterIn.QUERY, name = "filter.termName", description = "termName annotation") @QueryParam("filter.termName") String phenotype, + @Parameter(in = ParameterIn.QUERY, name = "filter.dataProvider", description = "Source", schema = @Schema(type = SchemaType.STRING)) @QueryParam("filter.dataProvider") String source, @Parameter(in = ParameterIn.QUERY, name = "filter.reference", description = "Reference number: PUBMED or a Pub ID from the MOD") @QueryParam("filter.reference") String reference, @Parameter(in = ParameterIn.QUERY, name = "sortBy", description = "Field name by which to sort", schema = @Schema(type = SchemaType.STRING)) @DefaultValue("symbol") @QueryParam("sortBy") String sortBy