Skip to content
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

Jump to bottom

feat: 메세지 좋아요시 동시성 이슈를 해결한다. #632

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

feat: 메세지 좋아요시 동시성 이슈를 해결한다. #632

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ac3b31
feat: 메세지 좋아요시 낙관적 락을 적용한다.
asebn1 Oct 27, 2022
1686bae
refactor: MessageRepo final 추가
asebn1 Oct 27, 2022
60abfd0
refactor: message의 version을 flyway에 추가한다.
asebn1 Oct 28, 2022
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: 4 additions & 0 deletions backend/src/main/java/com/woowacourse/naepyeon/domain/message/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.data.annotation.Version;

@Entity
@Getter
Expand Down Expand Up @@ -58,6 +59,9 @@ public class Message extends BaseEntity {
@Column(name = "likes", nullable = false)
private Long likes;

@Version
private Integer version;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

ALTER TABLE message
    ADD version bigint default 0;

해당 컬럼에 flyway 스크립트를 추가해야 할 것 같아요 bigint라면 Long으로 아니면 해당 스크립트를 integer로 바꾸셔도 상관없습니다.


Copy link
Collaborator

@kth990303 kth990303 Oct 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

그리고 아래와 같이 uniqueConstraints로 걸면 락 없이도 가능할 것 같기도..?

@Table(name = "message_like", indexes = {
        @Index(name = "message_like_member_id_message_id_index", columnList = "member_id, message_id")
}, uniqueConstraints = {
        @UniqueConstraint(
                name = "message_like_duplicate",
                columnNames = {"member_id", "message_id"}
        )
})

public Message(final String content, final String color, final Member author, final Rollingpaper rollingpaper,
final boolean anonymous, final boolean secret, final Long likes) {
validateContentLength(content);
Expand Down
8 changes: 8 additions & 0 deletions ...nd/src/main/java/com/woowacourse/naepyeon/repository/message/MessageRepositoryCustom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,20 @@
import com.woowacourse.naepyeon.domain.message.Message;
import com.woowacourse.naepyeon.service.dto.WrittenMessageResponseDto;
import java.util.List;
import java.util.Optional;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Lock;

import javax.persistence.LockModeType;

public interface MessageRepositoryCustom {

List<Message> findAllByRollingpaperId(final Long rollingpaperId);

Page<WrittenMessageResponseDto> findAllByAuthorId(final Long authorId, final Pageable pageRequest);

@Lock(LockModeType.OPTIMISTIC)
Optional<Message> findByIdForUpdate(final Long id);
}
24 changes: 17 additions & 7 deletions backend/src/main/java/com/woowacourse/naepyeon/repository/message/MessageRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package com.woowacourse.naepyeon.repository.message;

import static com.woowacourse.naepyeon.domain.QTeam.team;
import static com.woowacourse.naepyeon.domain.QTeamParticipation.teamParticipation;
import static com.woowacourse.naepyeon.domain.message.QMessage.message;
import static com.woowacourse.naepyeon.domain.rollingpaper.QRollingpaper.rollingpaper;

import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.ConstructorExpression;
import com.querydsl.core.types.Projections;
Expand All @@ -15,13 +10,20 @@
import com.woowacourse.naepyeon.domain.message.Message;
import com.woowacourse.naepyeon.domain.rollingpaper.Recipient;
import com.woowacourse.naepyeon.service.dto.WrittenMessageResponseDto;
import java.util.List;
import java.util.function.Supplier;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.support.PageableExecutionUtils;

import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;

import static com.woowacourse.naepyeon.domain.QTeam.team;
import static com.woowacourse.naepyeon.domain.QTeamParticipation.teamParticipation;
import static com.woowacourse.naepyeon.domain.message.QMessage.message;
import static com.woowacourse.naepyeon.domain.rollingpaper.QRollingpaper.rollingpaper;

@RequiredArgsConstructor
public class MessageRepositoryImpl implements MessageRepositoryCustom {

Expand Down Expand Up @@ -58,6 +60,14 @@ public Page<WrittenMessageResponseDto> findAllByAuthorId(final Long authorId, fi
return PageableExecutionUtils.getPage(content, pageRequest, countQuery::fetchOne);
}

@Override
public Optional<Message> findByIdForUpdate(final Long id) {
return Optional.ofNullable(queryFactory
.selectFrom(message)
.where(message.id.eq(id))
.fetchOne());
}

private ConstructorExpression<WrittenMessageResponseDto> makeProjections() {
return Projections.constructor(WrittenMessageResponseDto.class,
message.id,
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/java/com/woowacourse/naepyeon/service/MessageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ private void validateAuthor(final Long memberId, final Message message) {
}

public MessageLikeResponseDto likeMessage(Long memberId, Long rollingpaperId, Long messageId) {
final Message message = messageRepository.findById(messageId)
final Message message = messageRepository.findByIdForUpdate(messageId)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

낙관적 락을 이용해서 version에 따라 커밋 또는 롤백하게 해주셨군요 👍

.orElseThrow(() -> new NotFoundMessageException(messageId));
if (messageLikeRepository.existsByMemberIdAndMessageId(memberId, messageId)) {
throw new InvalidLikeMessageException(messageId, messageId);
Expand Down