Skip to content

Commit

Permalink
refactor: challengeService / challengeMapper 사용 메서드 명명 규칙 통일 #234
Browse files Browse the repository at this point in the history
  • Loading branch information
@sanbonai06
sanbonai06 committed Sep 21, 2022
1 parent e975efc commit 214355f
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 26 deletions.
27 changes: 16 additions & 11 deletions src/main/java/com/ceos/bankids/controller/ChallengeController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public CommonResponse<ChallengeDTO> postChallenge(@AuthenticationPrincipal User

log.info("api = 돈길 생성, req = {}", challengeRequest);

ChallengeDTO challengeDTO = challengeMapper.postChallenge(authUser, challengeRequest);
ChallengeDTO challengeDTO = challengeMapper.createChallengeMapper(authUser,
challengeRequest);

return CommonResponse.onSuccess(challengeDTO);
}
Expand All @@ -57,7 +58,7 @@ public CommonResponse<ChallengeDTO> deleteChallenge(@AuthenticationPrincipal Use

log.info("api = 돈길 포기하기, user = {} challengeId = {}", authUser.getUsername(), challengeId);

ChallengeDTO challengeDTO = challengeMapper.deleteChallenge(authUser, challengeId);
ChallengeDTO challengeDTO = challengeMapper.deleteChallengeMapper(authUser, challengeId);

return CommonResponse.onSuccess(challengeDTO);
}
Expand All @@ -69,7 +70,8 @@ public CommonResponse<List<ChallengeDTO>> getListChallenge(

log.info("api = 돈길 리스트 가져오기, user = {}, status = {}", authUser.getUsername(), status);

List<ChallengeDTO> challengeDTOList = challengeMapper.getListChallenge(authUser, status);
List<ChallengeDTO> challengeDTOList = challengeMapper.readChallengeListMapper(authUser,
status);

return CommonResponse.onSuccess(challengeDTOList);
}
Expand All @@ -83,7 +85,8 @@ public CommonResponse<KidChallengeListDTO> getListKidChallenge(
log.info("api = 자녀의 돈길 리스트 가져오기, user = {}, kidId = {}, status = {}",
authUser.getUsername(), kidId, status);

KidChallengeListDTO kidChallengeListDTO = challengeMapper.getListKidChallenge(authUser,
KidChallengeListDTO kidChallengeListDTO = challengeMapper.readKidChallengeListMapper(
authUser,
kidId,
status);

Expand All @@ -99,7 +102,8 @@ public CommonResponse<ChallengeDTO> patchChallengeStatus(@AuthenticationPrincipa
log.info("api = 자녀의 돈길 수락 / 거절, user = {}, challengeId = {}, 수락여부 = {}",
authUser.getUsername(), challengeId, kidChallengeRequest.getAccept());

ChallengeDTO challengeDTO = challengeMapper.patchChallengeStatus(authUser, challengeId,
ChallengeDTO challengeDTO = challengeMapper.updateChallengeStatusMapper(authUser,
challengeId,
kidChallengeRequest);

return CommonResponse.onSuccess(challengeDTO);
Expand All @@ -111,7 +115,7 @@ public CommonResponse<WeekDTO> getWeekInfo(@AuthenticationPrincipal User authUse

log.info("api = 주차 정보 가져오기, user = {}", authUser.getUsername());

WeekDTO weekInfo = challengeMapper.getWeekInfo(authUser);
WeekDTO weekInfo = challengeMapper.readWeekInfoMapper(authUser);

return CommonResponse.onSuccess(weekInfo);
}
Expand All @@ -123,7 +127,7 @@ public CommonResponse<KidWeekDTO> getKidWeekInfo(@AuthenticationPrincipal User a

log.info("api = 자녀의 주차 정보 가져오기, user = {}, kid = {}", authUser.getUsername(), kidId);

KidWeekDTO kidWeekInfo = challengeMapper.getKidWeekInfo(authUser, kidId);
KidWeekDTO kidWeekInfo = challengeMapper.readKidWeekInfoMapper(authUser, kidId);

return CommonResponse.onSuccess(kidWeekInfo);
}
Expand All @@ -135,7 +139,7 @@ public CommonResponse<AchievedChallengeListDTO> getAchievedListChallenge(

log.info("api = 완주한 돈길 리스트 가져오기, user = {}", authUser.getUsername());

AchievedChallengeListDTO achievedListChallenge = challengeMapper.getAchievedListChallenge(
AchievedChallengeListDTO achievedListChallenge = challengeMapper.readAchievedChallengeListMapper(
authUser, interestPayment);

return CommonResponse.onSuccess(achievedListChallenge);
Expand All @@ -149,7 +153,7 @@ public CommonResponse<KidAchievedChallengeListDTO> getKidAchievedListChallenge(

log.info("api = 완주한 돈길 리스트 가져오기, user = {}, kid = {}", authUser.getUsername(), kidId);

KidAchievedChallengeListDTO kidAchievedListChallenge = challengeMapper.getKidAchievedListChallenge(
KidAchievedChallengeListDTO kidAchievedListChallenge = challengeMapper.readKidAchievedChallengeListMapper(
authUser, kidId, interestPayment);

return CommonResponse.onSuccess(kidAchievedListChallenge);
Expand All @@ -164,7 +168,8 @@ public CommonResponse<AchievedChallengeDTO> patchInterestPayment(
log.info("api = 완주한 돈길에 이자 지급, user = {}, challengeId = {}", authUser.getUsername(),
challengeId);

AchievedChallengeDTO achievedChallengeDTO = challengeMapper.patchInterestPayment(authUser,
AchievedChallengeDTO achievedChallengeDTO = challengeMapper.updateChallengeInterestPaymentMapper(
authUser,
challengeId);

return CommonResponse.onSuccess(achievedChallengeDTO);
Expand All @@ -177,7 +182,7 @@ public CommonResponse<ProgressDTO> patchProgress(@AuthenticationPrincipal User a

log.info("api = 돈길 걷기, user = {}, challengeId = {}", authUser, challengeId);

ProgressDTO progressDTO = challengeMapper.patchProgress(authUser, challengeId);
ProgressDTO progressDTO = challengeMapper.updateProgressMapper(authUser, challengeId);

return CommonResponse.onSuccess(progressDTO);
}
Expand Down
28 changes: 13 additions & 15 deletions src/main/java/com/ceos/bankids/mapper/ChallengeMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
import com.ceos.bankids.service.ChallengeServiceImpl;
import com.ceos.bankids.service.ChallengeUserServiceImpl;
import com.ceos.bankids.service.ExpoNotificationServiceImpl;
import com.ceos.bankids.service.FamilyServiceImpl;
import com.ceos.bankids.service.FamilyUserServiceImpl;
import com.ceos.bankids.service.KidServiceImpl;
import com.ceos.bankids.service.ParentServiceImpl;
import com.ceos.bankids.service.UserServiceImpl;
import java.sql.Timestamp;
import java.time.DayOfWeek;
import java.time.LocalDateTime;
Expand All @@ -47,8 +45,6 @@
public class ChallengeMapper {

private final ChallengeServiceImpl challengeService;
private final UserServiceImpl userService;
private final FamilyServiceImpl familyService;
private final FamilyUserServiceImpl familyUserService;
private final ChallengeUserServiceImpl challengeUserService;
private final ExpoNotificationServiceImpl notificationService;
Expand All @@ -57,7 +53,7 @@ public class ChallengeMapper {

// 돈길 생성 API Mapper
@Transactional
public ChallengeDTO postChallenge(User authUser, ChallengeRequest challengeRequest) {
public ChallengeDTO createChallengeMapper(User authUser, ChallengeRequest challengeRequest) {

// validation
sundayValidation();
Expand All @@ -83,7 +79,7 @@ public ChallengeDTO postChallenge(User authUser, ChallengeRequest challengeReque

// 돈길 삭제 API Mapper
@Transactional
public ChallengeDTO deleteChallenge(User authUser, Long challengeId) {
public ChallengeDTO deleteChallengeMapper(User authUser, Long challengeId) {

sundayValidation();
userRoleValidation(authUser, true);
Expand Down Expand Up @@ -116,7 +112,7 @@ public ChallengeDTO deleteChallenge(User authUser, Long challengeId) {

// 돈길 리스트 가져오기 API Mapper
@Transactional
public List<ChallengeDTO> getListChallenge(User authUser, String status) {
public List<ChallengeDTO> readChallengeListMapper(User authUser, String status) {

userRoleValidation(authUser, true);
if (!Objects.equals(status, "walking") && !Objects.equals(status, "pending")) {
Expand Down Expand Up @@ -163,7 +159,8 @@ public List<ChallengeDTO> getListChallenge(User authUser, String status) {

// 자녀의 돈길 리스트 가져오기 API Mapper
@Transactional
public KidChallengeListDTO getListKidChallenge(User authUser, Long kidId, String status) {
public KidChallengeListDTO readKidChallengeListMapper(User authUser, Long kidId,
String status) {

userRoleValidation(authUser, false);
Kid kid = kidService.getKid(kidId);
Expand Down Expand Up @@ -211,7 +208,7 @@ public KidChallengeListDTO getListKidChallenge(User authUser, Long kidId, String

// 돈길 수락 / 거절 API Mapper
@Transactional
public ChallengeDTO patchChallengeStatus(User authUser, Long challengeId,
public ChallengeDTO updateChallengeStatusMapper(User authUser, Long challengeId,
KidChallengeRequest kidChallengeRequest) {

sundayValidation();
Expand Down Expand Up @@ -239,7 +236,7 @@ public ChallengeDTO patchChallengeStatus(User authUser, Long challengeId,

// 주차 정보 가져오기 API Mapper
@Transactional(readOnly = true)
public WeekDTO getWeekInfo(User authUser) {
public WeekDTO readWeekInfoMapper(User authUser) {

userRoleValidation(authUser, true);
List<Challenge> walkingChallengeList = challengeUserService.getChallengeUserList(authUser,
Expand All @@ -253,7 +250,7 @@ public WeekDTO getWeekInfo(User authUser) {

// 자녀의 주차 정보 가져오기 API Mapper
@Transactional(readOnly = true)
public KidWeekDTO getKidWeekInfo(User authUser, Long kidId) {
public KidWeekDTO readKidWeekInfoMapper(User authUser, Long kidId) {

userRoleValidation(authUser, false);
Kid kid = kidService.getKid(kidId);
Expand All @@ -271,7 +268,7 @@ public KidWeekDTO getKidWeekInfo(User authUser, Long kidId) {

// 완주한 돈길 리스트 가져오기 API Mapper
@Transactional(readOnly = true)
public AchievedChallengeListDTO getAchievedListChallenge(User authUser,
public AchievedChallengeListDTO readAchievedChallengeListMapper(User authUser,
String interestPayment) {

userRoleValidation(authUser, true);
Expand All @@ -285,7 +282,7 @@ public AchievedChallengeListDTO getAchievedListChallenge(User authUser,

// 자녀의 완주한 돈길 리스트 가져오기 API Mapper
@Transactional(readOnly = true)
public KidAchievedChallengeListDTO getKidAchievedListChallenge(User authUser, Long kidId,
public KidAchievedChallengeListDTO readKidAchievedChallengeListMapper(User authUser, Long kidId,
String interestPayment) {

userRoleValidation(authUser, false);
Expand All @@ -301,7 +298,8 @@ public KidAchievedChallengeListDTO getKidAchievedListChallenge(User authUser, Lo

// 이자 지급 API Mapper
@Transactional
public AchievedChallengeDTO patchInterestPayment(User authUser, Long challengeId) {
public AchievedChallengeDTO updateChallengeInterestPaymentMapper(User authUser,
Long challengeId) {

sundayValidation();
userRoleValidation(authUser, false);
Expand All @@ -312,7 +310,7 @@ public AchievedChallengeDTO patchInterestPayment(User authUser, Long challengeId

// 돈길 걷기 API Mapper
@Transactional
public ProgressDTO patchProgress(User authUser, Long challengeId) {
public ProgressDTO updateProgressMapper(User authUser, Long challengeId) {

sundayValidation();
userRoleValidation(authUser, true);
Expand Down

0 comments on commit 214355f

Please sign in to comment.