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
5 changes: 5 additions & 0 deletions src/main/java/org/websoso/WSSServer/domain/UserNovel.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -27,6 +29,9 @@
@Getter
@DynamicInsert
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(name = "user_novel", uniqueConstraints = {
@UniqueConstraint(columnNames = {"user_id", "novel_id"})
})
public class UserNovel extends BaseEntity {

@Id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Set;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -137,7 +138,11 @@ public void registerAsInterest(User user, Long novelId) {
}

if (userNovel == null) {
userNovel = userNovelService.createUserNovelByInterest(user, novel);
try {
userNovel = userNovelService.createUserNovelByInterest(user, novel);
} catch (DataIntegrityViolationException e) {
userNovel = userNovelService.getUserNovelOrException(user, novelId);
}
}

userNovel.setIsInterest(true);
Expand Down
25 changes: 13 additions & 12 deletions src/main/java/org/websoso/WSSServer/service/UserNovelService.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.util.Set;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.websoso.WSSServer.domain.AttractivePoint;
Expand Down Expand Up @@ -89,20 +90,20 @@ public void createEvaluation(User user, UserNovelCreateRequest request) {
Novel novel = novelRepository.findById(request.novelId())
.orElseThrow(() -> new CustomNovelException(NOVEL_NOT_FOUND, "novel with the given id is not found"));

if (getUserNovelOrNull(user, novel) != null) {
try {
UserNovel userNovel = userNovelRepository.save(UserNovel.create(
request.status(),
request.userNovelRating(),
request.startDate(),
request.endDate(),
user,
novel));

createUserNovelAttractivePoints(userNovel, request.attractivePoints());
createNovelKeywords(userNovel, request.keywordIds());
} catch (DataIntegrityViolationException e) {
throw new CustomUserNovelException(USER_NOVEL_ALREADY_EXISTS, "this novel is already registered");
}

UserNovel userNovel = userNovelRepository.save(UserNovel.create(
request.status(),
request.userNovelRating(),
request.startDate(),
request.endDate(),
user,
novel));

createUserNovelAttractivePoints(userNovel, request.attractivePoints());
createNovelKeywords(userNovel, request.keywordIds());
}

public void updateEvaluation(User user, Long novelId, UserNovelUpdateRequest request) {
Expand Down
Loading