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

Merge branch 'release2' into frontend/timo

Browse Source 
# Conflicts:
#	src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
This commit is contained in:
Timo Volkmann 2019-04-29 21:53:05 +02:00
commit 2509d0dc6d
5 changed files with 129 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ import javax.annotation.PostConstruct;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Optional;
import static hhn.labsw.bugageocaching.util.CacheConstructionUtil.createCacheUtil; import static hhn.labsw.bugageocaching.util.CacheConstructionUtil.createCacheUtil;
import static hhn.labsw.bugageocaching.util.CacheConstructionUtil.deleteCacheUtil; import static hhn.labsw.bugageocaching.util.CacheConstructionUtil.deleteCacheUtil;
@ -64,88 +63,88 @@ public class Controller {
return ResponseEntity.status(200).body(new Gson().toJson(cacheRepository.findAll())); return ResponseEntity.status(200).body(new Gson().toJson(cacheRepository.findAll()));
} }
// alte startCache-methode
// @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
// @RequestMapping("/api/startCache") @RequestMapping("/api/startCache")
// @ResponseBody @ResponseBody
// public ResponseEntity startCache(@RequestParam(value = "token", defaultValue = "-1") String token, public ResponseEntity startCache(@RequestParam(value = "token", defaultValue = "-1") String token,
// @RequestParam String cacheID) { @RequestParam String cacheID) {
//
// if (!token.equals("-1")) { // ein angemeldeter user startet den cache(es werden zwei parameter übergeben) if (!token.equals("-1")) { // ein angemeldeter user startet den cache(es werden zwei parameter übergeben)
//
// Bearbeitet bearbeitet = new Bearbeitet(); Bearbeitet bearbeitet = new Bearbeitet();
//
//
// //---------------------- //----------------------
// //Verify token //Verify token
// ResponseEntity tokenVerification = VerificationUtil.verifyToken(token); ResponseEntity tokenVerification = VerificationUtil.verifyToken(token);
//
// //Error in token verification //Error in token verification
// if (tokenVerification.getStatusCodeValue() != 200) { if (tokenVerification.getStatusCodeValue() != 200) {
// return tokenVerification; return tokenVerification;
// } }
//
// Claims claims = (Claims) tokenVerification.getBody(); Claims claims = (Claims) tokenVerification.getBody();
//
// ResponseEntity getUser = FinderUtil.findUserFromClaim(claims); ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
//
// if (getUser.getStatusCodeValue() != 200) { if (getUser.getStatusCodeValue() != 200) {
// return getUser; return getUser;
// } }
//
// User user = (User) getUser.getBody(); User user = (User) getUser.getBody();
//
// bearbeitet.setUser(user); bearbeitet.setUser(user);
//
// //---------------------- //----------------------
// //Get Cache //Get Cache
// ResponseEntity getCache = FinderUtil.findCacheById(cacheID); ResponseEntity getCache = FinderUtil.findCacheById(cacheID);
//
// if (getCache.getStatusCodeValue() != 200) { if (getCache.getStatusCodeValue() != 200) {
// return getCache; return getCache;
// } }
//
// Cache cache = (Cache) getCache.getBody(); Cache cache = (Cache) getCache.getBody();
// //---------------------- //----------------------
//
// 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);
//
// //Get CacheAccesDefinition //Get CacheAccesDefinition
// ResponseEntity getCacheAccesDefinition = FinderUtil.findCacheAccesDefinitionById("0"); ResponseEntity getCacheAccesDefinition = FinderUtil.findCacheAccesDefinitionById("0");
//
// if (getCacheAccesDefinition.getStatusCodeValue() != 200) { if (getCacheAccesDefinition.getStatusCodeValue() != 200) {
// return getCacheAccesDefinition; return getCacheAccesDefinition;
// } }
//
// CacheAccesDefinition cacheAccesDefinition = (CacheAccesDefinition) getCacheAccesDefinition.getBody(); CacheAccesDefinition cacheAccesDefinition = (CacheAccesDefinition) getCacheAccesDefinition.getBody();
// //---------------------- //----------------------
// bearbeitet.setCacheAccesDefinition(cacheAccesDefinition); bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
//
// bearbeitetRepository.save(bearbeitet); //bearbeitetRepository.save(bearbeitet);
//
// return ResponseEntity.status(201).body(new Gson().toJson(bearbeitet)); return ResponseEntity.status(201).body(new Gson().toJson(bearbeitet));
//
// } else { // kein angemeldeter User startet den cache(es wird nur der cache als parameter übergeben) } else { // kein angemeldeter User startet den cache(es wird nur der cache als parameter übergeben)
//
// ResponseEntity getCache = FinderUtil.findCacheById(cacheID); ResponseEntity getCache = FinderUtil.findCacheById(cacheID);
//
// if (getCache.getStatusCodeValue() != 200) { if (getCache.getStatusCodeValue() != 200) {
// return getCache; return getCache;
// } }
//
// Cache cache = (Cache) getCache.getBody(); Cache cache = (Cache) getCache.getBody();
//
// return ResponseEntity.status(200).body(new Gson().toJson(cache)); return ResponseEntity.status(200).body(new Gson().toJson(cache));
// } }
// } }
@CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
@RequestMapping("/api/checkStation") @RequestMapping("/api/checkStation")
@ -208,8 +207,11 @@ public class Controller {
Station station = (Station) getStation.getBody(); Station station = (Station) getStation.getBody();
//---------------------- //----------------------
if (cache != durchgefuehrterCache) { System.out.println(cache.getName());
return ResponseEntity.status(400).body("The scanned station isn´t the correct following station"); System.out.println(durchgefuehrterCache.getName());
if (!cacheID.equals(durchgefuehrterCacheID)) {
return ResponseEntity.status(400).body("The scanned station isn´t the correct following station (Name)");
} }
if (!cache.getStationen().contains(station)) { if (!cache.getStationen().contains(station)) {
@ -223,6 +225,7 @@ public class Controller {
if (getBearbeitet.getStatusCodeValue() != 200) { if (getBearbeitet.getStatusCodeValue() != 200) {
if (cache.getStationen().get(0).equals(station)) { if (cache.getStationen().get(0).equals(station)) {
// start Cache // start Cache
System.out.println("Startstation");
Bearbeitet bearbeitet = new Bearbeitet(); Bearbeitet bearbeitet = new Bearbeitet();
bearbeitet.setUser(user); bearbeitet.setUser(user);
bearbeitet.setCache(cache); bearbeitet.setCache(cache);
@ -259,7 +262,7 @@ public class Controller {
int i = cache.getStationen().indexOf(station); int i = cache.getStationen().indexOf(station);
if (i == 0) { if (i == 0) {
return ResponseEntity.status(400).body("The scanned station isn´t the correct following station"); return ResponseEntity.status(400).body("The scanned station isn´t the correct following station (i==0)");
} }
if (cache.getStationen().get(i - 1).equals(aktuelleStation)) { if (cache.getStationen().get(i - 1).equals(aktuelleStation)) {
@ -277,13 +280,8 @@ public class Controller {
//---------------------- //----------------------
bearbeitet.setCacheAccesDefinition(cacheAccesDefinition); bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
//Get User_Info //Get User_Info
ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId())); System.out.println(String.valueOf(user.getId()));
User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
if (getUser_Info.getStatusCodeValue() != 200) {
return getUser_Info;
}
User_Info user_info = (User_Info) getUser_Info.getBody();
//---------------------- //----------------------
user_info.setRankingPointsSum(user_info.getRankingPointsSum() + cache.getRankingPoints()); user_info.setRankingPointsSum(user_info.getRankingPointsSum() + cache.getRankingPoints());
user_infoRepository.save(user_info); user_infoRepository.save(user_info);
@ -291,7 +289,7 @@ public class Controller {
bearbeitetRepository.save(bearbeitet); bearbeitetRepository.save(bearbeitet);
return ResponseEntity.status(200).body(new Gson().toJson(bearbeitet)); return ResponseEntity.status(200).body(new Gson().toJson(bearbeitet));
} else { } else {
return ResponseEntity.status(400).body("The scanned station isn´t the correct following station"); return ResponseEntity.status(400).body("The scanned station isn´t the correct following station(nicht letzte)");
} }
} }
@ -467,13 +465,7 @@ public class Controller {
User user = (User) getUser.getBody(); User user = (User) getUser.getBody();
//Get User_Info //Get User_Info
ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId())); User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
if (getUser_Info.getStatusCodeValue() != 200) {
return getUser_Info;
}
User_Info user_info = (User_Info) getUser_Info.getBody();
//---------------------- //----------------------
if (user_info.getTeam() != null) { if (user_info.getTeam() != null) {
return ResponseEntity.status(400).body("You already have a team"); return ResponseEntity.status(400).body("You already have a team");
@ -520,13 +512,7 @@ public class Controller {
User user = (User) getUser.getBody(); User user = (User) getUser.getBody();
//Get User_Info //Get User_Info
ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId())); User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
if (getUser_Info.getStatusCodeValue() != 200) {
return getUser_Info;
}
User_Info user_info = (User_Info) getUser_Info.getBody();
//---------------------- //----------------------
if (user_info.getTeam() != null) { if (user_info.getTeam() != null) {
return ResponseEntity.status(400).body("You already have a team"); return ResponseEntity.status(400).body("You already have a team");
@ -587,13 +573,7 @@ public class Controller {
User user = (User) getUser.getBody(); User user = (User) getUser.getBody();
//Get User_Info //Get User_Info
ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId())); User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
if (getUser_Info.getStatusCodeValue() != 200) {
return getUser_Info;
}
User_Info user_info = (User_Info) getUser_Info.getBody();
//---------------------- //----------------------
if (user_info.getTeam() == null) { if (user_info.getTeam() == null) {
return ResponseEntity.status(400).body("You aren´t in any team"); return ResponseEntity.status(400).body("You aren´t in any team");

14
src/main/java/hhn/labsw/bugageocaching/entities/User_Info.java
View File

@ -1,7 +1,9 @@
package hhn.labsw.bugageocaching.entities; package hhn.labsw.bugageocaching.entities;
import org.hibernate.validator.constraints.UniqueElements;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import javax.annotation.Generated;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
@ -15,6 +17,9 @@ public class User_Info implements Serializable {
private User user; private User user;
@Id @Id
@GeneratedValue
private int id;
private int rankingPointsSum; private int rankingPointsSum;
@ManyToOne @ManyToOne
@ -24,6 +29,14 @@ public class User_Info implements Serializable {
public User_Info() { public User_Info() {
} }
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public User getUser() { public User getUser() {
return user; return user;
} }
@ -47,4 +60,5 @@ public class User_Info implements Serializable {
public void setTeam(Team team) { public void setTeam(Team team) {
this.team = team; this.team = team;
} }
} }

2
src/main/java/hhn/labsw/bugageocaching/entities/User_InfoID.java
View File

@ -4,5 +4,5 @@ import java.io.Serializable;
public class User_InfoID implements Serializable { public class User_InfoID implements Serializable {
private int user; private int user;
private int rankingPointsSum; private int id;
} }

7
src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
View File

@ -1,8 +1,13 @@
package hhn.labsw.bugageocaching.repositories; package hhn.labsw.bugageocaching.repositories;
import hhn.labsw.bugageocaching.entities.User;
import hhn.labsw.bugageocaching.entities.User_Info; import hhn.labsw.bugageocaching.entities.User_Info;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
public interface User_InfoRepository extends CrudRepository<User_Info, Integer> { import java.util.List;
import java.util.Optional;
public interface User_InfoRepository extends CrudRepository<User_Info, Integer> {
User_Info findUser_InfoByUser(User user);
} }

40
src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
View File

@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Optional; import java.util.Optional;
@Component @Component
@ -31,12 +32,10 @@ public class FinderUtil {
static User_InfoRepository user_infoRepository; static User_InfoRepository user_infoRepository;
static TeamInviteRepository teamInviteRepository;
@Autowired @Autowired
public void setCacheRepository(CacheRepository cacheRepository) { public void setCacheRepository(CacheRepository cacheRepository) {
FinderUtil.cacheRepository= cacheRepository; FinderUtil.cacheRepository = cacheRepository;
} }
@Autowired @Autowired
@ -74,11 +73,6 @@ public class FinderUtil {
FinderUtil.user_infoRepository = user_infoRepository; FinderUtil.user_infoRepository = user_infoRepository;
} }
@Autowired
public void setTeamInviteRepository(TeamInviteRepository teamInviteRepository) {
FinderUtil.teamInviteRepository = teamInviteRepository;
}
public static ResponseEntity findCacheById(String cacheID) { public static ResponseEntity findCacheById(String cacheID) {
@ -111,6 +105,16 @@ public class FinderUtil {
return ResponseEntity.status(404).body("The user has not started this cache yet"); return ResponseEntity.status(404).body("The user has not started this cache yet");
} }
public static ResponseEntity findUserByUsername(String username) {
User user = userRepository.findByUsername(username);
if (user != null) {
return ResponseEntity.status(200).body(user);
}
return ResponseEntity.status(404).body("Couldnt find user with username " + username);
}
public static ResponseEntity findCacheAccesDefinitionById(String cacheAccesDefinitionID) { public static ResponseEntity findCacheAccesDefinitionById(String cacheAccesDefinitionID) {
Optional<CacheAccesDefinition> cacheAccesDefinitionOptional = cacheAccesDefinitionRepository.findById(Integer.valueOf(cacheAccesDefinitionID)); Optional<CacheAccesDefinition> cacheAccesDefinitionOptional = cacheAccesDefinitionRepository.findById(Integer.valueOf(cacheAccesDefinitionID));
if (cacheAccesDefinitionOptional.isPresent()) { if (cacheAccesDefinitionOptional.isPresent()) {
@ -120,15 +124,6 @@ public class FinderUtil {
} }
} }
public static ResponseEntity findUser_InfoByID(String infoID) {
Optional<User_Info> user_InfoOptional = user_infoRepository.findById(Integer.valueOf(infoID));
if (user_InfoOptional.isPresent()) {
return ResponseEntity.status(200).body(user_InfoOptional.get());
} else {
return ResponseEntity.status(404).body("Couldnt find User_Info " + infoID);
}
}
public static ResponseEntity findUserFromClaim(Claims claims) { public static ResponseEntity findUserFromClaim(Claims claims) {
try { try {
@ -158,13 +153,4 @@ public class FinderUtil {
} }
} }
public static ResponseEntity findTeamInviteByID(String teamInviteID) { }
Optional<TeamInvite> teamInviteOptional = teamInviteRepository.findById(Integer.valueOf(teamInviteID));
if (teamInviteOptional.isPresent()) {
return ResponseEntity.status(200).body(teamInviteOptional.get());
} else {
return ResponseEntity.status(404).body("Couldnt find User_Info " + teamInviteID);
}
}
}