Revert sharing test code

DataBiosphere · Nov 13, 2023 · 103fa73 · 103fa73
1 parent 15ae4ac
commit 103fa73
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/test/java/bio/terra/integration/DataRepoFixtures.java b/src/test/java/bio/terra/integration/DataRepoFixtures.java
@@ -1107,19 +1107,31 @@ public ColumnStatisticsIntModel retrieveColumnIntStats(
       TestConfiguration.User user, UUID datasetId, String table, String columnName, String filter)
       throws Exception {
     DataRepoResponse<ColumnStatisticsIntModel> response =
-        retrieveColumnStatsRaw(user, datasetId, table, columnName, filter);
+        retrieveColumnStatsIntRaw(user, datasetId, table, columnName, filter);
     return validateResponse(response, "dataset column stats", HttpStatus.OK, null);
   }
 
   public ColumnStatisticsTextModel retrieveColumnStats(
       TestConfiguration.User user, UUID datasetId, String table, String columnName, String filter)
       throws Exception {
     DataRepoResponse<ColumnStatisticsTextModel> response =
-        retrieveColumnStatsRaw(user, datasetId, table, columnName, filter);
+        retrieveColumnStatsTextRaw(user, datasetId, table, columnName, filter);
     return validateResponse(response, "dataset column stats", HttpStatus.OK, null);
   }
 
-  private <T> DataRepoResponse<T> retrieveColumnStatsRaw(
+  private DataRepoResponse<ColumnStatisticsIntModel> 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<ColumnStatisticsTextModel> retrieveColumnStatsTextRaw(
       TestConfiguration.User user, UUID datasetId, String table, String columnName, String filter)
       throws Exception {
     String url =