From e6cabdcd383806cb502c43341be91df376f650b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A4=80?= Date: Mon, 19 Sep 2022 17:08:55 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=9D=B4=EC=9E=90=20=EC=A7=80?= =?UTF-8?q?=EA=B8=89=20API=20Mapper=20=EA=B5=AC=EC=A1=B0=EB=A1=9C=20?= =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81=20#232?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bankids/controller/ChallengeController.java | 16 ++++++++++++++++ .../com/ceos/bankids/mapper/ChallengeMapper.java | 14 ++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ceos/bankids/controller/ChallengeController.java b/src/main/java/com/ceos/bankids/controller/ChallengeController.java index b46ed298..5d1ff653 100644 --- a/src/main/java/com/ceos/bankids/controller/ChallengeController.java +++ b/src/main/java/com/ceos/bankids/controller/ChallengeController.java @@ -2,6 +2,7 @@ import com.ceos.bankids.config.CommonResponse; import com.ceos.bankids.domain.User; +import com.ceos.bankids.dto.AchievedChallengeDTO; import com.ceos.bankids.dto.AchievedChallengeListDTO; import com.ceos.bankids.dto.ChallengeDTO; import com.ceos.bankids.dto.KidAchievedChallengeListDTO; @@ -152,4 +153,19 @@ public CommonResponse getKidAchievedListChallenge( return CommonResponse.onSuccess(kidAchievedListChallenge); } + + @ApiOperation(value = "완주한 돈길에 이자 지급하기") + @PatchMapping(value = "/interest-payment/{challengeId}", produces = "application/json; charset=utf-8") + public CommonResponse patchInterestPayment( + @AuthenticationPrincipal User authUser, + @PathVariable Long challengeId) { + + log.info("api = 완주한 돈길에 이자 지급, user = {}, challengeId = {}", authUser.getUsername(), + challengeId); + + AchievedChallengeDTO achievedChallengeDTO = challengeMapper.patchInterestPayment(authUser, + challengeId); + + return CommonResponse.onSuccess(achievedChallengeDTO); + } } diff --git a/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java b/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java index deb2f87c..e14c5480 100644 --- a/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java +++ b/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java @@ -276,6 +276,7 @@ public AchievedChallengeListDTO getAchievedListChallenge(User authUser, interestPayment); } + // 자녀의 완주한 돈길 리스트 가져오기 API Mapper public KidAchievedChallengeListDTO getKidAchievedListChallenge(User authUser, Long kidId, String interestPayment) { @@ -289,19 +290,12 @@ public KidAchievedChallengeListDTO getKidAchievedListChallenge(User authUser, Lo authUser, achievedChallengeUserList, interestPayment, kidId); } - @ApiOperation(value = "완주한 돈길에 이자 지급하기") - @PatchMapping(value = "/interest-payment/{challengeId}", produces = "application/json; charset=utf-8") - public CommonResponse patchInterestPayment( - @AuthenticationPrincipal User authUser, - @PathVariable Long challengeId) { + // 이자 지급 API Mapper + public AchievedChallengeDTO patchInterestPayment(User authUser, Long challengeId) { - log.info("api = 완주한 돈길에 이자 지급, user = {}, challengeId = {}", authUser.getUsername(), - challengeId); - AchievedChallengeDTO achievedChallengeDTO = challengeService.updateChallengeInterestPayment( + return challengeService.updateChallengeInterestPayment( authUser, challengeId); - - return CommonResponse.onSuccess(achievedChallengeDTO); } @ApiOperation(value = "돈길 걷기")