From 9b3576c272364bcc3dcf4b67f67c3176cc221894 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Wed, 13 Dec 2017 11:07:20 +0100
Subject: [PATCH] Report mining errors
---
src/main/java/eu/hbp/mip/controllers/MiningApi.java | 6 +++++-
tests/docker-compose.yml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/controllers/MiningApi.java b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
index 790876e70..3c5be8bfd 100644
--- a/src/main/java/eu/hbp/mip/controllers/MiningApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
@@ -61,7 +61,11 @@ public class MiningApi {
return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).build();
}
- return ResponseEntity.ok(result.data().get());
+ if (result.error().nonEmpty()) {
+ return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(result.error().get());
+ } else {
+ return ResponseEntity.ok(result.data().get());
+ }
}
}
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 790b13b28..6de4a32f2 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -59,7 +59,7 @@ services:
- db
sample_db_setup:
- image: "hbpmip/sample-data-db-setup:0.4.1"
+ image: "hbpmip/sample-data-db-setup:0.5.0"
container_name: "data-db-setup"
restart: "no"
networks:
--
GitLab