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

works???? pls?

Browse Source
This commit is contained in:
Michael 2019-04-29 20:51:40 +02:00
parent 9816cdf488
commit e1944ff8d4
5 changed files with 19 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,15 +278,9 @@ public class Controller {
bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
//Get User_Info
System.out.println(String.valueOf(user.getId()));
ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
if (getUser_Info.getStatusCodeValue() != 200) {
return getUser_Info;
}
User_Info user_info = (User_Info) getUser_Info.getBody();
User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
//----------------------
//user_info.setRankingPointsSum(user_info.getRankingPointsSum() + cache.getRankingPoints());
user_info.setRankingPointsSum(user_info.getRankingPointsSum() + cache.getRankingPoints());
user_infoRepository.save(user_info);
}
bearbeitetRepository.save(bearbeitet);
@ -468,13 +462,7 @@ public class Controller {
User user = (User) getUser.getBody();
//Get User_Info
ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
if (getUser_Info.getStatusCodeValue() != 200) {
return getUser_Info;
}
User_Info user_info = (User_Info) getUser_Info.getBody();
User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
//----------------------
if (user_info.getTeam() != null) {
return ResponseEntity.status(400).body("You already have a team");
@ -521,13 +509,7 @@ public class Controller {
User user = (User) getUser.getBody();
//Get User_Info
ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
if (getUser_Info.getStatusCodeValue() != 200) {
return getUser_Info;
}
User_Info user_info = (User_Info) getUser_Info.getBody();
User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
//----------------------
if (user_info.getTeam() != null) {
return ResponseEntity.status(400).body("You already have a team");
@ -588,13 +570,7 @@ public class Controller {
User user = (User) getUser.getBody();
//Get User_Info
ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
if (getUser_Info.getStatusCodeValue() != 200) {
return getUser_Info;
}
User_Info user_info = (User_Info) getUser_Info.getBody();
User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
//----------------------
if (user_info.getTeam() == null) {
return ResponseEntity.status(400).body("You aren´t in any team");

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

@ -1,5 +1,6 @@
package hhn.labsw.bugageocaching.entities;
import org.hibernate.validator.constraints.UniqueElements;
import org.springframework.context.annotation.Primary;
import javax.annotation.Generated;
@ -16,6 +17,7 @@ public class User_Info implements Serializable {
private User user;
@Id
@GeneratedValue
private int id;
private int rankingPointsSum;
@ -27,6 +29,14 @@ public class User_Info implements Serializable {
public User_Info() {
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public User getUser() {
return user;
}

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 {
private int user;
private int rankingPointsSum;
private int id;
}

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

@ -9,8 +9,5 @@ import java.util.List;
import java.util.Optional;
public interface User_InfoRepository extends CrudRepository<User_Info, Integer> {
User_Info findByUser(User user);
@Query(value = "SELECT * FROM user_info WHERE user_id = ?1", nativeQuery = true)
User_Info findUser_InfoByUserId(int UserId);
User_Info findUser_InfoByUser(User user);
}

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

@ -35,7 +35,7 @@ public class FinderUtil {
@Autowired
public void setCacheRepository(CacheRepository cacheRepository) {
FinderUtil.cacheRepository= cacheRepository;
FinderUtil.cacheRepository = cacheRepository;
}
@Autowired
@ -124,14 +124,6 @@ public class FinderUtil {
}
}
public static ResponseEntity findUser_InfoByID(String infoID) {
User_Info user_info = user_infoRepository.findUser_InfoByUserId(Integer.valueOf(infoID));
return ResponseEntity.status(200).body(user_info);
}
public static ResponseEntity findUserFromClaim(Claims claims) {
try {
@ -161,4 +153,4 @@ public class FinderUtil {
}
}
}
}