refactor: challengeUserService 사용 메서드 명명 규칙 통일 #234

bankidz · Sep 21, 2022 · 899e513 · 899e513
1 parent 214355f
commit 899e513
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 29 deletions.
diff --git a/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java b/src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java
@@ -68,7 +68,8 @@ public ChallengeDTO createChallengeMapper(User authUser, ChallengeRequest challe
         ChallengePostDTO challengePostDTO = new ChallengePostDTO(challengeRequest, contractUser);
         ChallengeDTO challengeDTO = challengeService.createChallenge(authUser, challengePostDTO);
         Challenge challenge = challengeService.readChallenge(challengeDTO.getId());
-        ChallengeUser challengeUser = challengeUserService.postChallengeUser(authUser, challenge);
+        ChallengeUser challengeUser = challengeUserService.createdChallengeUser(authUser,
+            challenge);
         parentService.updateParentForCreateChallenge(contractUser);
 
         // 저장로직 성공시 알림 로직
@@ -83,7 +84,7 @@ public ChallengeDTO deleteChallengeMapper(User authUser, Long challengeId) {
 
         sundayValidation();
         userRoleValidation(authUser, true);
-        ChallengeUser challengeUser = challengeUserService.getChallengeUser(challengeId);
+        ChallengeUser challengeUser = challengeUserService.readChallengeUser(challengeId);
         Challenge deleteChallenge = challengeUser.getChallenge();
         if (challengeUser.getUser().getId() != authUser.getId()) {
             throw new ForbiddenException(ErrorCode.NOT_MATCH_CHALLENGE_USER.getErrorCode());
@@ -119,7 +120,7 @@ public List<ChallengeDTO> readChallengeListMapper(User authUser, String status)
             throw new BadRequestException(ErrorCode.INVALID_QUERYPARAM.getErrorCode());
         }
         List<ChallengeDTO> challengeDTOList = new ArrayList<>();
-        List<Challenge> challengeList = challengeUserService.getChallengeUserList(authUser,
+        List<Challenge> challengeList = challengeUserService.readChallengeUserList(authUser,
             status);
         if (Objects.equals(status, "walking")) {
             challengeList.forEach(challenge -> {
@@ -166,7 +167,7 @@ public KidChallengeListDTO readKidChallengeListMapper(User authUser, Long kidId,
         Kid kid = kidService.getKid(kidId);
         User kidUser = kid.getUser();
         List<ChallengeDTO> challengeDTOList = new ArrayList<>();
-        List<Challenge> challengeList = challengeUserService.getChallengeUserList(kidUser,
+        List<Challenge> challengeList = challengeUserService.readChallengeUserList(kidUser,
             status);
         if (Objects.equals(status, "walking")) {
             challengeList.forEach(challenge -> {
@@ -213,7 +214,7 @@ public ChallengeDTO updateChallengeStatusMapper(User authUser, Long challengeId,
 
         sundayValidation();
         userRoleValidation(authUser, false);
-        ChallengeUser challengeUser = challengeUserService.getChallengeUser(challengeId);
+        ChallengeUser challengeUser = challengeUserService.readChallengeUser(challengeId);
         User user = challengeUser.getUser();
         Challenge challenge = challengeService.readChallenge(challengeId);
         if (challenge.getContractUser().getId() != authUser.getId()) {
@@ -239,7 +240,7 @@ public ChallengeDTO updateChallengeStatusMapper(User authUser, Long challengeId,
     public WeekDTO readWeekInfoMapper(User authUser) {
 
         userRoleValidation(authUser, true);
-        List<Challenge> walkingChallengeList = challengeUserService.getChallengeUserList(authUser,
+        List<Challenge> walkingChallengeList = challengeUserService.readChallengeUserList(authUser,
                 "walking")
             .stream()
             .filter(challenge -> challenge.getChallengeStatus() == ChallengeStatus.WALKING).collect(
@@ -256,7 +257,8 @@ public KidWeekDTO readKidWeekInfoMapper(User authUser, Long kidId) {
         Kid kid = kidService.getKid(kidId);
         User kidUser = kid.getUser();
         familyUserService.checkSameFamily(authUser, kidUser);
-        List<Challenge> kidWalkingChallengeList = challengeUserService.getChallengeUserList(kidUser,
+        List<Challenge> kidWalkingChallengeList = challengeUserService.readChallengeUserList(
+                kidUser,
                 "walking")
             .stream()
             .filter(challenge -> challenge.getChallengeStatus() == ChallengeStatus.WALKING).collect(
@@ -272,7 +274,7 @@ public AchievedChallengeListDTO readAchievedChallengeListMapper(User authUser,
         String interestPayment) {
 
         userRoleValidation(authUser, true);
-        List<Challenge> achievedChallengeUserList = challengeUserService.getAchievedChallengeUserList(
+        List<Challenge> achievedChallengeUserList = challengeUserService.readAchievedChallengeUserList(
             authUser);
 
         return challengeService.readAchievedChallenge(
@@ -289,7 +291,7 @@ public KidAchievedChallengeListDTO readKidAchievedChallengeListMapper(User authU
         Kid kid = kidService.getKid(kidId);
         User kidUser = kid.getUser();
         familyUserService.checkSameFamily(authUser, kidUser);
-        List<Challenge> achievedChallengeUserList = challengeUserService.getAchievedChallengeUserList(
+        List<Challenge> achievedChallengeUserList = challengeUserService.readAchievedChallengeUserList(
             kidUser);
 
         return challengeService.readKidAchievedChallenge(

diff --git a/src/main/java/com/ceos/bankids/mapper/FamilyController.java b/src/main/java/com/ceos/bankids/mapper/FamilyController.java
@@ -129,9 +129,9 @@ public CommonResponse<FamilyDTO> deleteFamilyUser(@AuthenticationPrincipal User
             authUser);
 
         if (authUser.getIsKid()) {
-            List<Challenge> challengeList = challengeUserService.getAllChallengeUserList(
+            List<Challenge> challengeList = challengeUserService.readAllChallengeUserListToChallengeList(
                 authUser);
-            challengeUserService.deleteAllChallengeUser(authUser);
+            challengeUserService.deleteAllChallengeUserOfUser(authUser);
             ChallengeCompleteDeleteByKidMapperDTO challengeCompleteDeleteByKidMapperDTO = challengeService.challengeCompleteDeleteByKid(
                 challengeList);
             kidService.updateInitKid(authUser);

diff --git a/src/main/java/com/ceos/bankids/mapper/UserController.java b/src/main/java/com/ceos/bankids/mapper/UserController.java
@@ -1,10 +1,6 @@
 package com.ceos.bankids.mapper;
 
 import com.ceos.bankids.config.CommonResponse;
-import com.ceos.bankids.mapper.request.ExpoRequest;
-import com.ceos.bankids.mapper.request.FamilyRequest;
-import com.ceos.bankids.mapper.request.UserTypeRequest;
-import com.ceos.bankids.mapper.request.WithdrawalRequest;
 import com.ceos.bankids.domain.Challenge;
 import com.ceos.bankids.domain.ChallengeUser;
 import com.ceos.bankids.domain.Family;
@@ -18,6 +14,10 @@
 import com.ceos.bankids.dto.ParentBackupDTO;
 import com.ceos.bankids.dto.TokenDTO;
 import com.ceos.bankids.dto.UserDTO;
+import com.ceos.bankids.mapper.request.ExpoRequest;
+import com.ceos.bankids.mapper.request.FamilyRequest;
+import com.ceos.bankids.mapper.request.UserTypeRequest;
+import com.ceos.bankids.mapper.request.WithdrawalRequest;
 import com.ceos.bankids.service.ChallengeServiceImpl;
 import com.ceos.bankids.service.ChallengeUserServiceImpl;
 import com.ceos.bankids.service.ExpoNotificationServiceImpl;
@@ -138,9 +138,9 @@ public CommonResponse<UserDTO> deleteUserAccount(@AuthenticationPrincipal User a
             FamilyRequest familyRequest = new FamilyRequest(family.getCode());
 
             if (authUser.getIsKid()) {
-                List<Challenge> challengeList = challengeUserService.getAllChallengeUserList(
+                List<Challenge> challengeList = challengeUserService.readAllChallengeUserListToChallengeList(
                     authUser);
-                challengeUserService.deleteAllChallengeUser(authUser);
+                challengeUserService.deleteAllChallengeUserOfUser(authUser);
                 ChallengeCompleteDeleteByKidMapperDTO challengeCompleteDeleteByKidMapperDTO = challengeService.challengeCompleteDeleteByKid(
                     challengeList);
                 kidService.updateInitKid(authUser);

diff --git a/src/main/java/com/ceos/bankids/service/ChallengeUserService.java b/src/main/java/com/ceos/bankids/service/ChallengeUserService.java
@@ -9,15 +9,15 @@
 @Service
 public interface ChallengeUserService {
 
-    public ChallengeUser postChallengeUser(User authUser, Challenge challenge);
+    public ChallengeUser createdChallengeUser(User authUser, Challenge challenge);
 
-    public ChallengeUser getChallengeUser(Long challengeId);
+    public ChallengeUser readChallengeUser(Long challengeId);
 
-    public List<Challenge> getChallengeUserList(User authUser, String status);
+    public List<Challenge> readChallengeUserList(User authUser, String status);
 
-    public List<Challenge> getAchievedChallengeUserList(User authUser);
+    public List<Challenge> readAchievedChallengeUserList(User authUser);
 
-    public List<Challenge> getAllChallengeUserList(User authUser);
+    public List<Challenge> readAllChallengeUserListToChallengeList(User authUser);
 
-    public void deleteAllChallengeUser(User authUser);
+    public void deleteAllChallengeUserOfUser(User authUser);
 }
diff --git a/src/main/java/com/ceos/bankids/service/ChallengeUserServiceImpl.java b/src/main/java/com/ceos/bankids/service/ChallengeUserServiceImpl.java
@@ -25,7 +25,7 @@ public class ChallengeUserServiceImpl implements ChallengeUserService {
 
     @Transactional
     @Override
-    public ChallengeUser postChallengeUser(User user, Challenge challenge) {
+    public ChallengeUser createdChallengeUser(User user, Challenge challenge) {
         ChallengeUser challengeUser = ChallengeUser.builder().user(user).challenge(challenge)
             .member("parent")
             .build();
@@ -35,7 +35,7 @@ public ChallengeUser postChallengeUser(User user, Challenge challenge) {
 
     @Transactional(readOnly = true)
     @Override
-    public ChallengeUser getChallengeUser(Long challengeId) {
+    public ChallengeUser readChallengeUser(Long challengeId) {
         ChallengeUser challengeUser = cuRepo.findByChallengeId(challengeId)
             .orElseThrow(
                 () -> new BadRequestException(ErrorCode.NOT_EXIST_CHALLENGE_USER.getErrorCode()));
@@ -44,7 +44,7 @@ public ChallengeUser getChallengeUser(Long challengeId) {
 
     @Transactional
     @Override
-    public List<Challenge> getChallengeUserList(User authUser, String status) {
+    public List<Challenge> readChallengeUserList(User authUser, String status) {
         if (Objects.equals(status, "pending")) {
             return cuRepo.findByUserId(authUser.getId()).stream()
                 .map(ChallengeUser::getChallenge)
@@ -63,7 +63,7 @@ public List<Challenge> getChallengeUserList(User authUser, String status) {
 
     @Transactional(readOnly = true)
     @Override
-    public List<Challenge> getAchievedChallengeUserList(User authUser) {
+    public List<Challenge> readAchievedChallengeUserList(User authUser) {
         return cuRepo.findByUserId(authUser.getId()).stream().map(ChallengeUser::getChallenge)
             .filter(challenge -> challenge.getChallengeStatus() == ChallengeStatus.ACHIEVED)
             .collect(
@@ -72,15 +72,15 @@ public List<Challenge> getAchievedChallengeUserList(User authUser) {
 
     @Override
     @Transactional(readOnly = true)
-    public List<Challenge> getAllChallengeUserList(User authUser) {
+    public List<Challenge> readAllChallengeUserListToChallengeList(User authUser) {
         return cuRepo.findByUserId(authUser.getId()).stream().map(ChallengeUser::getChallenge)
             .collect(
                 Collectors.toList());
     }
 
     @Override
     @Transactional
-    public void deleteAllChallengeUser(User authUser) {
+    public void deleteAllChallengeUserOfUser(User authUser) {
         List<ChallengeUser> challengeUserList = cuRepo.findByUserId(authUser.getId());
         cuRepo.deleteAll(challengeUserList);
     }