From ec4202a5aa5585570ed2d7c748268c5a4912485f Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Fri, 10 May 2019 17:13:10 +0200 Subject: [PATCH 1/3] Noch mehr von Michaels methoden fixen --- .../hhn/labsw/bugageocaching/controller/Controller.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index a9643d9..bdbe78c 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -673,16 +673,17 @@ public class Controller { // verlässt team user_info.setTeam(null); - int i = 0; + //int i = 0; // zählt teammitglieder - for (User_Info userInfo1 : user_infoRepository.findAll()) { + List user_infos = user_infoRepository.findByTeam(team); + /*for (User_Info userInfo1 : user_infoRepository.findAll()) { if (userInfo1.getTeam().equals(team)) { i++; } - } + }*/ // löscht team, wenn keine teammitglieder mehr vorhanden - if (i == 0) { + if (user_infos.size() == 0) { teamRepository.delete(team); } From c5ffa61eda21f2c07e4b71187af225dee66e272d Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Fri, 10 May 2019 17:50:45 +0200 Subject: [PATCH 2/3] Added edit Cache --- .../bugageocaching/controller/Controller.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index bdbe78c..59e6db1 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -324,6 +324,32 @@ public class Controller { return createCacheUtil(cache); } + @RequestMapping(value = "/api/editCache", method = RequestMethod.PUT, produces = "application/json") + @ResponseBody + public ResponseEntity editCache(@RequestBody Cache newCache){ + + //---------------------- + //Get Cache + ResponseEntity getCache = FinderUtil.findCacheById(newCache.getId() + ""); + + if (getCache.getStatusCodeValue() != 200) { + return getCache; + } + + Cache oldCache = (Cache) getCache.getBody(); + //---------------------- + + oldCache.setDescription(newCache.getDescription()); + oldCache.setName(newCache.getName()); + oldCache.setRankingPoints(newCache.getRankingPoints()); + oldCache.setReward(newCache.getReward()); + oldCache.setStationen(newCache.getStationen()); + + cacheRepository.save(oldCache); + + return ResponseEntity.status(200).body("Cache edited"); + } + @ApiOperation(value = "Checks if the given User has an admin role") @ApiResponses(value = { @ApiResponse(code = 404, message = "Database error"), From 06da9b9a4f73d9945069b447084e207817dd8748 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Fri, 10 May 2019 17:51:59 +0200 Subject: [PATCH 3/3] Added docu --- .../hhn/labsw/bugageocaching/controller/Controller.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 59e6db1..2bee0ce 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -324,6 +324,13 @@ public class Controller { return createCacheUtil(cache); } + @ApiOperation(value = "Edits a Cache") + @ApiResponses(value = { + @ApiResponse(code = 404, message = "Database error"), + @ApiResponse(code = 401, message = "JWT Token expired"), + @ApiResponse(code = 400, message = "Something wrong with the given Parameters") + }) + @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose @RequestMapping(value = "/api/editCache", method = RequestMethod.PUT, produces = "application/json") @ResponseBody public ResponseEntity editCache(@RequestBody Cache newCache){