add check if exist replies for parentCommentId (#6513)

add check if exist replies for parentCommentId
ita-social-projects · Oct 5, 2023 · 1de4ae4 · 1de4ae4
1 parent df4297d
commit 1de4ae4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/service/src/main/java/greencity/service/EcoNewsCommentServiceImpl.java b/service/src/main/java/greencity/service/EcoNewsCommentServiceImpl.java
@@ -325,6 +325,9 @@ public PageableDto<EcoNewsCommentDto> findAllActiveReplies(Pageable pageable, Lo
         Page<EcoNewsComment> pages = ecoNewsCommentRepo
             .findAllByParentCommentIdAndStatusNotOrderByCreatedDateDesc(pageable, parentCommentId,
                 CommentStatus.DELETED);
+        if (pages.isEmpty()) {
+            throw new NotFoundException(ErrorMessage.COMMENT_NOT_FOUND_BY_PARENT_COMMENT_ID);
+        }
         UserVO user = userVO == null ? UserVO.builder().build() : userVO;
         List<EcoNewsCommentDto> ecoNewsCommentDtos = pages
             .stream()

diff --git a/service/src/test/java/greencity/service/EcoNewsCommentServiceImplTest.java b/service/src/test/java/greencity/service/EcoNewsCommentServiceImplTest.java
@@ -524,4 +524,23 @@ void findAllActiveReplies() {
         PageableDto<EcoNewsCommentDto> actual = ecoNewsCommentService.findAllActiveReplies(pageRequest, 1L, userVO);
         assertEquals(pageableDto, actual);
     }
+
+    @Test
+    void findAllActiveRepliesThrowException() {
+        UserVO userVO = ModelUtils.getUserVO();
+        List<EcoNewsComment> ecoNewsComments1 = List.of();
+        PageRequest pageRequest = PageRequest.of(0, 2);
+        Page<EcoNewsComment> page1 = new PageImpl<>(ecoNewsComments1, pageRequest, ecoNewsComments1.size());
+
+        when(ecoNewsCommentRepo
+            .findAllByParentCommentIdAndStatusNotOrderByCreatedDateDesc(pageRequest, 11111L,
+                CommentStatus.DELETED))
+                    .thenReturn(page1);
+
+        assertThrows(NotFoundException.class,
+            () -> ecoNewsCommentService.findAllActiveReplies(pageRequest, 11111L, userVO));
+
+        verify(ecoNewsCommentRepo).findAllByParentCommentIdAndStatusNotOrderByCreatedDateDesc(pageRequest,
+            11111L, CommentStatus.DELETED);
+    }
 }