tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added a isPresent() check and unregistered users are able start a cache now

Browse Source
This commit is contained in:
Michael 2019-03-24 00:16:01 +01:00
parent 07010e9899
commit 5b6fe52a04
1 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
View File

@ -34,33 +34,57 @@ public class Controller {
@RequestMapping("/allCaches") @RequestMapping("/allCaches")
@ResponseBody @ResponseBody
public String getAllCaches(){ public String getAllCaches() {
return new Gson().toJson(cacheRepository.findAll()); return new Gson().toJson(cacheRepository.findAll());
} }
@RequestMapping("/startCache") @RequestMapping("/startCache")
public @ResponseBody public @ResponseBody
Bearbeitet startCache(@RequestParam String userID, String startCache(@RequestParam(value = "userID", defaultValue = "-1") String userID,
@RequestParam String cacheID, @RequestParam String cacheID,
@RequestParam String cacheAccesDefinitionID) { @RequestParam String cacheAccesDefinitionID) {
Optional<User> userOptional = userRepository.findById(Integer.valueOf(userID)); if (!userID.equals("-1")) { // ein angemeldeter User startet den Cache
User user = userOptional.get();
Optional<Cache> cacheOptional = cacheRepository.findById(Integer.valueOf(cacheID)); Bearbeitet bearbeitet = new Bearbeitet();
Cache cache = cacheOptional.get();
Optional<CacheAccesDefinition> cacheAccesDefinitionOptional = Optional<User> userOptional = userRepository.findById(Integer.valueOf(userID));
cacheAccesDefinitionRepository.findById(Integer.valueOf(cacheAccesDefinitionID)); if (userOptional.isPresent()) {
CacheAccesDefinition cacheAccesDefinition = cacheAccesDefinitionOptional.get(); User user = userOptional.get();
bearbeitet.setUser(user);
} else {
return "There is no user with the ID " + userID;
}
Bearbeitet bearbeitet = new Bearbeitet(); Optional<Cache> cacheOptional = cacheRepository.findById(Integer.valueOf(cacheID));
bearbeitet.setUser(user); if (cacheOptional.isPresent()) {
bearbeitet.setCache(cache); Cache cache = cacheOptional.get();
bearbeitet.setCacheAccesDefinition(cacheAccesDefinition); bearbeitet.setCache(cache);
} else {
return "There is no cache with the ID " + cacheID;
}
bearbeitetRepository.save(bearbeitet); Optional<CacheAccesDefinition> cacheAccesDefinitionOptional =
cacheAccesDefinitionRepository.findById(Integer.valueOf(cacheAccesDefinitionID));
if (cacheAccesDefinitionOptional.isPresent()) {
CacheAccesDefinition cacheAccesDefinition = cacheAccesDefinitionOptional.get();
bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
} else {
return "There is no cacheAccesDefinition with the ID " + cacheAccesDefinitionID;
}
return bearbeitet; bearbeitetRepository.save(bearbeitet);
return new Gson().toJson(bearbeitet);
} else { // kein angemeldeter User startet den Cache
Optional<Cache> cacheOptional = cacheRepository.findById(Integer.valueOf(cacheID));
if (cacheOptional.isPresent()) {
Cache cache = cacheOptional.get();
return new Gson().toJson(cache);
} else {
return "There is no cache with the ID " + cacheID;
}
}
} }
} }