Fix/#171 fix history detail (#172)

dong2ast · web-flow · commit 3bf9b029eae4 · 2024-04-25T17:03:03.000+09:00
* refactor: history가 매칭이 안됐을 때 오류 문구 수정

* fix: 공유받은 기도제목 일부 history가 매칭이 안되는 문제 해결

* fix: 보관함에 있는 기도제목 저장하기 할 시 startdate 저장 안되던 오류 해결

* fix: 공유 받은 기도제목 조회시 카테고리가 없는 경우 에러처리

* fix: custom exception 이용 방식 수정 및 기존 에러 처리 코드 수정
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
diff --git a/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java b/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java
@@ -26,22 +26,19 @@ 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;
     }
 
     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
@@ -22,14 +22,12 @@ public interface GroupMemberRepository extends JpaRepository<GroupMember, Long>
 
     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
@@ -20,8 +20,7 @@ public interface GroupPrayRepository extends JpaRepository<GroupPray, Long> {
 
     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
@@ -12,7 +12,6 @@ public interface GroupRepository extends JpaRepository<Group, Long>, 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
@@ -23,15 +23,13 @@ public interface HistoryRepository extends JpaRepository<History, Long>, 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
@@ -24,13 +24,11 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
 
     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
@@ -17,17 +17,15 @@ public interface PrayRepository extends JpaRepository<Pray, Long>, 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"})
     default Pray getPrayByIdAndMemberId(Long prayId, String username) throws NotFoundException {
         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
@@ -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<SharedPray, Long> {
 
     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
@@ -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<PrayListResponseDto> findAllWithOrderAndType(String username, String
             .orderBy(category.order.asc())
             .fetch();
 
+        if (categories.size() == 0) {
+            throw new CustomException(ErrorStatus.NO_CATEGORY_EXCEPTION);
+        }
+
         // 각 카테고리 별로 PrayResponseDto 목록 가져오기
         List<PrayListResponseDto> 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
@@ -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,20 +81,17 @@ 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);
         }
     }
 
     @Transactional
     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
@@ -45,8 +45,7 @@ private static int getNewOrder(int index, List<Category> 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
@@ -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
@@ -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,17 +45,16 @@ 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);
     }
 
     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
diff --git a/src/main/java/com/uspray/uspray/service/facade/GroupFacade.java b/src/main/java/com/uspray/uspray/service/facade/GroupFacade.java
diff --git a/src/main/java/com/uspray/uspray/service/facade/GroupPrayFacade.java b/src/main/java/com/uspray/uspray/service/facade/GroupPrayFacade.java
diff --git a/src/main/java/com/uspray/uspray/service/facade/PrayFacade.java b/src/main/java/com/uspray/uspray/service/facade/PrayFacade.java
diff --git a/src/main/java/com/uspray/uspray/service/facade/ShareFacade.java b/src/main/java/com/uspray/uspray/service/facade/ShareFacade.java

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@ public void kickMember(GroupMember groupMember) {`
`65`	`65`
`66`	`66`	`public void validateGroupName(String newName) {`
`67`	`67`	`if (this.name.equals(newName)) {`
`68`		`- throw new CustomException(ErrorStatus.ALREADY_EXIST_GROUP_NAME_EXCEPTION,`
`69`		`- ErrorStatus.ALREADY_EXIST_GROUP_NAME_EXCEPTION.getMessage());`
	`68`	`+ throw new CustomException(ErrorStatus.ALREADY_EXIST_GROUP_NAME_EXCEPTION);`
`70`	`69`	`}`
`71`	`70`	`}`
`72`	`71`
`@@ -75,8 +74,7 @@ public void checkLeaderAuthorization(Member member) {`
`75`	`74`	`System.out.println(leader.getUserId());`
`76`	`75`	`System.out.println(member.getUserId());`
`77`	`76`	`if (!leader.equals(member)) {`
`78`		`- throw new CustomException(ErrorStatus.GROUP_UNAUTHORIZED_EXCEPTION,`
`79`		`- ErrorStatus.GROUP_UNAUTHORIZED_EXCEPTION.getMessage());`
	`77`	`+ throw new CustomException(ErrorStatus.GROUP_UNAUTHORIZED_EXCEPTION);`
`80`	`78`	`}`
`81`	`79`	`}`
`82`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,7 @@ public void update(PrayUpdateRequestDto prayUpdateRequestDto,`
`105`	`105`
`106`	`106`	`private void handleUpdateContentSharedPray(boolean isShared, String content) {`
`107`	`107`	`if (isShared && content != null) {`
`108`		`- throw new NotFoundException(ErrorStatus.ALREADY_SHARED_EXCEPTION,`
`109`		`- ErrorStatus.ALREADY_SHARED_EXCEPTION.getMessage());`
	`108`	`+ throw new NotFoundException(ErrorStatus.ALREADY_SHARED_EXCEPTION);`
`110`	`109`	`}`
`111`	`110`	`}`
`112`	`111`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`public class CustomException extends RuntimeException{`
`8`	`8`	`private final ErrorStatus errorStatus;`
`9`	`9`
`10`		`- public CustomException(ErrorStatus errorStatus, String message) {`
`11`		`- super(message);`
	`10`	`+ public CustomException(ErrorStatus errorStatus) {`
	`11`	`+ super(errorStatus.getMessage());`
`12`	`12`	`this.errorStatus = errorStatus;`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,7 @@`
`3`	`3`	`import com.uspray.uspray.exception.ErrorStatus;`
`4`	`4`	`public class NotFoundException extends CustomException{`
`5`	`5`
`6`		`- public NotFoundException(ErrorStatus errorStatus,`
`7`		`- String message) {`
`8`		`- super(errorStatus, message);`
	`6`	`+ public NotFoundException(ErrorStatus errorStatus) {`
	`7`	`+ super(errorStatus);`
`9`	`8`	`}`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,22 +26,19 @@ default Category getCategoryByIdAndMember(Long categoryId, Member member) {`
`26`	`26`	`Category category = findById(categoryId)`
`27`	`27`	`.filter(c -> c.getMember().equals(member))`
`28`	`28`	`.orElseThrow(() -> new NotFoundException(`
`29`		`- ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION,`
`30`		`- ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION.getMessage()`
	`29`	`+ ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION`
`31`	`30`	`));`
`32`	`31`
`33`	`32`	`if (!category.getCategoryType().equals(CategoryType.PERSONAL)) {`
`34`		`- throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH,`
`35`		`- ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH.getMessage());`
	`33`	`+ throw new CustomException(ErrorStatus.PRAY_CATEGORY_TYPE_MISMATCH);`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`return category;`
`39`	`37`	`}`
`40`	`38`
`41`	`39`	`default void checkDuplicate(String name, Member member, CategoryType type) {`
`42`	`40`	`if (existsByNameAndMemberAndCategoryType(name, member, type)) {`
`43`		`- throw new NotFoundException(ErrorStatus.CATEGORY_DUPLICATE_EXCEPTION,`
`44`		`- ErrorStatus.CATEGORY_DUPLICATE_EXCEPTION.getMessage());`
	`41`	`+ throw new NotFoundException(ErrorStatus.CATEGORY_DUPLICATE_EXCEPTION);`
`45`	`42`	`}`
`46`	`43`	`}`
`47`	`44`
`@@ -59,8 +56,7 @@ default int checkDuplicateAndReturnMaxOrder(String name, Member member, Category`
`59`	`56`	`default int getMaxCategoryOrder(Member member, CategoryType type) {`
`60`	`57`	`Category category = getCategoriesByMemberAndCategoryTypeOrderByOrder(member, type).stream()`
`61`	`58`	`.reduce((first, second) -> second)`
`62`		`- .orElseThrow(() -> new NotFoundException(ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION,`
`63`		`- ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION.getMessage()));`
	`59`	`+ .orElseThrow(() -> new NotFoundException(ErrorStatus.CATEGORY_NOT_FOUND_EXCEPTION));`
`64`	`60`	`return category.getOrder();`
`65`	`61`	`}`
`66`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,12 @@ public interface GroupMemberRepository extends JpaRepository<GroupMember, Long>`
`22`	`22`
`23`	`23`	`default GroupMember getGroupMemberByGroupAndMember(Group group, Member member) {`
`24`	`24`	`return this.findByGroupAndMember(group, member).orElseThrow(`
`25`		`- () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION,`
`26`		`- ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION.getMessage()));`
	`25`	`+ () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION));`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`default GroupMember getGroupMemberByGroupIdAndMemberId(Long groupId, Long memberId) {`
`30`	`29`	`return this.findByGroupIdAndMemberId(groupId, memberId).orElseThrow(`
`31`		`- () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION,`
`32`		`- ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION.getMessage()));`
	`30`	`+ () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION));`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`GroupMember findGroupMemberByMemberAndGroupId(Member member, Long groupId);`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,7 @@ public interface GroupPrayRepository extends JpaRepository<GroupPray, Long> {`
`20`	`20`
`21`	`21`	`default GroupPray getGroupPrayById(Long id) {`
`22`	`22`	`return this.findById(id).orElseThrow(`
`23`		`- () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_PRAY_EXCEPTION,`
`24`		`- ErrorStatus.NOT_FOUND_GROUP_PRAY_EXCEPTION.getMessage()));`
	`23`	`+ () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_PRAY_EXCEPTION));`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`default void deleteAllByGroup(Group group) {`