Skip to content
Open
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 @@ -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 Long version;

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
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);
}
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
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE message
ADD version bigint default 0;