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

fixed a bug with deleteCache

Browse Source
This commit is contained in:
Michael 2019-04-11 03:20:17 +02:00
parent 9828f88f7b
commit 16cae0ba90
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.xml.bind.DatatypeConverter; import javax.xml.bind.DatatypeConverter;
import java.lang.reflect.Array;
import java.security.Key; import java.security.Key;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.*; import java.util.*;
@ -136,34 +137,34 @@ public class Controller {
if (cacheOptional.isPresent()) { if (cacheOptional.isPresent()) {
Cache cache = cacheOptional.get(); Cache cache = cacheOptional.get();
if(bearbeitetRepository.findByUserAndCache(user, cache) != null){ if (bearbeitetRepository.findByUserAndCache(user, cache) != null) {
Bearbeitet bearbeitet1 = bearbeitetRepository.findByUserAndCache(user, cache); Bearbeitet bearbeitet1 = bearbeitetRepository.findByUserAndCache(user, cache);
return ResponseEntity.status(200).body(bearbeitet1); return ResponseEntity.status(200).body(bearbeitet1);
} }
bearbeitet.setCache(cache); bearbeitet.setCache(cache);
Station startStation = cache.getStationen().get(0); Station startStation = cache.getStationen().get(0);
bearbeitet.setAktuelleStation(startStation); bearbeitet.setAktuelleStation(startStation);
} else { } else {
return ResponseEntity.status(404).body("Couldnt find Cache " + cacheID); return ResponseEntity.status(404).body("Couldnt find Cache " + cacheID);
} }
Optional<CacheAccesDefinition> cacheAccesDefinitionOptional = Optional<CacheAccesDefinition> cacheAccesDefinitionOptional =
cacheAccesDefinitionRepository.findById(0); // angefangen cacheAccesDefinitionRepository.findById(0); // angefangen
if (cacheAccesDefinitionOptional.isPresent()) { if (cacheAccesDefinitionOptional.isPresent()) {
CacheAccesDefinition cacheAccesDefinition = cacheAccesDefinitionOptional.get(); CacheAccesDefinition cacheAccesDefinition = cacheAccesDefinitionOptional.get();
bearbeitet.setCacheAccesDefinition(cacheAccesDefinition); bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
} else { } else {
return ResponseEntity.status(404).body("There is no cacheAccesDefinition with the ID " + 0); return ResponseEntity.status(404).body("There is no cacheAccesDefinition with the ID " + 0);
} }
bearbeitetRepository.save(bearbeitet); bearbeitetRepository.save(bearbeitet);
return ResponseEntity.status(201).body(new Gson().toJson(bearbeitet)); return ResponseEntity.status(201).body(new Gson().toJson(bearbeitet));
} catch (ExpiredJwtException e) { } catch (ExpiredJwtException e) {
return ResponseEntity.status(400).body("JWT Token expired"); return ResponseEntity.status(400).body("JWT Token expired");
} catch (Exception e){ } catch (Exception e) {
return ResponseEntity.status(400).body("JWT Token invalid"); return ResponseEntity.status(400).body("JWT Token invalid");
} }
@ -201,7 +202,7 @@ public class Controller {
public ResponseEntity createCache(@RequestBody Cache cache) { public ResponseEntity createCache(@RequestBody Cache cache) {
System.out.println(cache.getName()); System.out.println(cache.getName());
System.out.println(cache.getStationen().size()); System.out.println(cache.getStationen().size());
System.out.println(cache.getStationen().get(0).getId()); // System.out.println(cache.getStationen().get(0).getId());
// Stationen werden in die Datenbank eingetragen // Stationen werden in die Datenbank eingetragen
for (Station station : cache.getStationen()) { for (Station station : cache.getStationen()) {
ResponseEntity response = createStation(station); ResponseEntity response = createStation(station);
@ -292,9 +293,9 @@ public class Controller {
.parseClaimsJws(token).getBody(); .parseClaimsJws(token).getBody();
return ResponseEntity.status(200).body(claims.get("admin")); return ResponseEntity.status(200).body(claims.get("admin"));
}catch (ExpiredJwtException e) { } catch (ExpiredJwtException e) {
return ResponseEntity.status(400).body("JWT Token expired"); return ResponseEntity.status(400).body("JWT Token expired");
} catch (Exception e){ } catch (Exception e) {
return ResponseEntity.status(400).body("JWT Token invalid"); return ResponseEntity.status(400).body("JWT Token invalid");
} }
@ -335,12 +336,18 @@ public class Controller {
} }
} }
for(Station station : cache.getStationen()) { ArrayList<Station> stationen = new ArrayList<>();
stationRepository.delete(station); for (Station station : cache.getStationen()) {
stationen.add(stationRepository.findById(station.getId()).get());
} }
cacheRepository.delete(cache); cacheRepository.delete(cache);
for (Station station : stationen) {
stationRepository.delete(station);
}
return ResponseEntity.status(200).body(new Gson().toJson(true)); return ResponseEntity.status(200).body(new Gson().toJson(true));
} }
@ -371,7 +378,7 @@ public class Controller {
} }
} catch (ExpiredJwtException e) { } catch (ExpiredJwtException e) {
return ResponseEntity.status(400).body("JWT Token expired"); return ResponseEntity.status(400).body("JWT Token expired");
} catch (Exception e){ } catch (Exception e) {
return ResponseEntity.status(400).body("JWT Token invalid"); return ResponseEntity.status(400).body("JWT Token invalid");
} }
} }
@ -412,7 +419,7 @@ public class Controller {
} }
} catch (ExpiredJwtException e) { } catch (ExpiredJwtException e) {
return ResponseEntity.status(400).body("JWT Token expired"); return ResponseEntity.status(400).body("JWT Token expired");
} catch (Exception e){ } catch (Exception e) {
return ResponseEntity.status(400).body("JWT Token invalid"); return ResponseEntity.status(400).body("JWT Token invalid");
} }
} }