From f430aee7a72e40ff1fcb799241ce5d6a421b4355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A4=80?= Date: Tue, 20 Sep 2022 12:24:20 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20challengeUser=EC=97=90=20cascade?= =?UTF-8?q?=EA=B0=80=20=EB=8B=AC=EB=A6=BC=EC=97=90=20=EB=94=B0=EB=9D=BC=20?= =?UTF-8?q?challengeUser=20=EC=82=AD=EC=A0=9C=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20#232?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ceos/bankids/mapper/ChallengeMapper.java | 4 ---- .../ceos/bankids/service/ChallengeUserService.java | 2 -- .../bankids/service/ChallengeUserServiceImpl.java | 12 +----------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java b/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java index 3d49741b..dda95418 100644 --- a/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java +++ b/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java @@ -91,22 +91,18 @@ public ChallengeDTO deleteChallenge(User authUser, Long challengeId) { } if (deleteChallenge.getChallengeStatus() == ChallengeStatus.WALKING) { kidService.checkKidDeleteChallenge(authUser, deleteChallenge); -// challengeUserService.deleteChallengeUser(authUser, challengeId); return challengeService.deleteWalkingChallenge( authUser, challengeUser); } else if (deleteChallenge.getChallengeStatus() == ChallengeStatus.FAILED) { - challengeUserService.deleteChallengeUser(authUser, challengeId); return challengeService.deleteWalkingChallenge( authUser, challengeUser); } else if (deleteChallenge.getChallengeStatus() == ChallengeStatus.REJECTED) { - challengeUserService.deleteChallengeUser(authUser, challengeId); return challengeService.deleteRejectedChallenge( authUser, challengeUser); } else if (deleteChallenge.getChallengeStatus() == ChallengeStatus.PENDING) { - challengeUserService.deleteChallengeUser(authUser, challengeId); return challengeService.deletePendingChallenge( authUser, challengeUser); diff --git a/src/main/java/com/ceos/bankids/service/ChallengeUserService.java b/src/main/java/com/ceos/bankids/service/ChallengeUserService.java index 5cb78d60..56fe1b8a 100644 --- a/src/main/java/com/ceos/bankids/service/ChallengeUserService.java +++ b/src/main/java/com/ceos/bankids/service/ChallengeUserService.java @@ -13,8 +13,6 @@ public interface ChallengeUserService { public ChallengeUser getChallengeUser(Long challengeId); - public void deleteChallengeUser(User authUser, Long challengeId); - public List getChallengeUserList(User authUser, String status); public List getAchievedChallengeUserList(User authUser); diff --git a/src/main/java/com/ceos/bankids/service/ChallengeUserServiceImpl.java b/src/main/java/com/ceos/bankids/service/ChallengeUserServiceImpl.java index 4f7c966b..4b576362 100644 --- a/src/main/java/com/ceos/bankids/service/ChallengeUserServiceImpl.java +++ b/src/main/java/com/ceos/bankids/service/ChallengeUserServiceImpl.java @@ -42,17 +42,7 @@ public ChallengeUser getChallengeUser(Long challengeId) { return challengeUser; } - @Override - public void deleteChallengeUser(User authUser, Long challengeId) { - ChallengeUser deleteChallengeUser = cuRepo.findByChallengeId(challengeId).orElseThrow( - () -> new BadRequestException(ErrorCode.NOT_EXIST_CHALLENGE_USER.getErrorCode())); - if (deleteChallengeUser.getUser().getId() != authUser.getId()) { - throw new ForbiddenException(ErrorCode.NOT_MATCH_CHALLENGE_USER.getErrorCode()); - } - - cuRepo.delete(deleteChallengeUser); - } - + @Transactional @Override public List getChallengeUserList(User authUser, String status) { if (Objects.equals(status, "pending")) {