From c4d5625b7d97135bfe89809e8d293163e3f9d60d Mon Sep 17 00:00:00 2001 From: Minseok Jang Date: Thu, 10 Oct 2024 12:06:58 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"Feat:=20#BBB-145=20=EB=82=B4=EA=B0=80?= =?UTF-8?q?=20=EB=A7=8C=EB=93=A0=20=EC=8A=A4=ED=84=B0=EB=94=94=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20API"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/controller/StudyController.java | 11 ---- .../external/study/service/StudyService.java | 5 +- .../external/study/StudyIntegrationTest.java | 65 ------------------- .../study/repository/StudyRepository.java | 9 --- 4 files changed, 1 insertion(+), 89 deletions(-) diff --git a/app/external-api/src/main/java/com/bombombom/devs/external/study/controller/StudyController.java b/app/external-api/src/main/java/com/bombombom/devs/external/study/controller/StudyController.java index c3941f1f..dc997300 100644 --- a/app/external-api/src/main/java/com/bombombom/devs/external/study/controller/StudyController.java +++ b/app/external-api/src/main/java/com/bombombom/devs/external/study/controller/StudyController.java @@ -253,15 +253,4 @@ public ResponseEntity> createAssignments( return ResponseEntity.created(location).body(assignmentResults); } - - @GetMapping("/my") - public ResponseEntity> myStudies( - @LoginUser AppUserDetails userDetails - ) { - - return ResponseEntity.ok(studyService.getMyStudies(userDetails.getId()).stream().map( - StudyResponse::fromResult - ).toList()); - } - } diff --git a/app/external-api/src/main/java/com/bombombom/devs/external/study/service/StudyService.java b/app/external-api/src/main/java/com/bombombom/devs/external/study/service/StudyService.java index 001e56d2..47725a60 100644 --- a/app/external-api/src/main/java/com/bombombom/devs/external/study/service/StudyService.java +++ b/app/external-api/src/main/java/com/bombombom/devs/external/study/service/StudyService.java @@ -141,8 +141,5 @@ public void startVoting(Long userId, Long studyId) { studyRepository.save(study); } - public List getMyStudies(Long userId) { - List studies = studyRepository.findAllByLeader(userId); - return studies.stream().map(StudyResult::fromEntity).toList(); - } + } diff --git a/app/external-api/src/test/java/com/bombombom/devs/external/study/StudyIntegrationTest.java b/app/external-api/src/test/java/com/bombombom/devs/external/study/StudyIntegrationTest.java index 51e3da56..8613c3fc 100644 --- a/app/external-api/src/test/java/com/bombombom/devs/external/study/StudyIntegrationTest.java +++ b/app/external-api/src/test/java/com/bombombom/devs/external/study/StudyIntegrationTest.java @@ -3,7 +3,6 @@ import static com.bombombom.devs.study.model.Study.MAX_DIFFICULTY_LEVEL; import static com.bombombom.devs.study.model.Study.MIN_DIFFICULTY_LEVEL; -import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; @@ -199,70 +198,6 @@ public void init() { bookRepository.save(testBook); } - - @Test - @DisplayName("자신이 개설한 스터디 목록을 조회할 수 있다.") - @WithUserDetails(value = "testuser", - setupBefore = TestExecutionEvent.TEST_EXECUTION) - void can_get_my_studies() throws Exception { - /* - * Given - */ - LocalDate roundStartDate = LocalDate.of(2024, 7, 22); - Study study = BookStudy.builder() - .name("스터디") - .introduce("안녕하세요") - .headCount(1) - .capacity(5) - .penalty(10000) - .reliabilityLimit(0) - .startDate(roundStartDate) - .weeks(2) - .leader(testuser) - .book(testBook) - .votingProcess(VotingProcess.READY) - .state(StudyStatus.RUNNING) - .duplicated(false) - .build(); - studyRepository.save(study); - - Study study2 = BookStudy.builder() - .name("스터디") - .introduce("안녕하세요") - .headCount(1) - .capacity(5) - .penalty(10000) - .reliabilityLimit(0) - .startDate(roundStartDate) - .weeks(2) - .leader(testuser) - .book(testBook) - .votingProcess(VotingProcess.READY) - .state(StudyStatus.RUNNING) - .duplicated(false) - .build(); - studyRepository.save(study2); - /* - * When - */ - ResultActions resultActions = mockMvc.perform( - get("/api/v1/studies/my") - ); - - /* - * Then - */ - - resultActions.andDo(print()) - .andExpect(status().isOk()) - .andExpect( - jsonPath("$.length()") - .value(equalTo(2))) - .andExpect( - jsonPath("$[*].id", - containsInAnyOrder(study.getId().intValue(), study2.getId().intValue()))); - } - @Nested @DisplayName("투표 통합 테스트") class VoteTest { diff --git a/domain/src/main/java/com/bombombom/devs/study/repository/StudyRepository.java b/domain/src/main/java/com/bombombom/devs/study/repository/StudyRepository.java index b1359767..bec806cf 100644 --- a/domain/src/main/java/com/bombombom/devs/study/repository/StudyRepository.java +++ b/domain/src/main/java/com/bombombom/devs/study/repository/StudyRepository.java @@ -2,7 +2,6 @@ import com.bombombom.devs.study.model.Study; import jakarta.persistence.LockModeType; -import java.util.List; import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -12,14 +11,6 @@ public interface StudyRepository extends JpaRepository { - - @Query(value = "SELECT s FROM Study s " - + "LEFT JOIN FETCH s.leader " - + "LEFT JOIN FETCH TREAT(s as AlgorithmStudy).difficulties " - + "LEFT JOIN FETCH TREAT(s as BookStudy).book " - + "WHERE s.leader.id = :id") - List findAllByLeader(Long id); - @Query("select s from Study s " + "join fetch s.leader " + "where s.id = :id")