Add edit button for comments

Author: keleborn

src/main/java/com/yandex/blog/controllers/PostController.java

@@ -86,4 +86,12 @@ public ResponseEntity<Void> addComment(@RequestParam("postId") long postId,
         postService.saveComment(new Comment(null, postId, content));
         return ResponseEntity.ok().build();
     }
+
+    @PostMapping("/comments/edit")
+    @ResponseBody
+    public ResponseEntity<Void> editComment(@RequestParam("id") long id,
+                                            @RequestParam("content") String content) {
+        postService.updateComment(id, content);
+        return ResponseEntity.ok().build();
+    }
 }

src/main/java/com/yandex/blog/services/PostService.java

@@ -82,6 +82,10 @@ public void saveComment(Comment comment) {
         commentRepository.saveComment(comment);
     }
 
+    public void updateComment(Long commentId, String content) {
+        commentRepository.updateComment(new Comment(commentId, null, content));
+    }
+
     public void deleteById(Long id) {
         postRepository.deleteById(id);
         tagRepository.deleteTagsForPost(id);

src/main/resources/templates/post.html

@@ -22,15 +22,17 @@ <h1 th:text="${post.title}">Title</h1>
     </div>
     <div>
         <h3>Комментарии</h3>
-        <ul id="comment-list" th:each="comment : ${post.comments}">
-            <li th:text="${comment.content}"></li>
+        <ul id="comment-list">
+            <li th:each="comment : ${post.comments}" th:attr="data-id=${comment.id}">
+                <span class="comment-content" th:text="${comment.content}"></span>
+                <button class="edit-btn" type="button">Редактировать</button>
+            </li>
         </ul>
         <form id="comment-form">
             <input type="hidden" name="postId" th:value="${post.id}">
             <input type="text" name="content" placeholder="Комментарий" required>
             <button type="submit">Добавить комментарий</button>
         </form>
-        <script src="/MyPersonalBlog/js/createComment.js"></script>
     </div>
     <form th:action="@{/post/edit/{id}(id=${post.id})}" method="get">
         <button type="submit" class="btn btn-warning">Редактировать пост</button>
@@ -39,5 +41,7 @@ <h3>Комментарии</h3>
         <button type="submit" class="btn btn-danger">Удалить пост</button>
     </form>
     <a href="/MyPersonalBlog/feed">Назад к ленте</a>
+    <script src="/MyPersonalBlog/js/createComment.js"></script>
+    <script src="/MyPersonalBlog/js/editComment.js"></script>
 </body>
 </html>

src/main/webapp/js/editComment.js

@@ -0,0 +1,36 @@
+document.querySelectorAll('.edit-btn').forEach(button => {
+   button.addEventListener('click', function () {
+       const li = button.closest('li');
+       const span = li.querySelector('.comment-content');
+       const oldText = span.textContent;
+       const textArea = document.createElement('textarea');
+       textArea.value = oldText;
+       textArea.className = 'comment-edit';
+
+       span.replaceWith(textArea);
+       textArea.focus();
+
+       textArea.addEventListener('keydown', async function (e) {
+           if (e.ctrlKey && e.key === 'Enter') {
+               const newText = textArea.value;
+               const commentId = li.getAttribute('data-id');
+
+               const response = await fetch('/MyPersonalBlog/post/comments/edit', {
+                   method: 'POST',
+                   headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+                   body: `id=${commentId}&content=${encodeURIComponent(newText)}`
+               });
+
+               if (response.ok) {
+                   const updatedSpan = document.createElement('span');
+                   updatedSpan.className = 'comment-content';
+                   updatedSpan.textContent = newText;
+
+                   textArea.replaceWith(updatedSpan);
+               } else {
+                   alert('Непредвиденная ошибка при сохранении коммента');
+               }
+           }
+       });
+   });
+});

src/test/java/com/yandex/blog/test/unit/PostServiceUnitTest.java

@@ -1,6 +1,7 @@
 package com.yandex.blog.test.unit;
 
 
+import com.yandex.blog.model.Comment;
 import com.yandex.blog.model.Post;
 import com.yandex.blog.repository.CommentRepository;
 import com.yandex.blog.repository.PostRepository;
@@ -17,6 +18,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -42,7 +45,7 @@ void setUp() {
     }
 
     @Test
-    void findById_shouldReturnPostWhenExists() {
+    void findById_shouldCallPostRepositoryFindByIdAndTagRepositoryFindAllTags() {
         Post post = new Post(1L, "title1", "desc1", "content1", 0, null);
 
         when(postRepository.findById(1L)).thenReturn(post);
@@ -58,7 +61,7 @@ void findById_shouldReturnPostWhenExists() {
     }
 
     @Test
-    void findById_shouldReturnNullWhenPostDoesNotExist() {
+    void findById_shouldCallRepositoryFindById() {
         when(postRepository.findById(1L)).thenReturn(null);
 
         postService.findById(1L);
@@ -67,7 +70,7 @@ void findById_shouldReturnNullWhenPostDoesNotExist() {
     }
 
     @Test
-    void save_shouldSavePost() {
+    void save_shouldCallSave() {
         MultipartFile file = mock(MultipartFile.class);
         when(file.isEmpty()).thenReturn(true);
         Post post = new Post(1L, "title1", "desc1", "content1", 0, null);
@@ -77,7 +80,7 @@ void save_shouldSavePost() {
     }
 
     @Test
-    void deleteById_shouldDeletePost() {
+    void deleteById_shouldCallPostAndTagRepositoriesDelete() {
         postService.deleteById(1L);
         verify(postRepository, times(1)).deleteById(1L);
         verify(tagRepository, times(1)).deleteTagsForPost(1L);
@@ -94,7 +97,7 @@ void splitToParagraphs_shouldSplitIntoParagraphs() {
     }
 
     @Test
-    void update_shouldUpdatePost() {
+    void update_shouldCallRepositoryUpdate() {
         Post post = new Post(1L, "title1", "desc1", "content1", 0, null);
 
         when(postRepository.findById(1L)).thenReturn(post);
@@ -124,4 +127,22 @@ void saveTags_shouldDeleteCurrentTagsAndCreateTagsIfNotExistsAndAttachNewTags()
         verify(tagRepository, times(1)).findTagIdsByNames(tags);
         verify(tagRepository, times(1)).attachTags(1L, List.of(1L));
     }
+
+    @Test
+    void saveComments_shouldCallRepositorySave() {
+        Comment comment = new Comment(1L, 1L, "comment1");
+
+        postService.saveComment(comment);
+
+        verify(commentRepository).saveComment(comment);
+    }
+
+    @Test
+    void updateComment_shouldCallRepositoryUpdateComment() {
+        String updatedContent = "updatedContent";
+
+        postService.updateComment(1L, updatedContent);
+
+        verify(commentRepository).updateComment(any(Comment.class));
+    }
 }