Merge pull request #98 from Seasoning-Today/fix/cancle-article-like-e…

…rror fix: 기록장 좋아요 취소 오류 해결
Seasoning-Today · Mar 21, 2024 · d818022 · d818022
2 parents a79b891 + b747ae3
commit d818022
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/main/java/today/seasoning/seasoning/article/service/ArticleLikeService.java b/src/main/java/today/seasoning/seasoning/article/service/ArticleLikeService.java
@@ -37,19 +37,17 @@ public void doLike(Long userId, Long articleId) {
 			articleLikeRepository.save(new ArticleLike(article, user));
 
 			if (user != author) {
-				applicationEventPublisher.publishEvent(new ArticleLikedEvent(user.getId(), author.getId(), articleId));
+				ArticleLikedEvent articleLikedEvent = new ArticleLikedEvent(user.getId(), author.getId(), articleId);
+				applicationEventPublisher.publishEvent(articleLikedEvent);
 			}
 		}
 	}
 
 	public void cancelLike(Long userId, Long articleId) {
 		Article article = articleRepository.findByIdOrElseThrow(articleId);
-
 		validatePermission(userId, article);
-
-		if(articleLikeRepository.findByArticleAndUser(articleId, userId).isPresent()) {
-			articleLikeRepository.deleteById(articleId);
-		}
+		articleLikeRepository.findByArticleAndUser(articleId, userId)
+			.ifPresent(articleLike -> articleLikeRepository.deleteById(articleLike.getId()));
 	}
 
 	private void validatePermission(Long userId, Article article) {