diff --git a/src/test/java/bio/terra/integration/DataRepoFixtures.java b/src/test/java/bio/terra/integration/DataRepoFixtures.java index 131e2b7772..7ebac7e4c7 100644 --- a/src/test/java/bio/terra/integration/DataRepoFixtures.java +++ b/src/test/java/bio/terra/integration/DataRepoFixtures.java @@ -1107,7 +1107,7 @@ public ColumnStatisticsIntModel retrieveColumnIntStats( TestConfiguration.User user, UUID datasetId, String table, String columnName, String filter) throws Exception { DataRepoResponse response = - retrieveColumnStatsRaw(user, datasetId, table, columnName, filter); + retrieveColumnStatsIntRaw(user, datasetId, table, columnName, filter); return validateResponse(response, "dataset column stats", HttpStatus.OK, null); } @@ -1115,11 +1115,23 @@ public ColumnStatisticsTextModel retrieveColumnStats( TestConfiguration.User user, UUID datasetId, String table, String columnName, String filter) throws Exception { DataRepoResponse response = - retrieveColumnStatsRaw(user, datasetId, table, columnName, filter); + retrieveColumnStatsTextRaw(user, datasetId, table, columnName, filter); return validateResponse(response, "dataset column stats", HttpStatus.OK, null); } - private DataRepoResponse retrieveColumnStatsRaw( + private DataRepoResponse retrieveColumnStatsIntRaw( + TestConfiguration.User user, UUID datasetId, String table, String columnName, String filter) + throws Exception { + String url = + "/api/repository/v1/datasets/%s/data/%s/statistics/%s" + .formatted(datasetId, table, columnName); + var requestModel = new QueryColumnStatisticsRequestModel(); + requestModel.filter(Objects.requireNonNullElse(filter, "")); + return dataRepoClient.post( + user, url, TestUtils.mapToJson(requestModel), new TypeReference<>() {}); + } + + private DataRepoResponse retrieveColumnStatsTextRaw( TestConfiguration.User user, UUID datasetId, String table, String columnName, String filter) throws Exception { String url =