Merge branch 'feature/EA3-156-review-joinedStudy-implement' of https://github.com/prgrms-web-devcourse-final-project/WEB5_6_NeogulCoder_BE into feature/EA3-138-recruitment-post-implement

Author: Tokwasp

src/main/java/grep/neogul_coder/domain/review/controller/ReviewController.java

@@ -31,7 +31,8 @@ public ApiResponse<ReviewTargetUsersInfo> getReviewTargetUsersInfo(@PathVariable
 
     @GetMapping("/studies/me")
     public ApiResponse<JoinedStudiesInfo> getJoinedStudiesInfo(@AuthenticationPrincipal Principal userDetails) {
-        return ApiResponse.success(new JoinedStudiesInfo());
+        JoinedStudiesInfo response = reviewService.getJoinedStudiesInfo(userDetails.getUserId());
+        return ApiResponse.success(response);
     }
 
     @PostMapping

src/main/java/grep/neogul_coder/domain/review/controller/dto/response/JoinedStudiesInfo.java

@@ -1,18 +1,29 @@
 package grep.neogul_coder.domain.review.controller.dto.response;
 
+import grep.neogul_coder.domain.study.Study;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.ToString;
 
 import java.util.List;
 
+@ToString
 @Getter
 public class JoinedStudiesInfo {
 
     @Schema(example = "[ { studyId: 2, studyName: 자바 스터디, imageUrl: www.s3.com } ]")
-    private List<StudyInfo> studiesInfo;
+    private List<StudyInfo> studies;
 
-    public JoinedStudiesInfo() {
+    public JoinedStudiesInfo(List<StudyInfo> studies) {
+        this.studies = studies;
+    }
+
+    public static JoinedStudiesInfo of(List<Study> studies) {
+        List<StudyInfo> studiesInfo = studies.stream()
+                .map(study -> new StudyInfo(study.getId(), study.getName(), study.getImageUrl()))
+                .toList();
+
+        return new JoinedStudiesInfo(studiesInfo);
     }
 
     @ToString

src/main/java/grep/neogul_coder/domain/review/service/ReviewService.java

@@ -1,6 +1,7 @@
 package grep.neogul_coder.domain.review.service;
 
 import grep.neogul_coder.domain.review.*;
+import grep.neogul_coder.domain.review.controller.dto.response.JoinedStudiesInfo;
 import grep.neogul_coder.domain.review.controller.dto.response.MyReviewTagsInfo;
 import grep.neogul_coder.domain.review.controller.dto.response.ReviewContentsPagingInfo;
 import grep.neogul_coder.domain.review.controller.dto.response.ReviewTargetUsersInfo;
@@ -14,6 +15,7 @@
 import grep.neogul_coder.domain.review.repository.ReviewTagRepository;
 import grep.neogul_coder.domain.study.Study;
 import grep.neogul_coder.domain.study.StudyMember;
+import grep.neogul_coder.domain.study.repository.StudyMemberQueryRepository;
 import grep.neogul_coder.domain.study.repository.StudyMemberRepository;
 import grep.neogul_coder.domain.study.repository.StudyRepository;
 import grep.neogul_coder.domain.users.entity.User;
@@ -41,6 +43,7 @@ public class ReviewService {
     private final UserRepository userRepository;
     private final StudyRepository studyRepository;
     private final StudyMemberRepository studyMemberRepository;
+    private final StudyMemberQueryRepository studyMemberQueryRepository;
 
     private final ReviewTagFinder reviewTagFinder;
     private final ReviewRepository reviewRepository;
@@ -56,6 +59,11 @@ public ReviewTargetUsersInfo getReviewTargetUsersInfo(long studyId, String myNic
         return ReviewTargetUsersInfo.of(targetUsers);
     }
 
+    public JoinedStudiesInfo getJoinedStudiesInfo(long userId) {
+        List<StudyMember> studyMembers = studyMemberQueryRepository.findAllFetchStudyByUserId(userId);
+        return JoinedStudiesInfo.of(convertToStudiesFrom(studyMembers));
+    }
+
     @Transactional
     public long save(ReviewSaveServiceRequest request, long writeUserId) {
         if(isAlreadyWrittenReviewBy(request.getStudyId(), request.getTargetUserId(), writeUserId)){
@@ -114,6 +122,12 @@ private List<User> findReviewTargetUsers(List<StudyMember> studyMembers, String
                 .toList();
     }
 
+    private List<Study> convertToStudiesFrom(List<StudyMember> studyMembers) {
+        return studyMembers.stream()
+                .map(StudyMember::getStudy)
+                .toList();
+    }
+
     private boolean isAlreadyWrittenReviewBy(long studyId, long targetUserId, long writeUserId) {
         return reviewQueryRepository.findBy(studyId, targetUserId, writeUserId) != null;
     }

src/main/java/grep/neogul_coder/global/init/ReviewTagInitializer.java

@@ -27,7 +27,8 @@ public class ReviewTagInitializer {
     @EventListener(ApplicationReadyEvent.class)
     @Transactional
     public void initReviewTags() {
-        if (reviewTagRepository.count() == 5) {
+        long count = reviewTagRepository.count();
+        if (count == 0 || count == 5) {
             List<ReviewTagEntity> reviewTagEntities = Stream.of(
                             GoodReviewTag.values(),
                             BadReviewTag.values(),

src/test/java/grep/neogul_coder/domain/review/controller/service/ReviewServiceTest.java

@@ -3,6 +3,7 @@
 import grep.neogul_coder.domain.IntegrationTestSupport;
 import grep.neogul_coder.domain.review.Review;
 import grep.neogul_coder.domain.review.ReviewType;
+import grep.neogul_coder.domain.review.controller.dto.response.JoinedStudiesInfo;
 import grep.neogul_coder.domain.review.controller.dto.response.MyReviewTagsInfo;
 import grep.neogul_coder.domain.review.controller.dto.response.ReviewContentsPagingInfo;
 import grep.neogul_coder.domain.review.controller.dto.response.ReviewTargetUsersInfo;
@@ -86,7 +87,30 @@ void getReviewTargetUsersInfo() {
                 .containsExactlyInAnyOrder("테스터2", "테스터3");
     }
 
-    //TODO REVIEW_TAG_INITIALIZER 수정 필요
+    @DisplayName("내가 참여한 스터디 정보들을 조회 합니다.")
+    @Test
+    void getJoinedStudiesInfo() {
+        //given
+        User user = createUser("테스터");
+        userRepository.save(user);
+
+        Study study1 = createStudy("운영체제 스터디", Category.IT);
+        Study study2 = createStudy("클라이밍 동아리", Category.HOBBY);
+        studyRepository.saveAll(List.of(study1, study2));
+
+        StudyMember studyMember1 = createStudyMember(study1, user.getId());
+        StudyMember studyMember2 = createStudyMember(study2, user.getId());
+        studyMemberRepository.saveAll(List.of(studyMember1, studyMember2));
+
+        //when
+        JoinedStudiesInfo response = reviewService.getJoinedStudiesInfo(user.getId());
+
+        //then
+        assertThat(response.getStudies())
+                .extracting("studyName")
+                .containsExactlyInAnyOrder("운영체제 스터디", "클라이밍 동아리");
+    }
+
     @DisplayName("리뷰 입력을 받아 리뷰를 저장 합니다.")
     @Test
     void save() {