Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import com.sillim.recordit.feed.repository.FeedRepository;
import com.sillim.recordit.global.exception.ErrorCode;
import com.sillim.recordit.global.exception.common.RecordNotFoundException;
import com.sillim.recordit.member.service.MemberQueryService;
import com.sillim.recordit.pushalarm.dto.PushMessage;
import com.sillim.recordit.pushalarm.service.AlarmService;
import jakarta.persistence.OptimisticLockException;
import lombok.RequiredArgsConstructor;
import org.hibernate.StaleObjectStateException;
Expand All @@ -22,6 +25,8 @@ public class FeedLikeService {

private final FeedLikeRepository feedLikeRepository;
private final FeedRepository feedRepository;
private final AlarmService alarmService;
private final MemberQueryService memberQueryService;

@Retryable(
retryFor = {
Expand All @@ -38,6 +43,16 @@ public void feedLike(Long feedId, Long memberId) {
.orElseThrow(() -> new RecordNotFoundException(ErrorCode.FEED_NOT_FOUND));
feed.like();
feedLikeRepository.save(new FeedLike(feed, memberId));

if (!feed.isOwner(memberId)) {
alarmService.pushAlarm(
memberId,
feed.getMemberId(),
PushMessage.fromFeedLike(
feed.getId(),
memberQueryService.findByMemberId(memberId).getPersonalId(),
feed.getTitle()));
}
}

@Retryable(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ public enum AlarmType {
SCHEDULE,
INVITE,
FOLLOWING,
FEED_LIKE,
}
10 changes: 10 additions & 0 deletions src/main/java/com/sillim/recordit/pushalarm/dto/PushMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,14 @@ public static PushMessage fromAlarmLog(AlarmLog alarmLog) {
alarmLog.getTitle(),
alarmLog.getBody());
}

public static PushMessage fromFeedLike(
Long feedLikeId, String likerPersonalId, String feedTitle) {
return new PushMessage(
null,
AlarmType.FEED_LIKE,
feedLikeId,
likerPersonalId + "님이 " + feedTitle + " 피드에 좋아요를 눌렀습니다.",
"");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.sillim.recordit.member.domain.Member;
import com.sillim.recordit.member.fixture.MemberFixture;
import com.sillim.recordit.member.service.MemberQueryService;
import com.sillim.recordit.pushalarm.service.AlarmService;
import java.util.Optional;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand All @@ -28,6 +29,7 @@ class FeedLikeServiceTest {
@Mock FeedLikeRepository feedLikeRepository;
@Mock FeedRepository feedRepository;
@Mock MemberQueryService memberQueryService;
@Mock AlarmService alarmService;
@InjectMocks FeedLikeService feedLikeService;

@Test
Expand All @@ -37,7 +39,9 @@ void feedLike() {
long memberId = 1L;
Member member = MemberFixture.DEFAULT.getMember();
Feed feed = spy(FeedFixture.DEFAULT.getFeed(memberId));
FeedLike feedLike = mock(FeedLike.class);
given(feedRepository.findById(eq(feedId))).willReturn(Optional.of(feed));
given(feedLikeRepository.save(any())).willReturn(feedLike);

feedLikeService.feedLike(feedId, memberId);

Expand Down
Loading