fix - #51 충돌 병합 해결

Team-HMH · Jan 17, 2024 · 430c926 · 430c926
2 parents fbb5d70 + a0759fc
commit 430c926
Show file tree

Hide file tree

Showing 30 changed files with 454 additions and 353 deletions.
diff --git a/src/main/java/sopt/org/HMH/domain/app/controller/AppController.java b/src/main/java/sopt/org/HMH/domain/app/controller/AppController.java
@@ -12,9 +12,9 @@
 import sopt.org.HMH.domain.app.dto.request.AppArrayGoalTimeRequest;
 import sopt.org.HMH.domain.app.dto.request.AppDeleteRequest;
 import sopt.org.HMH.domain.app.service.AppService;
+import sopt.org.HMH.global.auth.UserId;
 import sopt.org.HMH.global.common.response.ApiResponse;
 import sopt.org.HMH.global.common.response.EmptyJsonResponse;
-import sopt.org.HMH.global.util.IdConverter;
 
 import java.security.Principal;
 
@@ -27,23 +27,23 @@ public class AppController {
 
     @PostMapping
     public ResponseEntity<ApiResponse<?>> orderAddApp(
-            Principal principal,
+            @UserId final Long userId,
             @RequestHeader("OS") final String os,
             @RequestBody final AppArrayGoalTimeRequest request
     ) {
-        appService.addAppsAndUpdateRemainingDailyChallenge(IdConverter.getUserId(principal), request.apps(), os);
+        appService.addAppsAndUpdateRemainingDailyChallenge(userId, request.apps(), os);
         return ResponseEntity
                 .status(AppSuccess.ADD_APP_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(AppSuccess.ADD_APP_SUCCESS, new EmptyJsonResponse()));
     }
 
     @DeleteMapping
     public ResponseEntity<ApiResponse<?>> orderRemoveApp(
-            Principal principal,
+            @UserId final Long userId,
             @RequestHeader("OS") final String os,
             @RequestBody final AppDeleteRequest request
     ) {
-        appService.removeApp(IdConverter.getUserId(principal), request, os);
+        appService.removeApp(userId, request, os);
         return ResponseEntity
                 .status(AppSuccess.DELETE_APP_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(AppSuccess.DELETE_APP_SUCCESS, new EmptyJsonResponse()));

diff --git a/src/main/java/sopt/org/HMH/domain/challenge/controller/ChallengeController.java b/src/main/java/sopt/org/HMH/domain/challenge/controller/ChallengeController.java
@@ -12,11 +12,9 @@
 import sopt.org.HMH.domain.challenge.dto.request.ChallengeRequest;
 import sopt.org.HMH.domain.challenge.dto.response.ChallengeResponse;
 import sopt.org.HMH.domain.challenge.service.ChallengeService;
+import sopt.org.HMH.global.auth.UserId;
 import sopt.org.HMH.global.common.response.ApiResponse;
 import sopt.org.HMH.global.common.response.EmptyJsonResponse;
-import sopt.org.HMH.global.util.IdConverter;
-
-import java.security.Principal;
 
 @RestController
 @RequiredArgsConstructor
@@ -26,15 +24,12 @@ public class ChallengeController {
     private final ChallengeService challengeService;
 
     @PostMapping
-    public ResponseEntity<ApiResponse<?>> orderAddChallenge(Principal principal,
+    public ResponseEntity<ApiResponse<?>> orderAddChallenge(@UserId final Long userId,
                                                             @RequestHeader("OS") final String os,
                                                             @RequestBody final ChallengeRequest request) {
         challengeService.updateChallengeForPeriodWithInfo(
-                challengeService.addChallenge(
-                        IdConverter.getUserId(principal),
-                        request.period(),
-                        request.goalTime()),
-                challengeService.getLastApps(IdConverter.getUserId(principal)),
+                challengeService.addChallenge(userId, request.period(), request.goalTime()),
+                challengeService.getLastApps(userId),
                 os);
 
         return ResponseEntity
@@ -43,11 +38,11 @@ public ResponseEntity<ApiResponse<?>> orderAddChallenge(Principal principal,
     }
 
     @GetMapping
-    public ResponseEntity<ApiResponse<ChallengeResponse>> orderGetChallenge(Principal principal,
+    public ResponseEntity<ApiResponse<ChallengeResponse>> orderGetChallenge(@UserId final Long userId,
                                                                             @RequestHeader("OS") final String os) {
         return ResponseEntity
                 .status(ChallengeSuccess.GET_CHALLENGE_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(ChallengeSuccess.GET_CHALLENGE_SUCCESS,
-                        challengeService.getChallenge(IdConverter.getUserId(principal), os)));
+                        challengeService.getChallenge(userId, os)));
     }
 }
diff --git a/src/main/java/sopt/org/HMH/domain/dailychallenge/controller/DailyChallengeController.java b/src/main/java/sopt/org/HMH/domain/dailychallenge/controller/DailyChallengeController.java
@@ -12,11 +12,9 @@
 import sopt.org.HMH.domain.dailychallenge.domain.exception.DailyChallengeSuccess;
 import sopt.org.HMH.domain.dailychallenge.dto.response.DailyChallengeResponse;
 import sopt.org.HMH.domain.dailychallenge.service.DailyChallengeService;
+import sopt.org.HMH.global.auth.UserId;
 import sopt.org.HMH.global.common.response.ApiResponse;
 import sopt.org.HMH.global.common.response.EmptyJsonResponse;
-import sopt.org.HMH.global.util.IdConverter;
-
-import java.security.Principal;
 
 @RestController
 @RequiredArgsConstructor
@@ -26,31 +24,31 @@ public class DailyChallengeController {
     private final DailyChallengeService dailyChallengeService;
 
     @GetMapping
-    public ResponseEntity<ApiResponse<DailyChallengeResponse>> orderDetailDailyChallenge(Principal principal,
+    public ResponseEntity<ApiResponse<DailyChallengeResponse>> orderDetailDailyChallenge(@UserId final Long userId,
                                                                                          @RequestHeader("OS") final String os) {
         return ResponseEntity
                 .status(DailyChallengeSuccess.GET_DAILY_CHALLENGE_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(DailyChallengeSuccess.GET_DAILY_CHALLENGE_SUCCESS,
-                        dailyChallengeService.getDailyChallenge(IdConverter.getUserId(principal), os)));
+                        dailyChallengeService.getDailyChallenge(userId, os)));
     }
 
     @PatchMapping
     public ResponseEntity<ApiResponse<?>> orderModifyDailyChallenge(
-            Principal principal,
+            @UserId final Long userId,
             @RequestHeader("OS") final String os,
             @RequestBody final AppArrayUsageTimeRequest request
     ) {
-        dailyChallengeService.modifyDailyChallengeStatus(IdConverter.getUserId(principal), request.apps(), os);
+        dailyChallengeService.modifyDailyChallengeStatus(userId, request.apps(), os);
         return ResponseEntity
                 .status(DailyChallengeSuccess.MODIFY_DAILY_CHALLENGE_STATUS_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(DailyChallengeSuccess.MODIFY_DAILY_CHALLENGE_STATUS_SUCCESS, new EmptyJsonResponse()));
     }
 
     @PatchMapping("/failure")
-    public ResponseEntity<ApiResponse<?>> orderModifyDailyChallengeStatusFailure(Principal principal) {
-        dailyChallengeService.modifyDailyChallengeStatusFailure(IdConverter.getUserId(principal));
+    public ResponseEntity<ApiResponse<?>> orderModifyDailyChallengeStatusFailure(@UserId final Long userId) {
+        dailyChallengeService.modifyDailyChallengeStatusFailure(userId);
         return ResponseEntity
                 .status(DailyChallengeSuccess.MODIFY_DAILY_CHALLENGE_STATUS_FAILURE_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(DailyChallengeSuccess.MODIFY_DAILY_CHALLENGE_STATUS_FAILURE_SUCCESS, new EmptyJsonResponse()));
     }
-}
+}
diff --git a/src/main/java/sopt/org/HMH/domain/user/controller/UserController.java b/src/main/java/sopt/org/HMH/domain/user/controller/UserController.java
@@ -1,6 +1,5 @@
 package sopt.org.HMH.domain.user.controller;
 
-import java.security.Principal;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -17,9 +16,9 @@
 import sopt.org.HMH.domain.user.dto.response.ReissueResponse;
 import sopt.org.HMH.domain.user.dto.response.UserInfoResponse;
 import sopt.org.HMH.domain.user.service.UserService;
+import sopt.org.HMH.global.auth.UserId;
 import sopt.org.HMH.global.common.response.ApiResponse;
 import sopt.org.HMH.global.common.response.EmptyJsonResponse;
-import sopt.org.HMH.global.util.IdConverter;
 
 @RestController
 @RequiredArgsConstructor
@@ -59,23 +58,23 @@ public ResponseEntity<ApiResponse<ReissueResponse>> orderReissue(
     }
 
     @PostMapping("/logout")
-    public ResponseEntity<ApiResponse<?>> orderLogout(Principal principal) {
-        userService.logout(IdConverter.getUserId(principal));
+    public ResponseEntity<ApiResponse<?>> orderLogout(@UserId final Long userId) {
+        userService.logout(userId);
         return ResponseEntity
                 .status(UserSuccess.LOGOUT_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(UserSuccess.LOGOUT_SUCCESS, new EmptyJsonResponse()));
     }
 
     @GetMapping
-    public ResponseEntity<ApiResponse<UserInfoResponse>> orderGetUserInfo(Principal principal) {
+    public ResponseEntity<ApiResponse<UserInfoResponse>> orderGetUserInfo(@UserId final Long userId) {
         return ResponseEntity
                 .status(UserSuccess.GET_USER_INFO_SUCCESS.getHttpStatus())
-                .body(ApiResponse.success(UserSuccess.GET_USER_INFO_SUCCESS, userService.getUserInfo(IdConverter.getUserId(principal))));
+                .body(ApiResponse.success(UserSuccess.GET_USER_INFO_SUCCESS, userService.getUserInfo(userId)));
     }
 
     @DeleteMapping
-    public ResponseEntity<ApiResponse<?>> orderWithdraw(Principal principal) {
-        userService.withdraw(IdConverter.getUserId(principal));
+    public ResponseEntity<ApiResponse<?>> orderWithdraw(@UserId final Long userId) {
+        userService.withdraw(userId);
         return ResponseEntity
                 .status(UserSuccess.WITHDRAW_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(UserSuccess.WITHDRAW_SUCCESS, new EmptyJsonResponse()));

diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/OnboardingInfo.java b/src/main/java/sopt/org/HMH/domain/user/domain/OnboardingInfo.java
@@ -1,14 +1,9 @@
 package sopt.org.HMH.domain.user.domain;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import java.util.List;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/User.java b/src/main/java/sopt/org/HMH/domain/user/domain/User.java
@@ -14,7 +14,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import sopt.org.HMH.global.auth.social.SocialPlatform;
-import sopt.org.HMH.global.common.constant.PointConstants;
 import sopt.org.HMH.global.common.domain.BaseTimeEntity;
 
 @Getter
@@ -48,7 +47,7 @@ public User(SocialPlatform socialPlatform, String socialId, String name, Long on
         this.socialId = socialId;
         this.name = name;
         this.onboardingInfoId = onboardingInfoId;
-        this.point = PointConstants.INITIAL_POINT.getPoint();
+        this.point = UserConstants.INITIAL_POINT;
     }
 
     public void updateSocialInfo(String nickname, String profileImageUrl) {

diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/UserConstants.java b/src/main/java/sopt/org/HMH/domain/user/domain/UserConstants.java
@@ -0,0 +1,6 @@
+package sopt.org.HMH.domain.user.domain;
+
+public abstract class UserConstants {
+    public static final Integer INITIAL_POINT = 0;
+    public static final String DEFAULT_USER_NAME = "여행자";
+}
diff --git a/src/main/java/sopt/org/HMH/domain/user/repository/UserRepository.java b/src/main/java/sopt/org/HMH/domain/user/repository/UserRepository.java
@@ -25,8 +25,9 @@ default User findByIdOrThrowException(Long userId) {
                 UserError.NOT_FOUND_USER));
     }
 
+    @Modifying
     @Query("DELETE FROM User u WHERE u.isDeleted = true AND u.deletedAt < :currentDate")
-    void deleteUsersScheduledForDeletion(LocalDateTime currentDate);
+    void deleteUsersScheduledForDeletion(@Param("currentDate") LocalDateTime currentDate);
 
     Optional<User> findBySocialPlatformAndSocialId(SocialPlatform socialPlatform, String socialId);
     boolean existsBySocialPlatformAndSocialId(SocialPlatform socialPlatform, String socialId);

diff --git a/.../user/service/ExpiredUserDeleteBatch.java → ...r/service/ExpiredUserDeleteScheduler.java b/.../user/service/ExpiredUserDeleteBatch.java → ...r/service/ExpiredUserDeleteScheduler.java
@@ -10,7 +10,7 @@
 @Component
 @RequiredArgsConstructor
 @Transactional
-public class ExpiredUserDeleteBatch {
+public class ExpiredUserDeleteScheduler {
 
     private final UserRepository userRepository;