From b0b7de19d0e25d40e855f3a97434c70f6fc58878 Mon Sep 17 00:00:00 2001 From: nuyh Date: Wed, 12 Jul 2023 16:22:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?style:=20Quiz=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EB=B0=8D=20=EC=A0=81=ED=95=A9=ED=95=98=EA=B2=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/wooteco/prolog/roadmap/ui/EssayAnswerController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/wooteco/prolog/roadmap/ui/EssayAnswerController.java b/backend/src/main/java/wooteco/prolog/roadmap/ui/EssayAnswerController.java index 5261095e5..f3ed468b5 100644 --- a/backend/src/main/java/wooteco/prolog/roadmap/ui/EssayAnswerController.java +++ b/backend/src/main/java/wooteco/prolog/roadmap/ui/EssayAnswerController.java @@ -52,7 +52,7 @@ public ResponseEntity updateById(@PathVariable Long essayAnswerId, essayAnswerService.updateEssayAnswer(essayAnswerId, request.getAnswer(), member.getId()); return ResponseEntity.ok().build(); } - + @DeleteMapping("/essay-answers/{essayAnswerId}") public ResponseEntity deleteEssayAnswerById(@PathVariable Long essayAnswerId, @AuthMemberPrincipal LoginMember member) { @@ -61,7 +61,7 @@ public ResponseEntity deleteEssayAnswerById(@PathVariable Long essayAnswer } @GetMapping("/quizzes/{quizId}") - public ResponseEntity findEssayAnswerById(@PathVariable Long quizId) { + public ResponseEntity findQuizById(@PathVariable Long quizId) { return ResponseEntity.ok(quizService.findById(quizId)); } From 52c9afc9331150dbd80c8333c6053e3ae7d142d9 Mon Sep 17 00:00:00 2001 From: nuyh Date: Wed, 12 Jul 2023 16:31:05 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20service=EB=A1=9C=20dto=EB=A5=BC?= =?UTF-8?q?=20=EB=84=98=EA=B8=B0=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prolog/roadmap/application/EssayAnswerService.java | 8 ++++---- .../wooteco/prolog/roadmap/ui/EssayAnswerController.java | 2 +- .../roadmap/application/EssayAnswerServiceTest.java | 8 +++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java b/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java index dd53c30b8..f7430eb40 100644 --- a/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java +++ b/backend/src/main/java/wooteco/prolog/roadmap/application/EssayAnswerService.java @@ -1,6 +1,5 @@ package wooteco.prolog.roadmap.application; -import java.util.List; import org.hibernate.Hibernate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -8,12 +7,13 @@ import wooteco.prolog.member.application.MemberService; import wooteco.prolog.member.domain.Member; import wooteco.prolog.roadmap.application.dto.EssayAnswerRequest; +import wooteco.prolog.roadmap.application.dto.EssayAnswerUpdateRequest; import wooteco.prolog.roadmap.domain.EssayAnswer; import wooteco.prolog.roadmap.domain.Quiz; import wooteco.prolog.roadmap.domain.repository.EssayAnswerRepository; import wooteco.prolog.roadmap.domain.repository.QuizRepository; -import javax.persistence.PersistenceContext; +import java.util.List; @Transactional @Service @@ -46,11 +46,11 @@ public Long createEssayAnswer(EssayAnswerRequest essayAnswerRequest, Long member } @Transactional - public void updateEssayAnswer(Long answerId, String answer, Long memberId) { + public void updateEssayAnswer(Long answerId, EssayAnswerUpdateRequest request, Long memberId) { EssayAnswer essayAnswer = getById(answerId); Member member = memberService.findById(memberId); - essayAnswer.update(answer, member); + essayAnswer.update(request.getAnswer(), member); essayAnswerRepository.save(essayAnswer); } diff --git a/backend/src/main/java/wooteco/prolog/roadmap/ui/EssayAnswerController.java b/backend/src/main/java/wooteco/prolog/roadmap/ui/EssayAnswerController.java index f3ed468b5..bce13ff0f 100644 --- a/backend/src/main/java/wooteco/prolog/roadmap/ui/EssayAnswerController.java +++ b/backend/src/main/java/wooteco/prolog/roadmap/ui/EssayAnswerController.java @@ -49,7 +49,7 @@ public ResponseEntity findById(@PathVariable Long essayAnsw public ResponseEntity updateById(@PathVariable Long essayAnswerId, @AuthMemberPrincipal LoginMember member, @RequestBody EssayAnswerUpdateRequest request) { - essayAnswerService.updateEssayAnswer(essayAnswerId, request.getAnswer(), member.getId()); + essayAnswerService.updateEssayAnswer(essayAnswerId, request, member.getId()); return ResponseEntity.ok().build(); } diff --git a/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java b/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java index 146bfade3..5943af59f 100644 --- a/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java +++ b/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java @@ -10,6 +10,7 @@ import wooteco.prolog.member.domain.Member; import wooteco.prolog.member.exception.MemberNotFoundException; import wooteco.prolog.roadmap.application.dto.EssayAnswerRequest; +import wooteco.prolog.roadmap.application.dto.EssayAnswerUpdateRequest; import wooteco.prolog.roadmap.domain.EssayAnswer; import wooteco.prolog.roadmap.domain.Quiz; import wooteco.prolog.roadmap.domain.repository.EssayAnswerRepository; @@ -22,10 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.anyLong; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) class EssayAnswerServiceTest { @@ -77,7 +75,7 @@ void updateEssayAnswer() { .thenReturn(new Member(null, null, null, 1L, null)); //when - essayAnswerService.updateEssayAnswer(1L, "answer", 1L); + essayAnswerService.updateEssayAnswer(1L, new EssayAnswerUpdateRequest("answer"), 1L); //then verify(essayAnswerRepository, times(1)).save(any());