[Fix] 코드리뷰

pre-Q · Sep 16, 2023 · d4ec15f · d4ec15f
1 parent 2b74277
commit d4ec15f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/main/java/kr/co/preq/domain/application/service/ApplicationService.java b/src/main/java/kr/co/preq/domain/application/service/ApplicationService.java
@@ -58,28 +58,35 @@ public List<ApplicationListGetResponseDto> getApplicationList() {
 
     @Transactional
     public void updateApplicationTitle(Long applicationId, ApplicationTitleUpdateRequestDto requestDto) {
-        Application application = getApplication(applicationId);
+        Member member = authService.findMember();
+        Long memberId = member.getId();
+        Application application = getApplication(applicationId, memberId);
 
         application.updateTitle(requestDto.getTitle());
     }
 
     @Transactional
     public void updateApplicationMemo(Long applicationId, ApplicationMemoUpdateRequestDto requestDto) {
-        Application application = getApplication(applicationId);
+        Member member = authService.findMember();
+        Long memberId = member.getId();
+        Application application = getApplication(applicationId, memberId);
 
         application.updateMemo(requestDto.getMemo());
     }
 
     @Transactional(readOnly = true)
     public ApplicationGetResponseDto getDetailApplication(Long applicationId) {
-        Application application = getApplication(applicationId);
+        Member member = authService.findMember();
+        Long memberId = member.getId();
+
+        Application application = getApplication(applicationId, memberId);
 
         List<ApplicationChildResponseDto> applicationChild = applicationChildRepository.findByApplicationId(applicationId).stream()
                 .map(aChild -> ApplicationChildResponseDto.of(aChild.getId(), aChild.getQuestion(), aChild.getAnswer()))
                 .collect(Collectors.toList());
 
         StringBuilder allAnswer = new StringBuilder();
-        for (ApplicationChild answer : applicationChildRepository.findByApplicationId(applicationId)) {
+        for (ApplicationChild answer : applicationChildRepository.findApplicationChildByApplicationIdAndMemberIdOrderByCreatedAt(applicationId, memberId)) {
             allAnswer.append(answer.getAnswer());
         }
 
@@ -106,10 +113,7 @@ public ApplicationGetResponseDto getDetailApplication(Long applicationId) {
                 .build();
     }
 
-    private Application getApplication(Long applicationId) {
-        Member member = authService.findMember();
-        Long memberId = member.getId();
-
+    private Application getApplication(Long applicationId, Long memberId) {
         return applicationRepository.findByIdAndMemberId(applicationId, memberId)
                 .orElseThrow(() -> new BadRequestException(ErrorCode.BAD_PARAMETER));
     }

diff --git a/src/main/java/kr/co/preq/domain/applicationChild/repository/ApplicationChildRepository.java b/src/main/java/kr/co/preq/domain/applicationChild/repository/ApplicationChildRepository.java
@@ -9,10 +9,8 @@
 
 public interface ApplicationChildRepository extends JpaRepository<ApplicationChild, Long> {
     Optional<ApplicationChild> findApplicationChildByIdAndApplicationIdAndMemberId(Long id, Long applicationId, Long memberId);
-<<<<<<< HEAD
-    List<ApplicationChild> findApplicationChildByApplicationIdAndMemberId(Long applicationId, Long memberId);
+
     List<ApplicationChild> findByApplicationId(Long applicationId);
-=======
+
     List<ApplicationChild> findApplicationChildByApplicationIdAndMemberIdOrderByCreatedAt(Long applicationId, Long memberId);
->>>>>>> c4cdfb697c03969737ab9f28a2adcbc5f7e46b3e
 }