diff --git a/manabom/src/main/java/mannabom_server/manabom/application/userInfo/service/UserInfoService.java b/manabom/src/main/java/mannabom_server/manabom/application/userInfo/service/UserInfoService.java index 78fa7ec..2996133 100644 --- a/manabom/src/main/java/mannabom_server/manabom/application/userInfo/service/UserInfoService.java +++ b/manabom/src/main/java/mannabom_server/manabom/application/userInfo/service/UserInfoService.java @@ -192,7 +192,10 @@ public CheckEntitlementsResponseDto checkEntitlements(Long userId) { * 혹시라도 이 매소드 쓰면 이거 지우고 사용중이라고 써두기! */ @Transactional - public void activeMembership(Long userId){ + public void activeMembership(Long profileId){ + Profile profile = profileRepository.findById(profileId) + .orElseThrow(); + Long userId = profile.getUser().getUserId(); RuntimePolicySnapshot p = runtimePolicyService.snapshot(); TingWallet tingWallet = tingWalletRepository.findByUserIdForUpdate(userId) .orElseGet(() -> tingWalletRepository.save(new TingWallet(userId))); @@ -209,11 +212,14 @@ public void activeMembership(Long userId){ * 혹시라도 이 매소드 쓰면 이거 지우고 사용중이라고 써두기! */ @Transactional - public void addTing(Long userId, int amount){ - TingWallet tingWallet = tingWalletRepository.findByUserIdForUpdate(userId) - .orElseGet(() -> tingWalletRepository.save(new TingWallet(userId))); + public void addTing(int amount, Long targetProfileId){ + Profile targetProfile = profileRepository.findById(targetProfileId) + .orElseThrow(); + Long targetUserId = targetProfile.getUser().getUserId(); + TingWallet tingWallet = tingWalletRepository.findByUserIdForUpdate(targetUserId) + .orElseGet(() -> tingWalletRepository.save(new TingWallet(targetUserId))); tingWallet.addTing(amount); - log.info("팅 지급 완료, 현재 팅 보유량(팅 : {}, 이벤트 팅 : {})", tingWallet.getTing(), tingWallet.getEventTing()); + log.info("[관리자 기능] 팅 지급 완료, 현재 팅 보유량(팅 : {}, 이벤트 팅 : {})", tingWallet.getTing(), tingWallet.getEventTing()); } } diff --git a/manabom/src/main/java/mannabom_server/manabom/presentation/userInfo/controller/UserInfoController.java b/manabom/src/main/java/mannabom_server/manabom/presentation/userInfo/controller/UserInfoController.java index 604b76e..b5431b9 100644 --- a/manabom/src/main/java/mannabom_server/manabom/presentation/userInfo/controller/UserInfoController.java +++ b/manabom/src/main/java/mannabom_server/manabom/presentation/userInfo/controller/UserInfoController.java @@ -60,9 +60,10 @@ public ResponseEntity checkEntitlements( */ @GetMapping("/api/user/active_membership") public ResponseEntity activeMembership( - @AuthenticationPrincipal Long userId + @AuthenticationPrincipal Long userId, + @RequestParam("targetProfileId") Long targetProfileId ){ - userInfoService.activeMembership(userId); + userInfoService.activeMembership(targetProfileId); return ResponseEntity.status(200).build(); } @@ -72,9 +73,10 @@ public ResponseEntity activeMembership( @GetMapping("/api/user/add_ting") public ResponseEntity addTing( @AuthenticationPrincipal Long userId, - @RequestParam("amount") int amount + @RequestParam("amount") int amount, + @RequestParam("targetProfileId") Long targetProfileId ){ - userInfoService.addTing(userId, amount); + userInfoService.addTing(amount, targetProfileId); return ResponseEntity.status(200).build(); }