From d14a4b5d86ad7f92d14ca056169ed188e3bd6995 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 13 Apr 2019 21:41:24 +0200 Subject: [PATCH] modified checkStation --- .../labsw/bugageocaching/controller/Controller.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index c6dd76f..e31b56b 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -232,6 +232,16 @@ public class Controller { if (cache.getStationen().get(i - 1).equals(aktuelleStation)) { bearbeitet.setAktuelleStation(station); + if (i == cache.getStationen().size() - 1) { // letze Station erreicht + Optional cacheAccesDefinitionOptional = + cacheAccesDefinitionRepository.findById(1); // abgeschlossen + if (cacheAccesDefinitionOptional.isPresent()) { + CacheAccesDefinition cacheAccesDefinition = cacheAccesDefinitionOptional.get(); + bearbeitet.setCacheAccesDefinition(cacheAccesDefinition); + } else { + return ResponseEntity.status(404).body("There is no cacheAccesDefinition with the ID " + 1); + } + } return ResponseEntity.status(200).body(new Gson().toJson(station)); } else { return ResponseEntity.status(400).body("The scanned station isn“t the correct following station");