Skip to content

FIX: Корректное обновление updatedOn для Comment при редактировании #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
impatient0 merged 3 commits into from
Jun 1, 2025
Merged

FIX: Корректное обновление updatedOn для Comment при редактировании #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
075b57e
fix comment update timestamp in server response
Peppe-Ronin May 31, 2025
d61b07e
might as well
Peppe-Ronin May 31, 2025
57f7be7
update tests to interact with correct repository method
Peppe-Ronin May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions main-service/src/main/java/ru/practicum/explorewithme/main/service/CommentServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public CommentDto updateUserComment(Long userId, Long commentId, UpdateCommentDt
throw new EntityNotFoundException("Искомый комментарий с id " + commentId + " пользователя с id " + userId + "не найден");
}

if (existedComment.isDeleted() == true) {
if (existedComment.isDeleted()) {
throw new BusinessRuleViolationException("Редактирование невозможно. Комментарий удален");
}

Expand All @@ -122,6 +122,6 @@ public CommentDto updateUserComment(Long userId, Long commentId, UpdateCommentDt
existedComment.setText(updateCommentDto.getText());
existedComment.setEdited(true);

return commentMapper.toDto(commentRepository.save(existedComment));
return commentMapper.toDto(commentRepository.saveAndFlush(existedComment));
}
}
4 changes: 2 additions & 2 deletions ...service/src/test/java/ru/practicum/explorewithme/main/service/CommentServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ void updateUserComment_shouldUpdateCommentAndReturnDto() {

when(commentRepository.findById(commentId)).thenReturn(Optional.of(comment));
when(commentMapper.toDto(any(Comment.class))).thenReturn(expectedDto);
when(commentRepository.save(any(Comment.class))).thenAnswer(invocation -> invocation.getArgument(0));
when(commentRepository.saveAndFlush(any(Comment.class))).thenAnswer(invocation -> invocation.getArgument(0));

CommentDto result = commentService.updateUserComment(userId, commentId, updateCommentDto);

Assertions.assertEquals("Updated text", result.getText());
Assertions.assertTrue(comment.isEdited());
verify(commentRepository).save(comment);
verify(commentRepository).saveAndFlush(comment);
}

@Test
Expand Down