Merge pull request #47 from Nook-Book/develop

[FEAT] 일시적 사용자 검증 단계 해제
Nook-Book · Jan 20, 2025 · 4c89cc0 · 4c89cc0
2 parents bc5e4b0 + 27b0385
commit 4c89cc0
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 45 deletions.
diff --git a/src/main/java/com/nookbook/domain/book/applicaiton/BookService.java b/src/main/java/com/nookbook/domain/book/applicaiton/BookService.java
@@ -60,7 +60,8 @@ public class BookService {
     // 검색
     @Transactional
     public ResponseEntity<?> searchBooks(UserPrincipal userPrincipal, String keyword, int page) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         // 검색 키워드 저장
         keywordService.saveKeyword(user, keyword);
 
@@ -130,7 +131,8 @@ public ResponseEntity<?> getBestSellerByCategory(int page, int category, int siz
     // 상세 조회
     @Transactional
     public ResponseEntity<?> getBookDetail(UserPrincipal userPrincipal, String isbn13) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         BookStatus bookStatus = BookStatus.BEFORE_READ;
         boolean isStoredCollection = false;
         boolean hasNote = false;
@@ -286,7 +288,8 @@ private BookDetailRes convertToBookDetailRes(String json) {
     // 독서 상태 변경
     @Transactional
     public ResponseEntity<?> updateBookStatus(UserPrincipal userPrincipal, Long bookId) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         Optional<Book> bookOptional = bookRepository.findById(bookId);
         DefaultAssert.isTrue(bookOptional.isPresent(), "해당 도서가 존재하지 않습니다.");
         Book book = bookOptional.get();
@@ -318,7 +321,8 @@ public ResponseEntity<?> updateBookStatus(UserPrincipal userPrincipal, Long book
 
     // 독서 리포트 - 카테고리
     public ResponseEntity<ApiResponse> countReadBooksByCategory(UserPrincipal userPrincipal) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         // groupby에 따라서 카테고리에 맞는 점수 배정
         // 읽은 책 조회
         List<UserBook> userBooks = userBookRepository.findByUserAndBookStatus(user, BookStatus.READ);
@@ -350,7 +354,8 @@ public ResponseEntity<ApiResponse> countReadBooksByCategory(UserPrincipal userPr
 
     // 독서 리포트 - 독서 통계
     public ResponseEntity<ApiResponse> countReadBooksByYear(UserPrincipal userPrincipal, int year) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         List<UserBook> userBooks = userBookRepository.findUserBooksByStatusAndYear(user, BookStatus.READ, year);
 
         // 월별로 그룹화하여 카운트
@@ -379,7 +384,8 @@ public ResponseEntity<ApiResponse> countReadBooksByYear(UserPrincipal userPrinci
     }
 
     private User validUserById(Long userId) {
-        Optional<User> userOptional = userRepository.findById(userId);
+        // Optional<User> userOptional = userRepository.findById(userId);
+        Optional<User> userOptional = userRepository.findById(1L);
         DefaultAssert.isTrue(userOptional.isPresent(), "유효한 사용자가 아닙니다.");
         return userOptional.get();
     }

diff --git a/src/main/java/com/nookbook/domain/challenge/application/ChallengeService.java b/src/main/java/com/nookbook/domain/challenge/application/ChallengeService.java
@@ -371,8 +371,10 @@ public ResponseEntity<?> changeOwner(UserPrincipal userPrincipal, Long challenge
 
     // 사용자 검증 메서드
     private User validateUser(UserPrincipal userPrincipal) {
-        return userService.findByEmail(userPrincipal.getEmail())
-                .orElseThrow(UserNotFoundException::new);
+//        return userService.findByEmail(userPrincipal.getEmail())
+//                .orElseThrow(UserNotFoundException::new);
+        // userId=1L로 고정
+        return userService.findById(1L);
     }
 
     // 챌린지 검증 메서드

diff --git a/src/main/java/com/nookbook/domain/collection/application/CollectionService.java b/src/main/java/com/nookbook/domain/collection/application/CollectionService.java
@@ -14,6 +14,7 @@
 import com.nookbook.domain.collection.dto.response.*;
 import com.nookbook.domain.user.application.UserService;
 import com.nookbook.domain.user.domain.User;
+import com.nookbook.domain.user.exception.UserNotFoundException;
 import com.nookbook.global.config.security.token.UserPrincipal;
 import com.nookbook.global.payload.ApiResponse;
 import lombok.RequiredArgsConstructor;
@@ -41,9 +42,7 @@ public class CollectionService {
     // 컬렉션 생성
     @Transactional
     public ResponseEntity<?> createCollection(UserPrincipal userPrincipal, CollectionCreateReq collectionCreateReq) {
-        User user= userService.findByEmail(userPrincipal.getEmail())
-                .orElseThrow(() -> new RuntimeException("사용자 정보를 찾을 수 없습니다."));
-
+        User user = validateUser(userPrincipal);
         // 사용자의 마지막 컬렉션 순서를 가져와서 새로운 순서를 지정
         int maxOrderIndex = collectionRepository.findMaxOrderIndexByUser(user).orElse(0);
 
@@ -68,9 +67,7 @@ public ResponseEntity<?> createCollection(UserPrincipal userPrincipal, Collectio
     // 컬렉션 리스트 조회
     // CollectionListRes -> CollectionListDetailRes (컬렉션ID, 제목, 커버 리스트) -> CollectionCoverRes(커버 리스트)
     public ResponseEntity<?> getCollectionList(UserPrincipal userPrincipal) {
-        User user = userService.findByEmail(userPrincipal.getEmail())
-                .orElseThrow(() -> new RuntimeException("사용자 정보를 찾을 수 없습니다."));
-
+        User user = validateUser(userPrincipal);
         List<Collection> collections = collectionRepository.findAllByUser(user);
 
         List<CollectionListDetailRes> collectionListDetailRes = collections.stream()
@@ -171,8 +168,7 @@ public CollectionBooksListRes getCollectionBooksListDetailRes(Collection collect
 
     // 컬렉션 소유자 검증
     public Collection findCollectionByUserAndCollectionId(UserPrincipal userPrincipal, Long collectionId) {
-        User user = userService.findByEmail(userPrincipal.getEmail())
-                .orElseThrow(() -> new RuntimeException("사용자 정보를 찾을 수 없습니다."));
+        User user = validateUser(userPrincipal);
 
         Collection collection = collectionRepository.findById(collectionId)
                 .orElseThrow(() -> new RuntimeException("컬렉션을 찾을 수 없습니다."));
@@ -247,8 +243,7 @@ public ResponseEntity<?> deleteBookFromCollection(UserPrincipal userPrincipal, L
     // 컬렉션 목록의 순서를 모두 요청값으로 받아서 수정
     @Transactional
     public ResponseEntity<?> editCollectionOrder(UserPrincipal userPrincipal, List<CollectionOrderReq> collectionOrderReqList) {
-        User user = userService.findByEmail(userPrincipal.getEmail())
-                .orElseThrow(() -> new RuntimeException("사용자 정보를 찾을 수 없습니다."));
+        validateUser(userPrincipal);
 
         // 컬렉션 순서 변경
         // 1. 요청값의 collectionId를 통해 컬렉션 객체를 찾음
@@ -286,8 +281,7 @@ public ResponseEntity<?> editCollectionOrder(UserPrincipal userPrincipal, List<C
 
     // 현재 컬렉션 id 목록 조회
     public ResponseEntity<?> getCurrentCollectionBooks(UserPrincipal userPrincipal) {
-        User user = userService.findByEmail(userPrincipal.getEmail())
-                .orElseThrow(() -> new RuntimeException("사용자 정보를 찾을 수 없습니다."));
+        User user = validateUser(userPrincipal);
 
         // 유저의 컬렉션 중 CollectionStatus.MAIN인 컬렉션을 찾아 도서 목록 조회
         List<Collection> mainCollections = collectionRepository.findAllByUserAndCollectionStatus(user, CollectionStatus.MAIN);
@@ -314,4 +308,12 @@ public ResponseEntity<?> getCurrentCollectionBooks(UserPrincipal userPrincipal)
         return ResponseEntity.ok(response);
 
     }
+
+    // 사용자 검증 메서드
+    private User validateUser(UserPrincipal userPrincipal) {
+//        return userService.findByEmail(userPrincipal.getEmail())
+//                .orElseThrow(UserNotFoundException::new);
+        // userId=2L로 고정
+        return userService.findById(1L);
+    }
 }
diff --git a/src/main/java/com/nookbook/domain/keyword/application/KeywordService.java b/src/main/java/com/nookbook/domain/keyword/application/KeywordService.java
@@ -54,7 +54,8 @@ public void saveKeyword(User user, String keyword) {
 
     // 키워드 조회
     public ResponseEntity<?> getKeywords(UserPrincipal userPrincipal) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         List<Keyword> findKeywords = keywordRepository.findByUser(user);
         findKeywords.sort(Comparator.comparing(Keyword::getCreatedAt));
 
@@ -72,7 +73,8 @@ public ResponseEntity<?> getKeywords(UserPrincipal userPrincipal) {
     // 키워드 삭제
     @Transactional
     public ResponseEntity<?> deleteKeyword(UserPrincipal userPrincipal, Long keywordId) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         Keyword findKeyword = keywordRepository.findByUserAndKeywordId(user, keywordId);
 
         DefaultAssert.isTrue(user == findKeyword.getUser(), "해당 검색어에 대한 권한이 없습니다.");
@@ -86,8 +88,10 @@ public ResponseEntity<?> deleteKeyword(UserPrincipal userPrincipal, Long keyword
     }
 
     private User validUserById(Long userId) {
-        Optional<User> userOptional = userRepository.findById(userId);
+        // Optional<User> userOptional = userRepository.findById(userId);
+        Optional<User> userOptional = userRepository.findById(1L);
         DefaultAssert.isTrue(userOptional.isPresent(), "유효한 사용자가 아닙니다.");
         return userOptional.get();
+
     }
 }
diff --git a/src/main/java/com/nookbook/domain/note/application/NoteService.java b/src/main/java/com/nookbook/domain/note/application/NoteService.java
@@ -39,7 +39,8 @@ public class NoteService {
     // 노트 저장
     @Transactional
     public ResponseEntity<?> saveNewNote(UserPrincipal userPrincipal, CreateNoteReq createNoteReq) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         Book book = validBookById(createNoteReq.getBookId());
 
         UserBook userBook;
@@ -76,7 +77,8 @@ public ResponseEntity<?> saveNewNote(UserPrincipal userPrincipal, CreateNoteReq
     // 노트 수정
     @Transactional
     public ResponseEntity<?> updateNote(UserPrincipal userPrincipal, Long noteId, UpdateNoteReq updateNoteReq) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         Note note = validNoteById(noteId);
         DefaultAssert.isTrue(note.getUserBook().getUser() == user, "유효한 접근이 아닙니다.");
 
@@ -94,7 +96,8 @@ public ResponseEntity<?> updateNote(UserPrincipal userPrincipal, Long noteId, Up
     // 노트 삭제
     @Transactional
     public ResponseEntity<?> deleteNote(UserPrincipal userPrincipal, Long noteId) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         Note note = validNoteById(noteId);
         DefaultAssert.isTrue(note.getUserBook().getUser() == user, "유효한 접근이 아닙니다.");
 
@@ -111,7 +114,8 @@ public ResponseEntity<?> deleteNote(UserPrincipal userPrincipal, Long noteId) {
 
     // 책 정보 조회(제목, 이미지) && 노트 목록 조회
     public ResponseEntity<?> getNoteList(UserPrincipal userPrincipal, Long bookId) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         Book book = validBookById(bookId);
 
         Optional<UserBook> userBookOptional = userBookRepository.findByUserAndBook(user, book);
@@ -145,7 +149,8 @@ public ResponseEntity<?> getNoteList(UserPrincipal userPrincipal, Long bookId) {
 
     // 노트 상세 조회
     public ResponseEntity<?> getNoteDetail(UserPrincipal userPrincipal, Long noteId) {
-        User user = validUserById(userPrincipal.getId());
+        // User user = validUserById(userPrincipal.getId());
+        User user = validUserById(1L);
         Note note = validNoteById(noteId);
         DefaultAssert.isTrue(note.getUserBook().getUser() == user, "유효한 접근이 아닙니다.");
 
@@ -163,7 +168,8 @@ public ResponseEntity<?> getNoteDetail(UserPrincipal userPrincipal, Long noteId)
     }
 
     private User validUserById(Long userId) {
-        Optional<User> userOptional = userRepository.findById(userId);
+        // Optional<User> userOptional = userRepository.findById(userId);
+        Optional<User> userOptional = userRepository.findById(1L);
         DefaultAssert.isTrue(userOptional.isPresent(), "유효한 사용자가 아닙니다.");
         return userOptional.get();
     }

diff --git a/src/main/java/com/nookbook/domain/user/application/UserService.java b/src/main/java/com/nookbook/domain/user/application/UserService.java
@@ -49,9 +49,8 @@ public Optional<User> findByEmail(String email) {
 
     @Transactional
     public ResponseEntity<?> saveUserInfo(UserPrincipal userPrincipal, UserInfoReq userInfoReq) {
-        User user = userRepository.findByEmail(userPrincipal.getEmail())
-                .orElseThrow(() -> new RuntimeException("사용자 정보를 찾을 수 없습니다."));
-
+        // User user = validUserByUserId(userPrincipal.getId());
+        User user = validUserByUserId(2L);
         user.saveUserInfo(userInfoReq.getNicknameId(), userInfoReq.getNickname());
         createDefaultCollection(user);
 
@@ -80,9 +79,8 @@ public void createDefaultCollection(User user) {
 
 
     public ResponseEntity<?> checkNicknameId(UserPrincipal userPrincipal, NicknameIdCheckReq nicknameIdCheckReq) {
-        userRepository.findByEmail(userPrincipal.getEmail())
-                .orElseThrow(() -> new RuntimeException("사용자 정보를 찾을 수 없습니다. 로그인 정보를 확인해주세요."));
-
+        // validUserByUserId(userPrincipal.getId());
+        validUserByUserId(1L);
         boolean isUnique = checkDuplicateNicknameId(nicknameIdCheckReq.getNicknameId());
 
         NicknameIdCheckRes nicknameIdCheckRes = NicknameIdCheckRes.builder()
@@ -99,12 +97,11 @@ public ResponseEntity<?> checkNicknameId(UserPrincipal userPrincipal, NicknameId
     }
 
     public ResponseEntity<?> checkNickname(UserPrincipal userPrincipal, NicknameCheckReq nicknameCheckReq) {
-        userRepository.findByEmail(userPrincipal.getEmail())
-                .orElseThrow(() -> new RuntimeException("사용자 정보를 찾을 수 없습니다."));
-
-       boolean isUnique = checkDuplicateNickname(nicknameCheckReq.getNickname());
+        // validUserByUserId(userPrincipal.getId());
+        validUserByUserId(1L);
+        boolean isUnique = checkDuplicateNickname(nicknameCheckReq.getNickname());
 
-       NicknameCheckRes nicknameCheckRes = NicknameCheckRes.builder()
+        NicknameCheckRes nicknameCheckRes = NicknameCheckRes.builder()
                 .isUnique(isUnique)
                 .build();
 
@@ -120,7 +117,8 @@ public ResponseEntity<?> checkNickname(UserPrincipal userPrincipal, NicknameChec
     // 아이디 수정
     @Transactional
     public ResponseEntity<?> updateNicknameId(UserPrincipal userPrincipal, NicknameIdCheckReq nicknameIdCheckReq) {
-        User user = validUserByUserId(userPrincipal.getId());
+        // User user = validUserByUserId(userPrincipal.getId());
+        User user = validUserByUserId(1L);
         String nicknameId = nicknameIdCheckReq.getNicknameId();
         boolean isAvailable = checkDuplicateNicknameId(nicknameId);
 
@@ -138,7 +136,8 @@ public ResponseEntity<?> updateNicknameId(UserPrincipal userPrincipal, NicknameI
     // 닉네임 수정
     @Transactional
     public ResponseEntity<?> updateNickname(UserPrincipal userPrincipal, NicknameCheckReq nicknameCheckReq) {
-        User user = validUserByUserId(userPrincipal.getId());
+        // User user = validUserByUserId(userPrincipal.getId());
+        User user = validUserByUserId(1L);
         String nickname = nicknameCheckReq.getNickname();
         boolean isAvailable = checkDuplicateNickname(nickname);
 
@@ -164,7 +163,8 @@ private boolean checkDuplicateNickname(String nickname) {
     // 내 정보 조회
     // 닉네임 아이디 친구 수
     public ResponseEntity<ApiResponse> getMyInfo(UserPrincipal userPrincipal) {
-        User user = validUserByUserId(userPrincipal.getId());
+        // User user = validUserByUserId(userPrincipal.getId());
+        User user = validUserByUserId(1L);
         // TODO: 친구 수 구하는 로직
         int num = 0;
         MyInfoRes myInfoRes = MyInfoRes.builder()
@@ -183,7 +183,8 @@ public ResponseEntity<ApiResponse> getMyInfo(UserPrincipal userPrincipal) {
     // 프로필 사진 등록
     @Transactional
     public ResponseEntity<?> updateImage(UserPrincipal userPrincipal, Boolean isDefaultImage, Optional<MultipartFile> image) {
-        User user = validUserByUserId(userPrincipal.getId());
+        // User user = validUserByUserId(userPrincipal.getId());
+        User user = validUserByUserId(1L);
         if (!Objects.equals(user.getImageName(), "default.png")) {
             s3Uploader.deleteFile(user.getImageName());
         }
@@ -211,4 +212,8 @@ private User validUserByUserId(Long userId) {
         DefaultAssert.isTrue(user.isPresent(), "사용자가 존재하지 않습니다.");
         return user.get();
     }
+
+    public User findById(long l) {
+        return userRepository.findById(l).orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다."));
+    }
 }
diff --git a/src/main/java/com/nookbook/global/config/security/SecurityConfig.java b/src/main/java/com/nookbook/global/config/security/SecurityConfig.java
@@ -80,7 +80,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         .permitAll()
                         .requestMatchers("/swagger", "/swagger-ui.html", "/swagger-ui/**", "/api-docs", "/api-docs/**", "/v3/api-docs/**")
                         .permitAll()
-                        .requestMatchers("/login/**", "/auth/idTokenLogin", "/oauth2/**", "/api/v1/note/text")
+                        .requestMatchers("/login/**", "/auth/idTokenLogin", "/oauth2/**", "/api/v1/note/text", "api/v1/**")
                         .permitAll()
                         .anyRequest()
                         .authenticated())