From 3bf9b029eae4134529c52475ed15f1ca4e37ada4 Mon Sep 17 00:00:00 2001 From: dong2ast <31067658+dong2ast@users.noreply.github.com> Date: Thu, 25 Apr 2024 17:03:03 +0900 Subject: [PATCH] Fix/#171 fix history detail (#172) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: history가 매칭이 안됐을 때 오류 문구 수정 * fix: 공유받은 기도제목 일부 history가 매칭이 안되는 문제 해결 * fix: 보관함에 있는 기도제목 저장하기 할 시 startdate 저장 안되던 오류 해결 * fix: 공유 받은 기도제목 조회시 카테고리가 없는 경우 에러처리 * fix: custom exception 이용 방식 수정 및 기존 에러 처리 코드 수정 --- .../java/com/uspray/uspray/domain/Group.java | 6 ++---- .../java/com/uspray/uspray/domain/Pray.java | 3 +-- .../uspray/uspray/exception/ErrorStatus.java | 10 ++++++---- .../exception/model/CustomException.java | 4 ++-- .../exception/model/ExistIdException.java | 12 ------------ .../exception/model/NotFoundException.java | 5 ++--- .../model/TokenNotValidException.java | 11 ----------- .../infrastructure/CategoryRepository.java | 12 ++++-------- .../infrastructure/GroupMemberRepository.java | 6 ++---- .../infrastructure/GroupPrayRepository.java | 3 +-- .../uspray/infrastructure/GroupRepository.java | 3 +-- .../infrastructure/HistoryRepository.java | 6 ++---- .../infrastructure/MemberRepository.java | 6 ++---- .../uspray/infrastructure/PrayRepository.java | 9 +++------ .../infrastructure/SharedPrayRepository.java | 9 +++------ .../category/CategoryRepositoryImpl.java | 6 ++++++ .../com/uspray/uspray/service/AuthService.java | 18 ++++++------------ .../uspray/uspray/service/CategoryService.java | 3 +-- .../uspray/uspray/service/HistoryService.java | 8 +++----- .../uspray/uspray/service/MemberService.java | 10 ++++------ .../com/uspray/uspray/service/SmsService.java | 2 +- .../uspray/service/facade/GroupFacade.java | 9 +++------ .../uspray/service/facade/GroupPrayFacade.java | 8 ++------ .../uspray/service/facade/PrayFacade.java | 9 +++------ .../uspray/service/facade/ShareFacade.java | 16 ++++++---------- 25 files changed, 66 insertions(+), 128 deletions(-) delete mode 100644 src/main/java/com/uspray/uspray/exception/model/ExistIdException.java delete mode 100644 src/main/java/com/uspray/uspray/exception/model/TokenNotValidException.java diff --git a/src/main/java/com/uspray/uspray/domain/Group.java b/src/main/java/com/uspray/uspray/domain/Group.java index e15d2174..9cf33ab2 100644 --- a/src/main/java/com/uspray/uspray/domain/Group.java +++ b/src/main/java/com/uspray/uspray/domain/Group.java @@ -65,8 +65,7 @@ public void kickMember(GroupMember groupMember) { public void validateGroupName(String newName) { if (this.name.equals(newName)) { - throw new CustomException(ErrorStatus.ALREADY_EXIST_GROUP_NAME_EXCEPTION, - ErrorStatus.ALREADY_EXIST_GROUP_NAME_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.ALREADY_EXIST_GROUP_NAME_EXCEPTION); } } @@ -75,8 +74,7 @@ public void checkLeaderAuthorization(Member member) { System.out.println(leader.getUserId()); System.out.println(member.getUserId()); if (!leader.equals(member)) { - throw new CustomException(ErrorStatus.GROUP_UNAUTHORIZED_EXCEPTION, - ErrorStatus.GROUP_UNAUTHORIZED_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.GROUP_UNAUTHORIZED_EXCEPTION); } } } diff --git a/src/main/java/com/uspray/uspray/domain/Pray.java b/src/main/java/com/uspray/uspray/domain/Pray.java index b2fc28db..0b583a77 100644 --- a/src/main/java/com/uspray/uspray/domain/Pray.java +++ b/src/main/java/com/uspray/uspray/domain/Pray.java @@ -105,8 +105,7 @@ public void update(PrayUpdateRequestDto prayUpdateRequestDto, private void handleUpdateContentSharedPray(boolean isShared, String content) { if (isShared && content != null) { - throw new NotFoundException(ErrorStatus.ALREADY_SHARED_EXCEPTION, - ErrorStatus.ALREADY_SHARED_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.ALREADY_SHARED_EXCEPTION); } } diff --git a/src/main/java/com/uspray/uspray/exception/ErrorStatus.java b/src/main/java/com/uspray/uspray/exception/ErrorStatus.java index 53434145..b59e5d04 100644 --- a/src/main/java/com/uspray/uspray/exception/ErrorStatus.java +++ b/src/main/java/com/uspray/uspray/exception/ErrorStatus.java @@ -33,6 +33,7 @@ public enum ErrorStatus { CANNOT_RECEIVE_SHARED_PRAY_EXCEPTION(HttpStatus.BAD_REQUEST, "이미 보관함에 있는 기도제목이거나 공유받을 수 없는 기도제목입니다."), ALREADY_EXIST_PHONE_EXCEPTION(HttpStatus.BAD_REQUEST, "이미 사용중인 핸드폰 번호입니다."), + NO_CATEGORY_EXCEPTION(HttpStatus.BAD_REQUEST, "카테고리가 존재하지 않습니다."), /* * 401 UNAUTHORIZED @@ -44,10 +45,11 @@ public enum ErrorStatus { * 403 FORBIDDEN */ PRAY_UNAUTHORIZED_EXCEPTION(HttpStatus.FORBIDDEN, "해당 기도제목에 대한 권한이 없습니다."), - SHARE_NOT_AUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "기도제목을 공유할 권한이 없습니다."), - DELETE_NOT_AUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "기도제목을 삭제할 권한이 없습니다."), - CATEGORY_UNAUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "해당 카테고리에 대한 권한이 없습니다."), - GROUP_UNAUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "해당 모임에 대한 권한이 없습니다."), + SHARE_NOT_AUTHORIZED_EXCEPTION(HttpStatus.FORBIDDEN, "기도제목을 공유할 권한이 없습니다."), + DELETE_NOT_AUTHORIZED_EXCEPTION(HttpStatus.FORBIDDEN, "기도제목을 삭제할 권한이 없습니다."), + CATEGORY_UNAUTHORIZED_EXCEPTION(HttpStatus.FORBIDDEN, "해당 카테고리에 대한 권한이 없습니다."), + GROUP_UNAUTHORIZED_EXCEPTION(HttpStatus.FORBIDDEN, "해당 모임에 대한 권한이 없습니다."), + HISTORY_MISS_MATCH_EXCEPTION(HttpStatus.FORBIDDEN, "해당 히스토리에 대한 접근 권한이 없습니다."), /** * 404 NOT FOUND diff --git a/src/main/java/com/uspray/uspray/exception/model/CustomException.java b/src/main/java/com/uspray/uspray/exception/model/CustomException.java index 75cf3499..39e70f65 100644 --- a/src/main/java/com/uspray/uspray/exception/model/CustomException.java +++ b/src/main/java/com/uspray/uspray/exception/model/CustomException.java @@ -7,8 +7,8 @@ public class CustomException extends RuntimeException{ private final ErrorStatus errorStatus; - public CustomException(ErrorStatus errorStatus, String message) { - super(message); + public CustomException(ErrorStatus errorStatus) { + super(errorStatus.getMessage()); this.errorStatus = errorStatus; } diff --git a/src/main/java/com/uspray/uspray/exception/model/ExistIdException.java b/src/main/java/com/uspray/uspray/exception/model/ExistIdException.java deleted file mode 100644 index 95ba3fc0..00000000 --- a/src/main/java/com/uspray/uspray/exception/model/ExistIdException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.uspray.uspray.exception.model; - -import com.uspray.uspray.exception.ErrorStatus; - -public class ExistIdException extends CustomException { - - public ExistIdException(ErrorStatus errorStatus, - String message) { - super(errorStatus, message); - } - -} diff --git a/src/main/java/com/uspray/uspray/exception/model/NotFoundException.java b/src/main/java/com/uspray/uspray/exception/model/NotFoundException.java index 3c3f19f2..c5eb30b9 100644 --- a/src/main/java/com/uspray/uspray/exception/model/NotFoundException.java +++ b/src/main/java/com/uspray/uspray/exception/model/NotFoundException.java @@ -3,8 +3,7 @@ import com.uspray.uspray.exception.ErrorStatus; public class NotFoundException extends CustomException{ - public NotFoundException(ErrorStatus errorStatus, - String message) { - super(errorStatus, message); + public NotFoundException(ErrorStatus errorStatus) { + super(errorStatus); } } diff --git a/src/main/java/com/uspray/uspray/exception/model/TokenNotValidException.java b/src/main/java/com/uspray/uspray/exception/model/TokenNotValidException.java deleted file mode 100644 index ae4ce5e0..00000000 --- a/src/main/java/com/uspray/uspray/exception/model/TokenNotValidException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.uspray.uspray.exception.model; - -import com.uspray.uspray.exception.ErrorStatus; - -public class TokenNotValidException extends CustomException { - - public TokenNotValidException(ErrorStatus errorStatus, - String message) { - super(errorStatus, message); - } -} diff --git a/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java b/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java index e0637700..679d52b6 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java +++ b/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java @@ -26,13 +26,11 @@ default Category getCategoryByIdAndMember(Long categoryId, Member member) { Category category = findById(categoryId) .filter(c -> c.getMember().equals(member)) .orElseThrow(() -> new NotFoundException( - ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION, - ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION.getMessage() + ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION )); if (!category.getCategoryType().equals(CategoryType.PERSONAL)) { - throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH, - ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH.getMessage()); + throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH); } return category; @@ -40,8 +38,7 @@ default Category getCategoryByIdAndMember(Long categoryId, Member member) { default void checkDuplicate(String name, Member member, CategoryType type) { if (existsByNameAndMemberAndCategoryType(name, member, type)) { - throw new NotFoundException(ErrorStatus.CATEGORY_DUPLICATE_EXCEPTION, - ErrorStatus.CATEGORY_DUPLICATE_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.CATEGORY_DUPLICATE_EXCEPTION); } } @@ -59,8 +56,7 @@ default int checkDuplicateAndReturnMaxOrder(String name, Member member, Category default int getMaxCategoryOrder(Member member, CategoryType type) { Category category = getCategoriesByMemberAndCategoryTypeOrderByOrder(member, type).stream() .reduce((first, second) -> second) - .orElseThrow(() -> new NotFoundException(ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION, - ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION.getMessage())); + .orElseThrow(() -> new NotFoundException(ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION)); return category.getOrder(); } } diff --git a/src/main/java/com/uspray/uspray/infrastructure/GroupMemberRepository.java b/src/main/java/com/uspray/uspray/infrastructure/GroupMemberRepository.java index 21a3192f..0038f8d0 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/GroupMemberRepository.java +++ b/src/main/java/com/uspray/uspray/infrastructure/GroupMemberRepository.java @@ -22,14 +22,12 @@ public interface GroupMemberRepository extends JpaRepository default GroupMember getGroupMemberByGroupAndMember(Group group, Member member) { return this.findByGroupAndMember(group, member).orElseThrow( - () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION, - ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION.getMessage())); + () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION)); } default GroupMember getGroupMemberByGroupIdAndMemberId(Long groupId, Long memberId) { return this.findByGroupIdAndMemberId(groupId, memberId).orElseThrow( - () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION, - ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION.getMessage())); + () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION)); } GroupMember findGroupMemberByMemberAndGroupId(Member member, Long groupId); diff --git a/src/main/java/com/uspray/uspray/infrastructure/GroupPrayRepository.java b/src/main/java/com/uspray/uspray/infrastructure/GroupPrayRepository.java index fe0a8848..21ae772d 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/GroupPrayRepository.java +++ b/src/main/java/com/uspray/uspray/infrastructure/GroupPrayRepository.java @@ -20,8 +20,7 @@ public interface GroupPrayRepository extends JpaRepository { default GroupPray getGroupPrayById(Long id) { return this.findById(id).orElseThrow( - () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_PRAY_EXCEPTION, - ErrorStatus.NOT_FOUND_GROUP_PRAY_EXCEPTION.getMessage())); + () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_PRAY_EXCEPTION)); } default void deleteAllByGroup(Group group) { diff --git a/src/main/java/com/uspray/uspray/infrastructure/GroupRepository.java b/src/main/java/com/uspray/uspray/infrastructure/GroupRepository.java index e3696a25..39648e54 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/GroupRepository.java +++ b/src/main/java/com/uspray/uspray/infrastructure/GroupRepository.java @@ -12,7 +12,6 @@ public interface GroupRepository extends JpaRepository, GroupReposi default Group getGroupById(Long id) { return this.findById(id).orElseThrow( - () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_EXCEPTION, - ErrorStatus.NOT_FOUND_GROUP_EXCEPTION.getMessage())); + () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_EXCEPTION)); } } diff --git a/src/main/java/com/uspray/uspray/infrastructure/HistoryRepository.java b/src/main/java/com/uspray/uspray/infrastructure/HistoryRepository.java index b87646bc..5352b002 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/HistoryRepository.java +++ b/src/main/java/com/uspray/uspray/infrastructure/HistoryRepository.java @@ -23,15 +23,13 @@ public interface HistoryRepository extends JpaRepository, History default History getHistoryByIdAndMember(Long historyId, Member member) { return findByIdAndMember(historyId, member) - .orElseThrow(() -> new NotFoundException(ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION, - ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION.getMessage())); + .orElseThrow(() -> new NotFoundException(ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION)); } default History getHistoryById(Long historyId) { return findById(historyId) .orElseThrow(() -> new NotFoundException( - ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION, - ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION.getMessage() + ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION )); } } diff --git a/src/main/java/com/uspray/uspray/infrastructure/MemberRepository.java b/src/main/java/com/uspray/uspray/infrastructure/MemberRepository.java index bc0cbb04..a0c6eee6 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/MemberRepository.java +++ b/src/main/java/com/uspray/uspray/infrastructure/MemberRepository.java @@ -24,13 +24,11 @@ public interface MemberRepository extends JpaRepository { default Member getMemberByUserId(String userId) { return this.findByUserId(userId).orElseThrow( - () -> new NotFoundException(ErrorStatus.NOT_FOUND_USER_EXCEPTION, - ErrorStatus.NOT_FOUND_USER_EXCEPTION.getMessage())); + () -> new NotFoundException(ErrorStatus.NOT_FOUND_USER_EXCEPTION)); } default Member getMemberById(Long id) { return this.findById(id).orElseThrow( - () -> new NotFoundException(ErrorStatus.NOT_FOUND_USER_EXCEPTION, - ErrorStatus.NOT_FOUND_USER_EXCEPTION.getMessage())); + () -> new NotFoundException(ErrorStatus.NOT_FOUND_USER_EXCEPTION)); } } diff --git a/src/main/java/com/uspray/uspray/infrastructure/PrayRepository.java b/src/main/java/com/uspray/uspray/infrastructure/PrayRepository.java index b988945f..e0c2be2f 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/PrayRepository.java +++ b/src/main/java/com/uspray/uspray/infrastructure/PrayRepository.java @@ -17,8 +17,7 @@ public interface PrayRepository extends JpaRepository, PrayRepositor default Pray getPrayById(Long id) { return findById(id).orElseThrow( - () -> new NotFoundException(ErrorStatus.PRAY_NOT_FOUND_EXCEPTION, - ErrorStatus.PRAY_NOT_FOUND_EXCEPTION.getMessage())); + () -> new NotFoundException(ErrorStatus.PRAY_NOT_FOUND_EXCEPTION)); } @EntityGraph(attributePaths = {"groupPray"}) @@ -26,8 +25,7 @@ default Pray getPrayByIdAndMemberId(Long prayId, String username) throws NotFoun return findById(prayId) .filter(pray -> pray.getMember().getUserId().equals(username)) .orElseThrow(() -> new NotFoundException( - ErrorStatus.PRAY_NOT_FOUND_EXCEPTION, - ErrorStatus.PRAY_NOT_FOUND_EXCEPTION.getMessage() + ErrorStatus.PRAY_NOT_FOUND_EXCEPTION )); } @@ -47,8 +45,7 @@ default Pray getPrayByIdAndMemberId(Long prayId, String username) throws NotFoun default Pray cancelPray(Long prayId, String username) { Pray pray = getPrayByIdAndMemberId(prayId, username); if (!Objects.equals(pray.getLastPrayedAt(), LocalDate.now())) { - throw new NotFoundException(ErrorStatus.ALREADY_CANCEL_EXCEPTION, - ErrorStatus.ALREADY_CANCEL_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.ALREADY_CANCEL_EXCEPTION); } pray.deleteLastPrayedAt(); return pray; diff --git a/src/main/java/com/uspray/uspray/infrastructure/SharedPrayRepository.java b/src/main/java/com/uspray/uspray/infrastructure/SharedPrayRepository.java index 2d9aa12c..b4abfd3f 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/SharedPrayRepository.java +++ b/src/main/java/com/uspray/uspray/infrastructure/SharedPrayRepository.java @@ -3,12 +3,10 @@ import com.uspray.uspray.domain.Member; import com.uspray.uspray.domain.Pray; import com.uspray.uspray.domain.SharedPray; -import java.time.LocalDate; -import java.util.List; -import java.util.Optional; - import com.uspray.uspray.exception.ErrorStatus; import com.uspray.uspray.exception.model.NotFoundException; +import java.time.LocalDate; +import java.util.List; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -26,7 +24,6 @@ public interface SharedPrayRepository extends JpaRepository { default SharedPray getSharedPrayById(Long id) { return this.findById(id).orElseThrow( - () -> new NotFoundException(ErrorStatus.NOT_FOUND_SHARED_PRAY_EXCEPTION, - ErrorStatus.NOT_FOUND_SHARED_PRAY_EXCEPTION.getMessage())); + () -> new NotFoundException(ErrorStatus.NOT_FOUND_SHARED_PRAY_EXCEPTION)); } } diff --git a/src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryImpl.java b/src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryImpl.java index fc45075a..6f1a8273 100644 --- a/src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryImpl.java +++ b/src/main/java/com/uspray/uspray/infrastructure/querydsl/category/CategoryRepositoryImpl.java @@ -12,6 +12,8 @@ import com.uspray.uspray.domain.Category; import com.uspray.uspray.domain.Member; import com.uspray.uspray.domain.Pray; +import com.uspray.uspray.exception.ErrorStatus; +import com.uspray.uspray.exception.model.CustomException; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -34,6 +36,10 @@ public List findAllWithOrderAndType(String username, String .orderBy(category.order.asc()) .fetch(); + if (categories.size() == 0) { + throw new CustomException(ErrorStatus.NO_CATEGORY_EXCEPTION); + } + // 각 카테고리 별로 PrayResponseDto 목록 가져오기 List prayListResponseDtos = new ArrayList<>(); for (Category cat : categories) { diff --git a/src/main/java/com/uspray/uspray/service/AuthService.java b/src/main/java/com/uspray/uspray/service/AuthService.java index 4e19e983..22d491a2 100644 --- a/src/main/java/com/uspray/uspray/service/AuthService.java +++ b/src/main/java/com/uspray/uspray/service/AuthService.java @@ -48,12 +48,10 @@ public MemberResponseDto signup(MemberRequestDto memberRequestDto) { // 핸드폰번호가 존재하거나 아이디가 존재하면 에러 // 핸드폰 번호 또는 아이디가 이미 존재하는지 확인 if (memberRepository.existsByUserId(memberRequestDto.getUserId())) { - throw new NotFoundException(ErrorStatus.ALREADY_EXIST_ID_EXCEPTION, - ErrorStatus.ALREADY_EXIST_ID_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.ALREADY_EXIST_ID_EXCEPTION); } if (memberRepository.existsByPhone(memberRequestDto.getPhone())) { - throw new NotFoundException(ErrorStatus.ALREADY_EXIST_PHONE_EXCEPTION, - ErrorStatus.ALREADY_EXIST_PHONE_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.ALREADY_EXIST_PHONE_EXCEPTION); } Member member = memberRequestDto.toMember(passwordEncoder); @@ -83,11 +81,9 @@ public TokenDto login(MemberLoginRequestDto memberLoginRequestDto) { return tokenDto; } catch (AuthenticationException e) { - throw new NotFoundException(ErrorStatus.WRONG_LOGIN_INFO_EXCEPTION, - ErrorStatus.WRONG_LOGIN_INFO_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.WRONG_LOGIN_INFO_EXCEPTION); } catch (Exception e) { - throw new CustomException(ErrorStatus.INTERNAL_SERVER_ERROR, - ErrorStatus.INTERNAL_SERVER_ERROR.getMessage()); + throw new CustomException(ErrorStatus.INTERNAL_SERVER_ERROR); } } @@ -95,8 +91,7 @@ public TokenDto login(MemberLoginRequestDto memberLoginRequestDto) { public TokenDto reissue(String refreshToken) { // 1. Refresh Token 검증 if (!tokenProvider.validateToken(refreshToken)) { - throw new NotFoundException(ErrorStatus.REFRESH_TOKEN_NOT_VALID_EXCEPTION, - ErrorStatus.REFRESH_TOKEN_NOT_VALID_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.REFRESH_TOKEN_NOT_VALID_EXCEPTION); } // 2. Access Token 에서 Member ID 가져오기 @@ -108,8 +103,7 @@ public TokenDto reissue(String refreshToken) { // 4. Refresh Token 일치하는지 검사 if (!refreshToken.equals(refreshTokenValue)) { - throw new NotFoundException(ErrorStatus.REFRESH_TOKEN_NOT_VALID_EXCEPTION, - ErrorStatus.REFRESH_TOKEN_NOT_VALID_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.REFRESH_TOKEN_NOT_VALID_EXCEPTION); } // 5. 새로운 토큰 생성 diff --git a/src/main/java/com/uspray/uspray/service/CategoryService.java b/src/main/java/com/uspray/uspray/service/CategoryService.java index e89f2ca0..fdfef87b 100644 --- a/src/main/java/com/uspray/uspray/service/CategoryService.java +++ b/src/main/java/com/uspray/uspray/service/CategoryService.java @@ -45,8 +45,7 @@ private static int getNewOrder(int index, List categories, Category ca private static void validateIndex(int index, int size) { if (index < 1 || index > size) { - throw new NotFoundException(ErrorStatus.INDEX_OUT_OF_BOUND_EXCEPTION, - ErrorStatus.INDEX_OUT_OF_BOUND_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.INDEX_OUT_OF_BOUND_EXCEPTION); } } diff --git a/src/main/java/com/uspray/uspray/service/HistoryService.java b/src/main/java/com/uspray/uspray/service/HistoryService.java index 0de10804..0b1b07cf 100644 --- a/src/main/java/com/uspray/uspray/service/HistoryService.java +++ b/src/main/java/com/uspray/uspray/service/HistoryService.java @@ -53,8 +53,7 @@ public HistoryListResponseDto getHistoryList(String username, String type, int p return new HistoryListResponseDto(historyList.getContent(), historyList.getTotalPages()); } - throw new CustomException(ErrorStatus.INVALID_TYPE_EXCEPTION, - ErrorStatus.INVALID_TYPE_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.INVALID_TYPE_EXCEPTION); } @Transactional(readOnly = true) @@ -73,9 +72,8 @@ public HistoryListResponseDto searchHistoryList(String username, public HistoryDetailResponseDto getHistoryDetail(String username, Long historyId) { Member member = memberRepository.getMemberByUserId(username); History history = historyRepository.getHistoryById(historyId); - if (!history.getMember().equals(member)) { - throw new NotFoundException(ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION, - ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION.getMessage()); + if (!history.getMember().getId().equals(member.getId())) { + throw new NotFoundException(ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION); } if (history.getPrayType().equals(PrayType.SHARED)) { Pray originPray = prayRepository.getPrayById(history.getOriginPrayId()); diff --git a/src/main/java/com/uspray/uspray/service/MemberService.java b/src/main/java/com/uspray/uspray/service/MemberService.java index 02450010..b642b6b1 100644 --- a/src/main/java/com/uspray/uspray/service/MemberService.java +++ b/src/main/java/com/uspray/uspray/service/MemberService.java @@ -26,8 +26,7 @@ public class MemberService { @Transactional public void changePhone(String userId, String phone) { if (memberRepository.existsByPhone(phone)) { - throw new CustomException(ErrorStatus.ALREADY_EXIST_PHONE_EXCEPTION, - ErrorStatus.ALREADY_EXIST_PHONE_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.ALREADY_EXIST_PHONE_EXCEPTION); } memberRepository.getMemberByUserId(userId).changePhone(phone); } @@ -46,8 +45,8 @@ public void changeNotificationAgree(String userId, NotificationAgreeDto notifica public void changeName(OauthNameDto oauthNameDto) { Member member = memberRepository.findBySocialId(oauthNameDto.getId()) .orElseThrow(() -> new NotFoundException( - ErrorStatus.NOT_FOUND_USER_EXCEPTION, - ErrorStatus.NOT_FOUND_USER_EXCEPTION.getMessage())); + ErrorStatus.NOT_FOUND_USER_EXCEPTION) + ); member.changeName(oauthNameDto.getName()); member.changeAuthority(Authority.ROLE_USER); } @@ -55,8 +54,7 @@ public void changeName(OauthNameDto oauthNameDto) { public Boolean checkPw(String userId, CheckPwDTO checkPwDto) { Member member = memberRepository.getMemberByUserId(userId); if (!passwordEncoder.matches(checkPwDto.getPassword(), member.getPassword())) { - throw new CustomException(ErrorStatus.NOT_FOUND_USER_EXCEPTION, - ErrorStatus.NOT_FOUND_USER_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.NOT_FOUND_USER_EXCEPTION); } return true; } diff --git a/src/main/java/com/uspray/uspray/service/SmsService.java b/src/main/java/com/uspray/uspray/service/SmsService.java index 56ec71d3..a8708937 100644 --- a/src/main/java/com/uspray/uspray/service/SmsService.java +++ b/src/main/java/com/uspray/uspray/service/SmsService.java @@ -145,7 +145,7 @@ public Boolean getCertification(CertificationDto certificationDto) { .get(certificationDto.getRequestId()); if (!Objects.equals(verificationCode, certificationDto.getSmsConfirmNum())) { - throw new CustomException(ErrorStatus.MISS_MATCH_SMS_CODE, ErrorStatus.MISS_MATCH_SMS_CODE.getMessage()); + throw new CustomException(ErrorStatus.MISS_MATCH_SMS_CODE); } return true; } diff --git a/src/main/java/com/uspray/uspray/service/facade/GroupFacade.java b/src/main/java/com/uspray/uspray/service/facade/GroupFacade.java index 2f4db04d..745cc912 100644 --- a/src/main/java/com/uspray/uspray/service/facade/GroupFacade.java +++ b/src/main/java/com/uspray/uspray/service/facade/GroupFacade.java @@ -64,8 +64,7 @@ public void kickGroupMember(String username, Long groupId, Long kickedMemberId) group.checkLeaderAuthorization(leader); if (group.getLeader().getId().equals(kickedMemberId)) { - throw new CustomException(ErrorStatus.LEADER_CANNOT_LEAVE_GROUP_EXCEPTION, - ErrorStatus.LEADER_CANNOT_LEAVE_GROUP_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.LEADER_CANNOT_LEAVE_GROUP_EXCEPTION); } group.kickMember(kickedgroupMember); groupMemberRepository.delete(kickedgroupMember); @@ -77,8 +76,7 @@ public void addGroupMember(String username, Long groupId) { Group group = groupRepository.getGroupById(groupId); if (groupMemberRepository.existsByGroupAndMember(group, member)) { - throw new CustomException(ErrorStatus.ALREADY_EXIST_GROUP_MEMBER_EXCEPTION, - ErrorStatus.ALREADY_EXIST_GROUP_MEMBER_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.ALREADY_EXIST_GROUP_MEMBER_EXCEPTION); } GroupMember groupMember = GroupMember.builder() .group(group) @@ -95,8 +93,7 @@ public void leaveGroup(String username, Long groupId) { member); if (group.getLeader().equals(member)) { - throw new CustomException(ErrorStatus.LEADER_CANNOT_LEAVE_GROUP_EXCEPTION, - ErrorStatus.LEADER_CANNOT_LEAVE_GROUP_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.LEADER_CANNOT_LEAVE_GROUP_EXCEPTION); } group.kickMember(groupMember); groupMemberRepository.delete(groupMember); diff --git a/src/main/java/com/uspray/uspray/service/facade/GroupPrayFacade.java b/src/main/java/com/uspray/uspray/service/facade/GroupPrayFacade.java index f2cbc7e4..7e7b0b34 100644 --- a/src/main/java/com/uspray/uspray/service/facade/GroupPrayFacade.java +++ b/src/main/java/com/uspray/uspray/service/facade/GroupPrayFacade.java @@ -63,8 +63,7 @@ public void prayToGroupPray(PrayToGroupPrayDto prayToGroupPrayDto, String userId .map(gp -> gp.getOriginPray().getId()) .collect(Collectors.toList()); if (existIds.stream().anyMatch(id -> id.equals(prayToGroupPrayDto.getPrayId()))) { - throw new CustomException(ErrorStatus.ALREADY_EXIST_GROUP_PRAY_EXCEPTION, - ErrorStatus.ALREADY_EXIST_GROUP_PRAY_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.ALREADY_EXIST_GROUP_PRAY_EXCEPTION); } List mainPray = prayRepository.findAllByIdIn(prayToGroupPrayDto.getPrayId()); @@ -190,8 +189,6 @@ public void heartGroupPray(Long groupPrayId, String userId) { Optional scrapAndHeartByGroupPrayAndMember = scrapAndHeartRepository.findScrapAndHeartByGroupPrayAndMember( groupPray, member); - List groupMembers = groupMemberRepository.findByGroupId(groupPray.getGroup().getId()); - if (scrapAndHeartByGroupPrayAndMember.isEmpty()) { ScrapAndHeart scrapAndHeart = ScrapAndHeart.builder() .groupPray(groupPray) @@ -210,8 +207,7 @@ public void heartGroupPray(Long groupPrayId, String userId) { public void scrapGroupPray(ScrapRequestDto scrapRequestDto, String userId) { Category category = categoryRepository.getCategoryById(scrapRequestDto.getCategoryId()); if (!category.getCategoryType().toString().equals(PrayType.SHARED.toString())) { - throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH, - ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH.getMessage()); + throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH); } GroupPray groupPray = groupPrayRepository.getGroupPrayById( scrapRequestDto.getGroupPrayId()); diff --git a/src/main/java/com/uspray/uspray/service/facade/PrayFacade.java b/src/main/java/com/uspray/uspray/service/facade/PrayFacade.java index 66b2cac5..c96e16aa 100644 --- a/src/main/java/com/uspray/uspray/service/facade/PrayFacade.java +++ b/src/main/java/com/uspray/uspray/service/facade/PrayFacade.java @@ -84,8 +84,7 @@ public PrayResponseDto updatePray(Long prayId, String username, pray.getMember()); // 기도 제목 타입과 카테고리 타입 일치하는 지 확인 if (!pray.getPrayType().toString().equals(category.getCategoryType().toString())) { - throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH, - ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH.getMessage()); + throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH); } pray.update(prayUpdateRequestDto, checkIsShared(sharedPray, pray), category); @@ -103,8 +102,7 @@ public boolean checkIsShared(Pray sharedPray, Pray pray) { public void checkGroupPray(Pray pray) { if (pray.getPrayType() == PrayType.GROUP) { - throw new CustomException(ErrorStatus.PRAY_UNAUTHORIZED_EXCEPTION, - ErrorStatus.PRAY_UNAUTHORIZED_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.PRAY_UNAUTHORIZED_EXCEPTION); } } @@ -176,8 +174,7 @@ private void sendNotificationAndSaveLog(Pray pray, Member member) { private void handlePrayedToday(Pray pray) { if (pray.getLastPrayedAt().equals(LocalDate.now())) { - throw new NotFoundException(ErrorStatus.ALREADY_PRAYED_TODAY, - ErrorStatus.ALREADY_PRAYED_TODAY.getMessage()); + throw new NotFoundException(ErrorStatus.ALREADY_PRAYED_TODAY); } pray.countUp(); diff --git a/src/main/java/com/uspray/uspray/service/facade/ShareFacade.java b/src/main/java/com/uspray/uspray/service/facade/ShareFacade.java index 9baa32ce..b00c5f2f 100644 --- a/src/main/java/com/uspray/uspray/service/facade/ShareFacade.java +++ b/src/main/java/com/uspray/uspray/service/facade/ShareFacade.java @@ -61,8 +61,7 @@ public Long receivedSharedPray(String username, SharedPrayRequestDto sharedPrayR long total = 0L; if (prayList.size() != sharedPrayRequestDto.getPrayIds().size()) { - throw new NotFoundException(ErrorStatus.PRAY_NOT_FOUND_EXCEPTION, - ErrorStatus.PRAY_NOT_FOUND_EXCEPTION.getMessage()); + throw new NotFoundException(ErrorStatus.PRAY_NOT_FOUND_EXCEPTION); } for (Pray pray : prayList) { if (!receiveCheck(member, pray)) { @@ -80,8 +79,7 @@ public Long receivedSharedPray(String username, SharedPrayRequestDto sharedPrayR } if (total == 0L) { - throw new CustomException(ErrorStatus.CANNOT_RECEIVE_SHARED_PRAY_EXCEPTION, - ErrorStatus.CANNOT_RECEIVE_SHARED_PRAY_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.CANNOT_RECEIVE_SHARED_PRAY_EXCEPTION); } return total; } @@ -106,8 +104,7 @@ public void saveSharedPray(String username, SharedPraySaveRequestDto sharedPrayS Category category = categoryRepository.getCategoryById( sharedPraySaveRequestDto.getCategoryId()); if (!category.getCategoryType().equals(CategoryType.SHARED)) { - throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH, - ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH.getMessage()); + throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH); } List sharedPrayIds = sharedPraySaveRequestDto.getSharedPrayIds(); @@ -122,8 +119,7 @@ private void save(Member member, Long sharedPrayId, Category category, LocalDate if (sharedPray.getPray().getDeleted()) { sharedPrayRepository.deleteById(sharedPrayId); - throw new CustomException(ErrorStatus.PRAY_ALREADY_DELETED_EXCEPTION, - ErrorStatus.PRAY_ALREADY_DELETED_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.PRAY_ALREADY_DELETED_EXCEPTION); } Pray pray = Pray.builder() .member(member) @@ -133,6 +129,7 @@ private void save(Member member, Long sharedPrayId, Category category, LocalDate .originMemberId(sharedPray.getPray().getMember().getId()) // 원래 기도제목의 원자자가 되어야 함 .category(category) .prayType(PrayType.SHARED) + .startDate(LocalDate.now()) .build(); prayRepository.save(pray); Pray originPray = prayRepository.getPrayById(pray.getOriginPrayId()); @@ -179,8 +176,7 @@ private void delete(Member member, Long sharedPrayId) { SharedPray sharedPray = sharedPrayRepository.getSharedPrayById(sharedPrayId); if (!sharedPray.getMember().equals(member)) { - throw new CustomException(ErrorStatus.DELETE_NOT_AUTHORIZED_EXCEPTION, - ErrorStatus.DELETE_NOT_AUTHORIZED_EXCEPTION.getMessage()); + throw new CustomException(ErrorStatus.DELETE_NOT_AUTHORIZED_EXCEPTION); } sharedPrayRepository.deleteById(sharedPrayId); }