added another api call that gives total control to the client on wher…

…e to query in influx and by jobId or time
didclab · Aug 17, 2023 · de44a5b · de44a5b
1 parent f9050f2
commit de44a5b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/main/java/org/onedatashare/server/controller/MetaDataController.java b/src/main/java/org/onedatashare/server/controller/MetaDataController.java
@@ -13,7 +13,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.security.Principal;
@@ -114,4 +113,10 @@ public Mono<MonitorData> monitorAJob(Mono<Principal> principalMono, Long jobId)
                 .flatMap(user -> metaDataService.monitor(user, jobId));
     }
 
+    @GetMapping("/measurements/job/node")
+    public Mono<List<InfluxData>> queryMeasurementsByNode(Mono<Principal> principalMono, @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime start, @RequestParam String appId, @RequestParam Long jobId){
+        return principalMono.map(Principal::getName)
+                .flatMap(user -> metaDataService.getJobMeasurementsUniversal(user, jobId, start, appId));
+    }
+
 }
diff --git a/src/main/java/org/onedatashare/server/service/MetaDataService.java b/src/main/java/org/onedatashare/server/service/MetaDataService.java
@@ -221,7 +221,22 @@ private Mono<List<InfluxData>> influxDataCall(URI uri) {
                 .get()
                 .uri(uri)
                 .retrieve()
-                .bodyToMono(new ParameterizedTypeReference<List<InfluxData>>() {
-                });
+                .bodyToMono(new ParameterizedTypeReference<List<InfluxData>>() {});
+    }
+
+    public Mono<? extends List<InfluxData>> getJobMeasurementsUniversal(String user, Long jobId, LocalDateTime start, String appId) {
+        URI uri = UriComponentsBuilder.fromUriString(this.metaHostName)
+                .path(BASE_PATH + "/stats/influx/transfer/node")
+                .queryParam(USER_EMAIL, user)
+                .queryParam("jobId", jobId)
+                .queryParam("appId", appId)
+                .queryParam("start", start)
+                .build()
+                .toUri();
+        return this.webClientBuilder.build()
+                .get()
+                .uri(uri)
+                .retrieve()
+                .bodyToMono(new ParameterizedTypeReference<List<InfluxData>>() {});
     }
 }