Merge branch 'develop' into frontend/kathy

2019-04-23 15:54:27 +02:00 · 2019-04-23 15:54:27 +02:00 · 75798eaaca
commit 75798eaaca
parent fe3070204d 7cfae18552
1 changed files with 4 additions and 1 deletions
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@ -231,6 +231,9 @@ public class Controller {

    int i = cache.getStationen().indexOf(station);

+    if (i == 0) {
+      return ResponseEntity.status(400).body("The scanned station isn´t the correct following station");
+    }

    if (cache.getStationen().get(i - 1).equals(aktuelleStation)) {
      bearbeitet.setAktuelleStation(station);