Feat Rank System | S03P31A303-31

Former-commit-id: a3a8d5efcd35634d3f62fbca434b82a1b52b894b

backend/RunWithMe/src/main/java/kr/co/rwm/controller/RunningController.java

@@ -63,8 +63,8 @@ public ResponseEntity getTempRecord(@PathVariable int userId) {
 		System.out.println("running/controller/temp/getRecord");
 		User loginUser = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
 
-		List<Record> records = recordTempRepository.findRecordByUserId(userId);	// 토큰X
-//		List<Record> records = recordTempRepository.findRecordByUserId(loginUser.getUserId());	// 토큰O 추후에 이렇게 바꿀것
+//		List<Record> records = recordTempRepository.findRecordByUserId(userId);	// 토큰X
+		List<Record> records = recordTempRepository.findRecordByUserId(loginUser.getUserId());	// 토큰O 추후에 이렇게 바꿀것
 		return new ResponseEntity<Response>(new 
 				Response(StatusCode.OK, ResponseMessage.RUNNING_GPS_SUCCESS, records), HttpStatus.OK);
 	}

backend/RunWithMe/src/main/java/kr/co/rwm/controller/UserController.java

@@ -32,6 +32,7 @@
 import kr.co.rwm.model.StatusCode;
 import kr.co.rwm.service.AreaService;
 import kr.co.rwm.service.JwtTokenProvider;
+import kr.co.rwm.service.RanksService;
 import kr.co.rwm.service.S3Service;
 import kr.co.rwm.service.UserService;
 import lombok.RequiredArgsConstructor;
@@ -61,9 +62,8 @@ public class UserController {
 	private final RedisTemplate<String, String> logoutRedis;
 	private final S3Service s3Service;
 	private final AreaService areaService;
-
-	@Autowired
-	private UserService userService;
+	private final UserService userService;
+	private final RanksService rankService;
 
 	/**
 	 * 회원가입 - 이메일 중복 여부 True/False를 판단하고, True일 경우 JSON 객체 기반으로 회원가입을 진행한다.
@@ -85,7 +85,8 @@ public ResponseEntity<?> signup(@RequestBody User user, MultipartFile profile){
 		}else {
 			Gugun gugun = areaService.findGugunByGugunId(user.getGugunId().getGugunId());
 			user.setGugunId(gugun);
-			userService.join(user, passwordEncoder.encode(user.getPassword()));
+			User result = userService.join(user, passwordEncoder.encode(user.getPassword()));
+			rankService.join(result);
 
 			return new ResponseEntity<Response>(new Response(StatusCode.CREATED,ResponseMessage.SIGNUP_SUCCESS),HttpStatus.CREATED);
 		}

backend/RunWithMe/src/main/java/kr/co/rwm/entity/Gugun.java

@@ -1,5 +1,7 @@
 package kr.co.rwm.entity;
 
+import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -18,18 +20,22 @@
 @Getter
 @Setter
 @Builder
-public class Gugun {
+public class Gugun implements Serializable {
 
-	@Id
-	@Column(name = "gugun_id")
-	private Integer gugunId;
-
-	@Column(name = "gugun_name")
-	private String gugunName;
-
-	@ManyToOne
-	@JoinColumn(name = "sido_id", nullable = false)
-	private Sido sidoId;
-
-}
+   /**
+    * 
+    */
+   private static final long serialVersionUID = 11L;
 
+   @Id
+   @Column(name = "gugun_id")
+   private Integer gugunId;
+
+   @Column(name = "gugun_name")
+   private String gugunName;
+
+   @ManyToOne
+   @JoinColumn(name = "sido_id", nullable = false)
+   private Sido sidoId;
+
+}

backend/RunWithMe/src/main/java/kr/co/rwm/entity/Ranks.java

@@ -0,0 +1,56 @@
+package kr.co.rwm.entity;
+
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+@Builder
+public class Ranks {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name="rank_id")
+	private Integer rankId;
+
+	@OneToOne(cascade = CascadeType.ALL)
+	@JoinColumn(name="user_id",referencedColumnName = "user_id")
+	private User userId;
+
+	@ManyToOne
+	@JoinColumn(name="gugun_id", nullable = false)
+	private Gugun gugunId;
+
+	@Column(name = "race_exp", nullable = false)
+	private double raceExp;
+
+	@Column(name = "donate_exp", nullable = false)
+	private double donateExp;
+
+
+	@Column(name = "total_exp", nullable = false)
+	private double totalExp;
+
+
+
+}

backend/RunWithMe/src/main/java/kr/co/rwm/entity/Record.java

@@ -26,34 +26,34 @@
 @Setter
 @Builder
 public class Record implements Serializable {
-	
-	/**
-	 * Redis에 올리려면 Serializable 필요
-	 */
-	private static final long serialVersionUID = 1L;
+   
+   /**
+    * Redis에 올리려면 Serializable 필요
+    */
+   private static final long serialVersionUID = 1L;
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name = "record_id")
-	private Integer recordId;
+   @Id
+   @GeneratedValue(strategy = GenerationType.IDENTITY)
+   @Column(name = "record_id")
+   private Integer recordId;
 
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-	@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST})
-	@JoinColumn(name = "running_id")
-	private Running runningId;
+   @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+   @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+   @JoinColumn(name = "running_id")
+   private Running runningId;
 
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-	@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST})
-	@JoinColumn(name = "user_id", nullable = false)
-	private User userId;
-	
-	@Column(name = "accumulated_distance", nullable = false)
-	private double accDistance;
-	
-	@Column(name = "accumulated_time", nullable = false)
-	private double accTime;
-	
-	@Column(name = "speed")
-	private double speed;
-	
+   @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+   @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+   @JoinColumn(name = "user_id", nullable = false)
+   private User userId;
+   
+   @Column(name = "accumulated_distance", nullable = false)
+   private double accDistance;
+   
+   @Column(name = "accumulated_time", nullable = false)
+   private double accTime;
+   
+   @Column(name = "speed")
+   private double speed;
+   
 }

backend/RunWithMe/src/main/java/kr/co/rwm/entity/Sido.java

@@ -1,5 +1,7 @@
 package kr.co.rwm.entity;
 
+import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -16,13 +18,18 @@
 @Getter
 @Setter
 @Builder
-public class Sido {
+public class Sido implements Serializable {
+
+   /**
+    * Redis에 올리려면 Serializable 필요
+    */
+   private static final long serialVersionUID = 13L;
 
-	@Id
-	@Column(name = "sido_id")
-	private Integer sidoId;
-	
-	@Column(name = "sido_name")
-	private String sidoName;
-	
-}
+   @Id
+   @Column(name = "sido_id")
+   private Integer sidoId;
+   
+   @Column(name = "sido_name")
+   private String sidoName;
+   
+}