Updated results

Flux-Coordinator · May 1, 2018 · 4cea5af · 4cea5af
1 parent cdf5668
commit 4cea5af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/controllers/MeasurementsController.java b/app/controllers/MeasurementsController.java
@@ -106,7 +106,9 @@ public Result stopMeasurement() {
 
     public Result getActiveMeasurement() {
         if(this.activeMeasurement != null){
-            return Results.ok(Json.toJson(this.activeMeasurement));
+            final MeasurementReadings activeMeasurement = this.measurementsRepository
+                    .getMeasurementReadingsById(this.activeMeasurement.getMeasurementId());
+            return Results.ok(Json.toJson(activeMeasurement));
         }
         return Results.noContent();
     }
@@ -115,7 +117,7 @@ public Result getActiveMeasurement() {
     public CompletableFuture<Result> addReading() {
         return CompletableFuture.supplyAsync(() -> {
             if(this.activeMeasurement == null) {
-                return Results.badRequest("No active measurement");
+                return Results.noContent();
             }
             try {
                 final JsonNode json = request().body().asJson();

diff --git a/conf/routes b/conf/routes
@@ -15,7 +15,7 @@ POST    /measurements                       controllers.MeasurementsController.c
 PUT     /measurements/active/:measurementId controllers.MeasurementsController.startMeasurement(measurementId : String)
 DELETE  /measurements/active                controllers.MeasurementsController.stopMeasurement
 POST    /measurements/active/readings       controllers.MeasurementsController.addReading
-GET     /streamMeasurements    controllers.MeasurementsController.streamMeasurements
+GET     /streamMeasurements                 controllers.MeasurementsController.streamMeasurements
 
 # Map static resources from the /public folder to the /assets URL path
-GET     /assets/*file               controllers.Assets.versioned(path="/public", file: Asset)
+GET     /assets/*file                       controllers.Assets.versioned(path="/public", file: Asset)