Merge pull request #166 from Bamdoliro/chore/api

Chore/api

Author: gimhanul

src/main/java/com/bamdoliro/gati/domain/board/.gitkeep

@@ -3,6 +3,7 @@
 import com.bamdoliro.gati.domain.board.presentation.dto.request.CreateBoardRequestDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.request.UpdateBoardRequestDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.response.BoardDetailDto;
+import com.bamdoliro.gati.domain.board.presentation.dto.response.BoardListResponseDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.response.BoardResponseDto;
 import com.bamdoliro.gati.domain.board.service.BoardService;
 import lombok.RequiredArgsConstructor;
@@ -18,19 +19,16 @@ public class  BoardController {
 
     private final BoardService boardService;
 
-    // 게시물 저장
     @PostMapping
     public void savePost(@RequestBody @Valid CreateBoardRequestDto request) {
         boardService.savePost(request);
     }
 
-    // 게시물 디테일
     @GetMapping("/{id}")
     public BoardDetailDto getDetail(@PathVariable Long id) {
         return boardService.getDetail(id);
     }
 
-    // 게시물 수정
     @PutMapping("/{id}")
     public void updatePost(
             @RequestBody @Valid UpdateBoardRequestDto request,
@@ -39,15 +37,13 @@ public void updatePost(
         boardService.updatePost(request, id);
     }
 
-    // 게시물 삭제
     @DeleteMapping("/{id}")
     public void deletePost(@PathVariable Long id) {
         boardService.deletePost(id);
     }
 
-    // 커뮤니티 전체 게시물 조회
-    @GetMapping("/community/{communityId}")
-    public List<BoardResponseDto> getCommunityPosts(@PathVariable Long communityId) {
+    @GetMapping("/community/{community-id}")
+    public BoardListResponseDto getCommunityPosts(@PathVariable(name = "community-id") Long communityId) {
         return boardService.getCommunityPosts(communityId);
     }
 }

src/main/java/com/bamdoliro/gati/domain/board/presentation/BoardController.java

@@ -2,6 +2,7 @@
 
 import com.bamdoliro.gati.domain.board.presentation.dto.request.CreateReportRequestDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.response.ReportDetailResponseDto;
+import com.bamdoliro.gati.domain.board.presentation.dto.response.ReportListResponseDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.response.ReportResponseDto;
 import com.bamdoliro.gati.domain.board.service.ReportService;
 import lombok.RequiredArgsConstructor;
@@ -27,7 +28,7 @@ public void reportPost(
 
     // 특정 게시물의 신고 리스트 조회
     @GetMapping("/{boardId}")
-    public List<ReportResponseDto> getReportList(@PathVariable Long boardId) {
+    public ReportListResponseDto getReportList(@PathVariable Long boardId) {
         return reportService.getBoardReportList(boardId);
     }
 

src/main/java/com/bamdoliro/gati/domain/board/presentation/ReportController.java

@@ -0,0 +1,13 @@
+package com.bamdoliro.gati.domain.board.presentation.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+public class BoardListResponseDto {
+
+    private List<BoardResponseDto> boardList;
+}

src/main/java/com/bamdoliro/gati/domain/board/presentation/dto/response/BoardListResponseDto.java

@@ -0,0 +1,13 @@
+package com.bamdoliro.gati.domain.board.presentation.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+public class ReportListResponseDto {
+
+    private List<ReportResponseDto> reportList;
+}

src/main/java/com/bamdoliro/gati/domain/board/presentation/dto/response/ReportListResponseDto.java

@@ -7,6 +7,7 @@
 import com.bamdoliro.gati.domain.board.presentation.dto.request.CreateBoardRequestDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.request.UpdateBoardRequestDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.response.BoardDetailDto;
+import com.bamdoliro.gati.domain.board.presentation.dto.response.BoardListResponseDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.response.BoardResponseDto;
 import com.bamdoliro.gati.domain.community.domain.Community;
 import com.bamdoliro.gati.domain.community.facade.CommunityFacade;
@@ -29,7 +30,6 @@ public class BoardService {
     private final CommunityFacade communityFacade;
     private final MemberFacade memberFacade;
 
-    // 게시물 게시
     @Transactional
     public void savePost(CreateBoardRequestDto request) {
         Board board = request.toEntity(
@@ -39,34 +39,33 @@ public void savePost(CreateBoardRequestDto request) {
         boardRepository.save(board);
     }
 
-    // 게시물 디테일 보기
     @Transactional(readOnly = true)
     public BoardDetailDto getDetail(Long id) {
         Board board = boardFacade.findBoardById(id);
         return BoardDetailDto.of(board);
     }
 
-    // 게시물 수정
     @Transactional
     public void updatePost(UpdateBoardRequestDto request, Long id) {
         Board board = boardFacade.findBoardById(id);
         board.updatePost(request.getTitle(), request.getContent());
     }
 
-    // 게시물 삭제
     @Transactional
     public void deletePost(Long id) {
         Board board = boardFacade.findBoardById(id);
         board.deletePost();
     }
 
-    // 특정 커뮤니티의 게시물 전체 조회
     @Transactional(readOnly = true)
-    public List<BoardResponseDto> getCommunityPosts(Long communityId) {
+    public BoardListResponseDto getCommunityPosts(Long communityId) {
         Community community = communityFacade.findCommunityById(communityId);
         memberFacade.checkMember(userFacade.getCurrentUser(), community);
-        return boardFacade.findBoardsByCommunityAndStatus(community, BoardStatus.EXISTED)
-                .stream().map(BoardResponseDto::of).collect(Collectors.toList());
+
+        return new BoardListResponseDto(
+                boardFacade.findBoardsByCommunityAndStatus(community, BoardStatus.EXISTED)
+                        .stream().map(BoardResponseDto::of).collect(Collectors.toList())
+        );
     }
 
 }

src/main/java/com/bamdoliro/gati/domain/board/service/BoardService.java

@@ -7,6 +7,7 @@
 import com.bamdoliro.gati.domain.board.facade.ReportFacade;
 import com.bamdoliro.gati.domain.board.presentation.dto.request.CreateReportRequestDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.response.ReportDetailResponseDto;
+import com.bamdoliro.gati.domain.board.presentation.dto.response.ReportListResponseDto;
 import com.bamdoliro.gati.domain.board.presentation.dto.response.ReportResponseDto;
 import com.bamdoliro.gati.domain.user.domain.User;
 import com.bamdoliro.gati.domain.user.facade.UserFacade;
@@ -26,7 +27,6 @@ public class ReportService {
     private final ReportRepository reportRepository;
     private final BoardFacade boardFacade;
 
-    // 게시물 신고하기
     @Transactional
     public void reportPost(Long boardId, CreateReportRequestDto request) {
         Board board = boardFacade.findBoardById(boardId);
@@ -40,17 +40,17 @@ public void reportPost(Long boardId, CreateReportRequestDto request) {
         reportRepository.save(report);
     }
 
-    // 특정 게시물의 신고 리스트 조회
     @Transactional(readOnly = true)
-    public List<ReportResponseDto> getBoardReportList(Long boardId) {
-        return boardFacade.findBoardById(boardId).getReportList().stream()
-                .map(ReportResponseDto::of)
-                .collect(Collectors.toList());
+    public ReportListResponseDto getBoardReportList(Long boardId) {
+        return new ReportListResponseDto(
+                boardFacade.findBoardById(boardId).getReportList().stream()
+                        .map(ReportResponseDto::of)
+                        .collect(Collectors.toList())
+        );
     }
 
-    // 신고 디테일 조회
     @Transactional(readOnly = true)
     public ReportDetailResponseDto getReportDetail(Long reportId) {
-        return ReportDetailResponseDto.of(reportFacade.findReportById(reportId)) ;
+        return ReportDetailResponseDto.of(reportFacade.findReportById(reportId));
     }
 }

src/main/java/com/bamdoliro/gati/domain/board/service/ReportService.java

@@ -11,5 +11,8 @@
 public interface RoomMemberRepository extends CrudRepository<RoomMember, Long> {
 
     Optional<RoomMember> findByRoomAndUser(Room room, User user);
+
     List<RoomMember> findAllByUser(User user);
+
+    int countByRoom(Room room);
 }

src/main/java/com/bamdoliro/gati/domain/chat/domain/repository/RoomMemberRepository.java

@@ -1,6 +1,7 @@
 package com.bamdoliro.gati.domain.chat.presentation;
 
 import com.bamdoliro.gati.domain.chat.presentation.dto.request.MessageRequestDto;
+import com.bamdoliro.gati.domain.chat.presentation.dto.response.MessageListResponseDto;
 import com.bamdoliro.gati.domain.chat.presentation.dto.response.MessageResponseDto;
 import com.bamdoliro.gati.domain.chat.service.MessageService;
 import com.bamdoliro.gati.global.socket.SocketEventProperty;
@@ -28,7 +29,7 @@ public void sendMessage(SocketIOClient client, MessageRequestDto request) {
     }
 
     @GetMapping
-    public List<MessageResponseDto> getLastMessage(@PathVariable Long roomId, Pageable pageable) {
+    public MessageListResponseDto getLastMessage(@PathVariable Long roomId, Pageable pageable) {
         return messageService.getLastMessage(roomId, pageable);
     }
 }

src/main/java/com/bamdoliro/gati/domain/chat/presentation/MessageController.java

@@ -1,5 +1,6 @@
 package com.bamdoliro.gati.domain.chat.presentation;
 
+import com.bamdoliro.gati.domain.chat.presentation.dto.response.RoomListResponseDto;
 import com.bamdoliro.gati.domain.chat.presentation.dto.response.RoomResponseDto;
 import com.bamdoliro.gati.domain.chat.service.RoomService;
 import lombok.RequiredArgsConstructor;
@@ -20,7 +21,7 @@ public void updateRoom(@PathVariable Long roomId, @RequestParam String name) {
     }
 
     @GetMapping
-    public List<RoomResponseDto> getUserRoom() {
+    public RoomListResponseDto getUserRoom() {
         return roomService.getUserRoom();
     }