Merge pull request #120 from 2024-Java-Study/jihyun_feat/#118

[Feat] 쿠키 삭제

Author: NamJihyun99

pro/src/main/java/com/example/pro/auth/config/SecurityConfig.java

@@ -8,6 +8,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
@@ -86,7 +87,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                             antMatcher("/api/test"),
                             antMatcher("/members/signup"),
                             antMatcher("/members/login"),
-                            antMatcher("/boards"),
+                            antMatcher(HttpMethod.GET, "/boards"),
                             antMatcher("/health")
                     ).permitAll()
                     .anyRequest().authenticated();
@@ -99,22 +100,6 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         return http.build();
     }
 
-
-//    @Bean
-//    public CorsConfigurationSource corsConfigurationSource() {
-//        CorsConfiguration configuration = new CorsConfiguration();
-//
-//        configuration.addAllowedOriginPattern("*"); // addAllowedOrigin("*")은 allowCredentials(true)랑 같이 사용 불가능
-//        configuration.addAllowedMethod("*");
-//        configuration.addAllowedHeader("*");
-//        configuration.setAllowCredentials(true);
-//        configuration.setMaxAge(7200L);
-//
-//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-//        source.registerCorsConfiguration("/**", configuration);
-//
-//        return source;
-//    }
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();

pro/src/main/java/com/example/pro/auth/controller/MemberController.java

@@ -10,13 +10,15 @@
 import com.example.pro.common.response.BasicResponse;
 import com.example.pro.common.response.ResponseUtil;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import static com.example.pro.auth.domain.UserSession.SESSION_KEY;
 
+
 @RestController
 @RequestMapping("/members")
 @RequiredArgsConstructor
@@ -37,6 +39,13 @@ public BasicResponse<String> signIn(@Valid @RequestBody LoginRequest form) {
         return ResponseUtil.success("로그인 성공: " + username);
     }
 
+    @PostMapping("/logout")
+    public BasicResponse<String> signOut(HttpServletRequest request, HttpServletResponse response) {
+        authService.logout();
+        CookieUtil.deleteCookie(request, response, SESSION_KEY);
+        return ResponseUtil.success("로그아웃되었습니다.");
+    }
+
     @PutMapping("/profiles")
     public BasicResponse<String> updateProfile(@ModelAttribute ProfileUpdateRequest request) {
         Member member = authService.loadUser();
@@ -45,8 +54,9 @@ public BasicResponse<String> updateProfile(@ModelAttribute ProfileUpdateRequest
     }
 
     @DeleteMapping
-    public BasicResponse<String> quitMember() {
+    public BasicResponse<String> quitMember(HttpServletRequest request, HttpServletResponse response) {
         authService.quit();
+        CookieUtil.deleteCookie(request, response, SESSION_KEY);
         return ResponseUtil.success("탈퇴되었습니다.");
     }
 

pro/src/main/java/com/example/pro/auth/domain/UserSession.java

@@ -19,7 +19,7 @@ public class UserSession {
     private LocalDateTime lastAccessedAt;
     private LocalDateTime expiredAt;
     public static final String SESSION_KEY = "JSESSIONID";
-    public static final int SESSION_EXPIRED_SECOND = 1800; // TODO: 테스트를 위해 1분으로 설정. 배포전 수정 필요.
+    public static final int SESSION_EXPIRED_SECOND = 30 * 60; // 30분
 
     public static UserSession create(String sessionId, String username, Clock clock) {
         return new UserSession(sessionId, username, clock);

pro/src/main/java/com/example/pro/auth/service/AuthService.java

@@ -19,6 +19,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Clock;
+import java.util.Optional;
 
 @Slf4j
 @Service
@@ -53,9 +54,17 @@ public String login(LoginRequest form) {
         return form.getUsername();
     }
 
+    @Transactional
+    public void logout() {
+        Member member = loadUser();
+        Optional<UserSession> session = sessionRepository.findByUsername(member.getUsername());
+        session.ifPresent(sessionRepository::delete);
+    }
+
     @Transactional
     public void quit() {
         Member member = loadUser();
+        log.info("login user:{}", member.getUsername());
         memberService.markQuitInWriterInfo(member);
         UserSession session = sessionRepository.findByUsername(member.getUsername())
                 .orElseThrow(() -> new AuthException(AuthErrorCode.UNAUTHORIZED_USER));

pro/src/main/java/com/example/pro/auth/service/MemberService.java

@@ -38,11 +38,9 @@ public Member updateProfile(MultipartFile file, Member member) {
     }
 
     public void markQuitInWriterInfo(Member member) {
-        WriterInfo writer = new WriterInfo(member.getUsername(), member.getProfile(), false);
-
-        List<Board> boards = boardRepository.findAllByWriterInfo(writer);
-        List<Comment> comments = commentRepository.findAllByWriter(writer);
-        List<Reply> replies = replyRepository.findAllByWriter(writer);
+        List<Board> boards = boardRepository.findAllByWriter(member.getUsername());
+        List<Comment> comments = commentRepository.findAllByWriter(member.getUsername());
+        List<Reply> replies = replyRepository.findAllByWriter(member.getUsername());
 
         boards.forEach(Board::removeWriterInfo);
         comments.forEach(Comment::removeWriterInfo);

pro/src/main/java/com/example/pro/auth/utils/CookieUtil.java

@@ -7,7 +7,10 @@
 
 import java.util.Base64;
 
+import static com.example.pro.auth.domain.UserSession.SESSION_EXPIRED_SECOND;
+
 public class CookieUtil {
+
     public static String getCookieValue(HttpServletRequest request, String name) {
         Cookie[] cookies = request.getCookies();
 
@@ -26,9 +29,8 @@ public static void addCookie(HttpServletResponse response, String name, String v
         cookie.setPath("/");
         cookie.setSecure(true);
         cookie.setHttpOnly(true);
-//        cookie.setDomain("localhost");
         cookie.setAttribute("SameSite", "None");
-        cookie.setMaxAge(300);
+        cookie.setMaxAge(SESSION_EXPIRED_SECOND);
 
         response.addCookie(cookie);
     }

pro/src/main/java/com/example/pro/board/controller/BoardController.java

@@ -18,14 +18,12 @@
 public class BoardController {
 
     private final BoardService boardService;
-    private final BoardImageService boardImageService;
     private final AuthService authService;
 
     @PostMapping
     public BasicResponse<String> create(@ModelAttribute @Valid BoardSaveDto boardDto) {
         Member member = authService.loadUser();
         Board board = boardService.createBoard(boardDto, member.getUsername(), member.getProfile());
-        boardImageService.uploadBoardImage(boardDto.getImages(), board);
         return ResponseUtil.success("게시물 생성에 성공하였습니다. 게시물id: " + board.getId());
     }
 
@@ -55,9 +53,7 @@ public BasicResponse<String> delete(@PathVariable Long id) {
 
     @PutMapping("/{id}/upload")
     public BasicResponse<String> uploadImage(@ModelAttribute BoardImageUploadDto request, @PathVariable Long id) {
-        Board board = boardService.findBoard(id);
-        boardImageService.deleteBoardImage(board);
-        boardImageService.uploadBoardImage(request.getImages(), board);
-        return ResponseUtil.success("게시물 id: " + id + "번 사진 추가에 성공하였습니다.");
+        boardService.updateBoardImages(id, request);
+        return ResponseUtil.success("사진 수정에 성공하였습니다. 게시물 id: " + id);
     }
 }

pro/src/main/java/com/example/pro/board/dto/BoardSaveDto.java

@@ -1,6 +1,5 @@
 package com.example.pro.board.dto;
 
-import com.example.pro.board.domain.Board;
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
 import org.springframework.web.multipart.MultipartFile;

pro/src/main/java/com/example/pro/board/repository/BoardRepository.java

@@ -3,11 +3,15 @@
 import com.example.pro.board.domain.Board;
 import com.example.pro.comment.domain.WriterInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
 public interface BoardRepository extends JpaRepository<Board, Long> {
 
     List<Board> findByTitle(String title);
-    List<Board> findAllByWriterInfo(WriterInfo writer);
+
+    @Query("select board from Board board where board.writerInfo.username = :writerName")
+    List<Board> findAllByWriter(@Param("writerName") String writerName);
 }

pro/src/main/java/com/example/pro/board/service/BoardService.java

@@ -10,6 +10,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,13 +25,16 @@ public class BoardService {
 
     @Transactional
     public Board createBoard(BoardSaveDto boardDto, String username, String profile) {
-        Board board = Board.builder()
-                .username(username)
-                .profile(profile)
-                .title(boardDto.getTitle())
-                .content(boardDto.getContent())
-                .build();
-        return boardRepository.save(board);
+        Board board = boardRepository.save(
+                Board.builder()
+                        .username(username)
+                        .profile(profile)
+                        .title(boardDto.getTitle())
+                        .content(boardDto.getContent())
+                        .build()
+        );
+        boardImageService.uploadBoardImage(boardDto.getImages(), board);
+        return board;
     }
 
     public BoardResponseDto makeBoardResponse(Long boardId) {
@@ -46,19 +50,18 @@ public Board findBoard(Long boardId) {
     }
 
     public BoardCountResponseDto findAllBoards() {
+        long totalCount = boardRepository.count();
         List<Board> boards = boardRepository.findAll();
 
         // 엔티티를 Dto로 변환하는 로직
         List<BoardListResponseDto> responses = boards.stream()
                 .map(BoardListResponseDto::toBoardListDto)
                 .collect(Collectors.toList());
-        long count = boardRepository.count();
-        return new BoardCountResponseDto(responses, count);
+        return new BoardCountResponseDto(responses, totalCount);
     }
 
     public List<Board> searchTitle(String title) {
         return boardRepository.findByTitle(title);
-
     }
 
     @Transactional
@@ -76,6 +79,13 @@ public BoardUpdateDto updateBoard(Long boardId, BoardUpdateDto boardUpdateDto, M
         return BoardUpdateDto.toBoardUpdateDto(board);
     }
 
+    @Transactional
+    public void updateBoardImages(Long boardId, BoardImageUploadDto dto) {
+        Board board = findBoard(boardId);
+        boardImageService.deleteBoardImage(board);
+        boardImageService.uploadBoardImage(dto.getImages(), board);
+    }
+
     @Transactional
     public void deleteBoard(Long boardId, Member member) {
         Board board = boardRepository.findById(boardId)

pro/src/main/java/com/example/pro/comment/repository/CommentRepository.java

@@ -2,13 +2,15 @@
 
 import com.example.pro.board.domain.Board;
 import com.example.pro.comment.domain.Comment;
-import com.example.pro.comment.domain.WriterInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
 public interface CommentRepository extends JpaRepository<Comment, Long> {
 
     List<Comment> findAllByBoard(Board board);
-    List<Comment> findAllByWriter(WriterInfo writer);
+    @Query("select comment from Comment comment where comment.writer.username = :writerName")
+    List<Comment> findAllByWriter(@Param("writerName") String writerName);
 }

pro/src/main/java/com/example/pro/comment/repository/ReplyRepository.java

@@ -4,11 +4,14 @@
 import com.example.pro.comment.domain.Reply;
 import com.example.pro.comment.domain.WriterInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
 public interface ReplyRepository extends JpaRepository<Reply, Long> {
 
     List<Reply> findAllByComment(Comment comment);
-    List<Reply> findAllByWriter(WriterInfo writer);
+    @Query("select reply from Reply reply where reply.writer.username = :writerName")
+    List<Reply> findAllByWriter(@Param("writerName") String writerName);
 }

pro/src/test/java/com/example/pro/auth/service/MemberServiceTest.java

@@ -100,7 +100,7 @@ void markQuitWriterInfo() {
         List<Board> boards = List.of(board);
         List<Comment> comments = List.of(comment);
         List<Reply> replies = List.of(reply);
-        when(boardRepository.findAllByWriterInfo(any())).thenReturn(boards);
+        when(boardRepository.findAllByWriter(any())).thenReturn(boards);
         when(commentRepository.findAllByWriter(any())).thenReturn(comments);
         when(replyRepository.findAllByWriter(any())).thenReturn(replies);
 

pro/src/test/java/com/example/pro/board/controller/BoardControllerTest.java

@@ -616,6 +616,6 @@ void deleteBoardNotValidation() throws Exception {
 
     @Override
     protected Object injectController() {
-        return new BoardController(boardService, boardImageService, authService);
+        return new BoardController(boardService, authService);
     }
 }

pro/src/test/java/com/example/pro/board/controller/BoardUploadControllerTest.java

@@ -100,6 +100,6 @@ void init() {
 
     @Override
     protected Object injectController() {
-        return new BoardController(boardService, boardImageService, authService);
+        return new BoardController(boardService, authService);
     }
 }

pro/src/test/java/com/example/pro/board/service/BoardServiceSearchTest.java

@@ -23,12 +23,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class) // Junit5 & Mockito 연동
 public class BoardServiceSearchTest {
 
     @Mock BoardRepository boardRepository; // 의존성 주입
+    @Mock BoardImageService boardImageService;
     @Mock FileUploader fileUploader;
     @InjectMocks BoardService boardService;
 
@@ -76,7 +78,7 @@ public void createBoard() throws Exception {
 
         // when
         when(boardRepository.save(any())).thenReturn(board);
-
+        doNothing().when(boardImageService).uploadBoardImage(any(), any());
 
         // then
         assertThat(boardService.createBoard(boardSaveDto, member.getUsername(), any()).getTitle()).isEqualTo("제목");