From 9d56f2720a045e207112625fdd5d9996f649f030 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Tue, 14 May 2019 12:05:19 +0200
Subject: [PATCH] Fehlermeldungen CacheConstruction

---
 .../bugageocaching/controller/Controller.java  |  2 ++
 .../util/CacheConstructionUtil.java            | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 93182f4..46c8f63 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -1,6 +1,7 @@
 package hhn.labsw.bugageocaching.controller;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import hhn.labsw.bugageocaching.entities.*;
 import hhn.labsw.bugageocaching.helper.POI;
 import hhn.labsw.bugageocaching.helper.RankingListHelper;
@@ -492,6 +493,7 @@ public class Controller {
       sendBackUsers.add(tmp);
     }
     logger.debug("/api/getRankingList Converted Objects to RankingListHelper");
+    logger.debug("/api/getRankingList RankingList: " + new GsonBuilder().setPrettyPrinting().create().toJson(sendBackUsers));
     return ResponseEntity.status(200).body(new Gson().toJson(sendBackUsers));
   }
 
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/CacheConstructionUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/CacheConstructionUtil.java
index 5deb9c5..b7cdfe1 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/CacheConstructionUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/CacheConstructionUtil.java
@@ -54,24 +54,24 @@ public class CacheConstructionUtil {
     // Caches werden in die Datenbank eingetragen
     if (cache.getDescription().length() == 0 || cache.getName().length() == 0 || cache.getRankingPoints() == 0.0) {
       deleteStationenUtil(cache);
-      return ResponseEntity.status(400).body("cache fields can´t be empty");
+      return ResponseEntity.status(400).body("Alle Felder müssen ausgefüllt werden!");
     }
 
     if (cache.getStationen().size() < 2) {
       deleteStationenUtil(cache);
-      return ResponseEntity.status(400).body("a cache needs atleast 2 stations");
+      return ResponseEntity.status(400).body("Ein Cache muss mindestens zwei Stationen besitzen.\nBitte füge noch eine Station hinzu!");
     }
 
     for (Cache cache1 : cacheRepository.findAll()) {
       if (cache1.getName().equals(cache.getName())) {
         deleteStationenUtil(cache);
-        return ResponseEntity.status(400).body("name is already taken");
+        return ResponseEntity.status(400).body("Der Cachename ist bereits vergeben. Bitte wähle einen anderen Name!");
       }
     }
 
     if (cache.getRankingPoints() < 0) {
       deleteStationenUtil(cache);
-      return ResponseEntity.status(400).body("Ranking points has to be a positive number");
+      return ResponseEntity.status(400).body("Die Punkte für den Cache dürfen nicht negativ sein!");
     }
 
     cacheRepository.save(cache);
@@ -82,15 +82,15 @@ public class CacheConstructionUtil {
   public static ResponseEntity createStationUtil(Station station) {
 
     if (station.getDescription().length() == 0 || station.getLattitude() == 0.0 || station.getLongitude() == 0.0 /*|| station.getSolution().length() == 0*/) {
-      return ResponseEntity.status(400).body("station fields can´t be empty");
+      return ResponseEntity.status(400).body("Alle Felder müssen ausgefüllt werden!");
     }
 
     if (station.getLattitude() < 9 || station.getLattitude() > 10) {
-      return ResponseEntity.status(400).body("Lattitude has to be between 9 and 10 degrees");
+      return ResponseEntity.status(400).body("Die Lattitude ist außerhalb der Bundesgartenschau");
     }
 
     if (station.getLongitude() < 49 || station.getLongitude() > 50) {
-      return ResponseEntity.status(400).body("Longitude has to be in the range of 49 to 50 degrees");
+      return ResponseEntity.status(400).body("Die Longitude ist außerhalb der Bundesgartenschau");
     }
 
     Random r = new Random();
@@ -112,7 +112,7 @@ public class CacheConstructionUtil {
     try {
       station.setCode(code);
     } catch (RollbackException e) {
-      return ResponseEntity.status(400).body("There was an error generating the unique code");
+      return ResponseEntity.status(400).body("Es gab einen Fehler beim Konsturieren der QR Codes");
     }
 
     stationRepository.save(station);
@@ -133,7 +133,7 @@ public class CacheConstructionUtil {
   public static ResponseEntity deleteCacheUtil(String cacheID) {
     Optional<Cache> optionalCache = cacheRepository.findById(Integer.valueOf(cacheID));
     if (!optionalCache.isPresent()) {
-      return ResponseEntity.status(404).body(new Gson().toJson("There is no cache with the ID " + cacheID));
+      return ResponseEntity.status(404).body(new Gson().toJson("Es gab einen Fehler beim Löschen des Caches"));
     }
 
     Cache cache = optionalCache.get();