Feat #202 파트별 게시판 스터디 목록 조회 api 구현

src/main/java/leets/weeth/domain/board/application/dto/PartPostDTO.java

@@ -6,7 +6,7 @@
 
 public record PartPostDTO(
         @NotNull Part part,
-        Category category,
+        @NotNull Category category,
         Integer cardinalNumber,
         Integer week,
         String studyName

src/main/java/leets/weeth/domain/board/application/dto/PostDTO.java

@@ -96,11 +96,17 @@ public record ResponseEducationAll(
             Long id,
             String name,
             List<Part> parts,
-            int week,
+            Position position,
+            Role role,
+            String title,
+            String content,
             LocalDateTime time,
             Integer commentCount,
             boolean hasFile,
             boolean isNew
     ){}
 
+    public record ResponseStudyNames(
+            List<String> studyNames
+    ) {}
 }

src/main/java/leets/weeth/domain/board/application/mapper/PostMapper.java

@@ -51,7 +51,8 @@ public interface PostMapper {
             @Mapping(target = "id",            source = "post.id"),
             @Mapping(target = "name",          source = "post.user.name"),
             @Mapping(target = "parts",         source = "post.parts"),
-            @Mapping(target = "week",          source = "post.week"),
+            @Mapping(target = "position", source = "post.user.position"),
+            @Mapping(target = "role", source = "post.user.role"),
             @Mapping(target = "commentCount",  source = "post.commentCount"),
             @Mapping(target = "time",          source = "post.modifiedAt"),
             @Mapping(target = "hasFile",       expression = "java(fileExists)"),
@@ -68,4 +69,7 @@ public interface PostMapper {
     })
     PostDTO.Response toPostDto(Post post, List<FileResponse> fileUrls, List<CommentDTO.Response> comments);
 
+    default PostDTO.ResponseStudyNames toStudyNames(List<String> studyNames) {
+        return new PostDTO.ResponseStudyNames(studyNames);
+    }
 }

src/main/java/leets/weeth/domain/board/application/usecase/PostUseCaseImpl.java

@@ -12,6 +12,7 @@
 import leets.weeth.domain.board.application.mapper.PostMapper;
 import leets.weeth.domain.board.domain.entity.Post;
 import leets.weeth.domain.board.domain.entity.enums.Category;
+import leets.weeth.domain.board.domain.entity.enums.Part;
 import leets.weeth.domain.board.domain.service.PostDeleteService;
 import leets.weeth.domain.board.domain.service.PostFindService;
 import leets.weeth.domain.board.domain.service.PostSaveService;
@@ -32,16 +33,14 @@
 import leets.weeth.domain.user.domain.service.UserCardinalGetService;
 import leets.weeth.domain.user.domain.service.UserGetService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 @Service
 @RequiredArgsConstructor
 public class PostUseCaseImpl implements PostUsecase {
@@ -135,23 +134,32 @@ public Slice<PostDTO.ResponseEducationAll> findEducationPosts(Long userId, Integ
                     .map(post -> mapper.toEducationAll(post, checkFileExistsByPost(post.getId())));
         }
 
-        int targetCardinal = (cardinalNumber != null)
-                ? cardinalNumber
-                : userCardinalGetService.getCurrentCardinal(user).getCardinalNumber();
+        Pageable pageable = PageRequest.of(pageNumber, pageSize, Sort.by(Sort.Direction.DESC, "id"));
 
-        if (cardinalNumber != null
-                && userCardinalGetService.notContains(user,
-                cardinalGetService.findByUserSide(cardinalNumber))) {
-            Pageable empty = PageRequest.of(pageNumber, pageSize);
-            return new SliceImpl<>(Collections.emptyList(), empty, false);
+        if (cardinalNumber != null) {
+            if (userCardinalGetService.notContains(user, cardinalGetService.findByUserSide(cardinalNumber))) {
+                return new SliceImpl<>(Collections.emptyList(), pageable, false);
+            }
+            Slice<Post> posts = postFindService.findEducationByCardinal(cardinalNumber, pageable);
+            return posts.map(post -> mapper.toEducationAll(post, checkFileExistsByPost(post.getId())));
         }
 
-        Pageable pageable = PageRequest.of(pageNumber, pageSize, Sort.by(Sort.Direction.DESC, "id"));
-        Slice<Post> posts = postFindService.findEducationByCardinal(targetCardinal, pageable);
+        List<Integer> userCardinals = userCardinalGetService.getCardinalNumbers(user);
+        if (userCardinals.isEmpty()) {
+            return new SliceImpl<>(Collections.emptyList(), pageable, false);
+        }
+        Slice<Post> posts = postFindService.findEducationByCardinals(userCardinals, pageable);
 
         return posts.map(post -> mapper.toEducationAll(post, checkFileExistsByPost(post.getId())));
     }
 
+    @Override
+    public PostDTO.ResponseStudyNames findStudyNames(Part part) {
+        List<String> names = postFindService.findByPart(part);
+
+        return mapper.toStudyNames(names);
+    }
+
     @Override
     public Slice<PostDTO.ResponseAll> searchPost(String keyword, int pageNumber, int pageSize){
         validatePageNumber(pageNumber);

src/main/java/leets/weeth/domain/board/application/usecase/PostUsecase.java

@@ -2,6 +2,7 @@
 
 import leets.weeth.domain.board.application.dto.PartPostDTO;
 import leets.weeth.domain.board.application.dto.PostDTO;
+import leets.weeth.domain.board.domain.entity.enums.Part;
 import leets.weeth.domain.user.application.exception.UserNotMatchException;
 import org.springframework.data.domain.Slice;
 
@@ -20,6 +21,8 @@ public interface PostUsecase {
 
     Slice<PostDTO.ResponseEducationAll> findEducationPosts(Long userId, Integer cardinalNumber, int pageNumber, int pageSize);
 
+    PostDTO.ResponseStudyNames findStudyNames(Part part);
+
     void update(Long postId, PostDTO.Update dto, Long userId) throws UserNotMatchException;
 
     void updateEducation(Long postId, PostDTO.UpdateEducation dto, Long userId) throws UserNotMatchException;

src/main/java/leets/weeth/domain/board/domain/repository/PostRepository.java

@@ -1,5 +1,7 @@
 package leets.weeth.domain.board.domain.repository;
 
+import java.util.Collection;
+import java.util.List;
 import leets.weeth.domain.board.domain.entity.Post;
 import leets.weeth.domain.board.domain.entity.enums.Category;
 import leets.weeth.domain.board.domain.entity.enums.Part;
@@ -14,12 +16,19 @@ public interface PostRepository extends JpaRepository<Post, Long> {
 
 	Slice<Post> findPageBy(Pageable page);
 
+	@Query("""
+		SELECT DISTINCT p.studyName
+		FROM Post p
+		WHERE (:part = leets.weeth.domain.board.domain.entity.enums.Part.ALL OR p.part = :part)
+		  AND p.studyName IS NOT NULL
+		ORDER BY p.studyName ASC
+	""")
+	List<String> findDistinctStudyNamesByPart(@Param("part") Part part);
+
 	@Query("""
         SELECT p
           FROM Post p
-         WHERE (
-                p.part = :part
-             OR p.part = leets.weeth.domain.board.domain.entity.enums.Part.ALL
+         WHERE (p.part = :part OR p.part = leets.weeth.domain.board.domain.entity.enums.Part.ALL OR :part = leets.weeth.domain.board.domain.entity.enums.Part.ALL
          )
            AND (:category IS NULL OR p.category = :category)
            AND (:cardinal IS NULL OR p.cardinalNumber = :cardinal)
@@ -29,7 +38,16 @@ public interface PostRepository extends JpaRepository<Post, Long> {
     """)
 	Slice<Post> findByPartAndOptionalFilters(@Param("part") Part part, @Param("category") Category category, @Param("cardinal") Integer cardinal, @Param("studyName") String studyName, @Param("week") Integer week, Pageable pageable);
 
-	Slice<Post> findByCategoryAndCardinalNumber(Category category, Integer  cardinalNumber, Pageable pageable);
+	Slice<Post> findByCategoryAndCardinalNumber(Category category, Integer cardinalNumber, Pageable pageable);
+
+	@Query("""
+		SELECT p
+		  FROM Post p
+		 WHERE p.category = :category
+		   AND p.cardinalNumber IN :cardinals
+	  ORDER BY p.id DESC
+	""")
+	Slice<Post> findByCategoryAndCardinalIn(@Param("category") Category category, @Param("cardinals") Collection<Integer> cardinals, Pageable pageable);
 
 	Slice<Post> findByCategory(Category category, Pageable pageable);
 

src/main/java/leets/weeth/domain/board/domain/service/PostFindService.java

@@ -1,5 +1,7 @@
 package leets.weeth.domain.board.domain.service;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import leets.weeth.domain.board.application.exception.PostNotFoundException;
 import leets.weeth.domain.board.domain.entity.Post;
@@ -10,6 +12,7 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +31,10 @@ public List<Post> find(){
         return postRepository.findAll();
     }
 
+    public List<String> findByPart(Part part) {
+        return postRepository.findDistinctStudyNamesByPart(part);
+    }
+
     public Slice<Post> findRecentPosts(Pageable pageable) {
         return postRepository.findPageBy(pageable);
     }
@@ -39,6 +46,13 @@ public Slice<Post> findByPartAndOptionalFilters(Part part, Category category, In
         );
     }
 
+    public Slice<Post> findEducationByCardinals(Collection<Integer> cardinals, Pageable pageable) {
+        if (cardinals == null || cardinals.isEmpty()) {
+            return new SliceImpl<>(Collections.emptyList(), pageable, false);
+        }
+        return postRepository.findByCategoryAndCardinalIn(Category.Education, cardinals, pageable);
+    }
+
     public Slice<Post> findEducationByCardinal(int cardinalNumber, Pageable pageable) {
 
         return postRepository.findByCategoryAndCardinalNumber(

src/main/java/leets/weeth/domain/board/presentation/PostController.java

@@ -15,6 +15,7 @@
 import leets.weeth.domain.board.application.dto.PartPostDTO;
 import leets.weeth.domain.board.application.dto.PostDTO;
 import leets.weeth.domain.board.application.usecase.PostUsecase;
+import leets.weeth.domain.board.domain.entity.enums.Part;
 import leets.weeth.domain.user.application.exception.UserNotMatchException;
 import leets.weeth.global.auth.annotation.CurrentUser;
 import leets.weeth.global.common.response.CommonResponse;
@@ -75,6 +76,13 @@ public CommonResponse<PostDTO.Response> findPost(@PathVariable Long boardId) {
         return CommonResponse.createSuccess(POST_FIND_BY_ID_SUCCESS.getMessage(),postUsecase.findPost(boardId));
     }
 
+    @GetMapping("/part/studies")
+    @Operation(summary="파트별 스터디 이름 목록 조회")
+    public CommonResponse<PostDTO.ResponseStudyNames> findStudyNames(@RequestParam Part part) {
+
+        return CommonResponse.createSuccess(ResponseMessage.POST_STUDY_NAMES_FIND_SUCCESS.getMessage(), postUsecase.findStudyNames(part));
+    }
+
     @GetMapping("/search")
     @Operation(summary="게시글 검색 [무한스크롤]")
     public CommonResponse<Slice<PostDTO.ResponseAll>> findPost(@RequestParam String keyword, @RequestParam("pageNumber") int pageNumber,

src/main/java/leets/weeth/domain/board/presentation/ResponseMessage.java

@@ -20,6 +20,7 @@ public enum ResponseMessage {
     POST_PART_FIND_ALL_SUCCESS("파트별 게시글 목록이 성공적으로 조회되었습니다."),
     POST_EDU_FIND_SUCCESS("교육 게시글 목록이 성공적으로 조회되었습니다."),
     POST_FIND_BY_ID_SUCCESS("게시글이 성공적으로 조회되었습니다."),
+    POST_STUDY_NAMES_FIND_SUCCESS("스터디 이름 목록이 성공적으로 조회되었습니다."),
 
     EDUCATION_UPDATED_SUCCESS("교육자료가 성공적으로 수정되었습니다.");
 

src/main/java/leets/weeth/domain/user/domain/repository/UserCardinalRepository.java

@@ -1,11 +1,11 @@
 package leets.weeth.domain.user.domain.repository;
 
+import java.util.List;
 import leets.weeth.domain.user.domain.entity.User;
 import leets.weeth.domain.user.domain.entity.UserCardinal;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
+import org.springframework.data.repository.query.Param;
 
 public interface UserCardinalRepository extends JpaRepository<UserCardinal, Long> {
 
@@ -15,4 +15,12 @@ public interface UserCardinalRepository extends JpaRepository<UserCardinal, Long
     List<UserCardinal> findAllByUsers(List<User> users);
 
 	List<UserCardinal> findAllByOrderByUser_NameAsc();
+
+    @Query("""
+        select uc.cardinal.cardinalNumber
+          from UserCardinal uc
+         where uc.user = :user
+      order by uc.cardinal.cardinalNumber desc
+    """)
+    List<Integer> findCardinalNumbersByUser(@Param("user") User user);
 }

src/main/java/leets/weeth/domain/user/domain/service/CardinalGetService.java

@@ -43,11 +43,6 @@ public List<Cardinal> findInProgress() {
         return cardinalRepository.findAllByStatus(CardinalStatus.IN_PROGRESS);
     }
 
-    public Cardinal findLatestInProgress() {
-        return cardinalRepository
-                .findFirstByStatusOrderByCardinalNumberDesc(CardinalStatus.IN_PROGRESS);
-    }
-
     public void validateCardinal(Integer cardinal) {
         if (cardinalRepository.findByCardinalNumber(cardinal).isPresent()) {
             throw new DuplicateCardinalException();

src/main/java/leets/weeth/domain/user/domain/service/UserCardinalGetService.java

@@ -1,5 +1,7 @@
 package leets.weeth.domain.user.domain.service;
 
+import java.util.Comparator;
+import java.util.List;
 import leets.weeth.domain.user.application.exception.CardinalNotFoundException;
 import leets.weeth.domain.user.domain.entity.Cardinal;
 import leets.weeth.domain.user.domain.entity.User;
@@ -8,9 +10,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Comparator;
-import java.util.List;
-
 @Service
 @RequiredArgsConstructor
 public class UserCardinalGetService {
@@ -50,4 +49,8 @@ public Cardinal getCurrentCardinal(User user) {
                 .max(Comparator.comparing(Cardinal::getCardinalNumber))
                 .orElseThrow(CardinalNotFoundException::new);
     }
+
+    public List<Integer> getCardinalNumbers(User user) {
+        return userCardinalRepository.findCardinalNumbersByUser(user);
+    }
 }