[FEAT] 작품평가 수정 API 구현

src/main/java/org/websoso/WSSServer/controller/UserNovelController.java

@@ -1,6 +1,7 @@
 package org.websoso.WSSServer.controller;
 
 import static org.springframework.http.HttpStatus.CREATED;
+import static org.springframework.http.HttpStatus.NO_CONTENT;
 import static org.springframework.http.HttpStatus.OK;
 
 import jakarta.validation.Valid;
@@ -10,13 +11,15 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.websoso.WSSServer.domain.Novel;
 import org.websoso.WSSServer.domain.User;
 import org.websoso.WSSServer.dto.userNovel.UserNovelCreateRequest;
 import org.websoso.WSSServer.dto.userNovel.UserNovelGetResponse;
+import org.websoso.WSSServer.dto.userNovel.UserNovelUpdateRequest;
 import org.websoso.WSSServer.service.NovelService;
 import org.websoso.WSSServer.service.UserNovelService;
 import org.websoso.WSSServer.service.UserService;
@@ -31,23 +34,36 @@ public class UserNovelController {
  private final UserNovelService userNovelService;
 
  @GetMapping("/{novelId}")
- public ResponseEntity<UserNovelGetResponse> getUserNovel(Principal principal, @PathVariable Long novelId) {
+ public ResponseEntity<UserNovelGetResponse> getEvaluation(Principal principal, @PathVariable Long novelId) {
  User user = userService.getUserOrException(Long.valueOf(principal.getName()));
  Novel novel = novelService.getNovelOrException(novelId);
  return ResponseEntity
  .status(OK)
- .body(userNovelService.getUserNovelInfo(user, novel));
+ .body(userNovelService.getEvaluation(user, novel));
  }
 
  @PostMapping
- public ResponseEntity<Void> createUserNovel(Principal principal,
- @Valid @RequestBody UserNovelCreateRequest request) {
+ public ResponseEntity<Void> createEvaluation(Principal principal,
+  @Valid @RequestBody UserNovelCreateRequest request) {
  User user = userService.getUserOrException(Long.valueOf(principal.getName()));
- userNovelService.createUserNovel(user, request);
+ userNovelService.createEvaluation(user, request);
 
  return ResponseEntity
  .status(CREATED)
  .build();
  }
 
+ @PutMapping("/{novelId}")
+ public ResponseEntity<Void> updateEvaluation(Principal principal, @PathVariable Long novelId,
+ @Valid @RequestBody UserNovelUpdateRequest request) {
+
+ User user = userService.getUserOrException(Long.valueOf(principal.getName()));
+ Novel novel = novelService.getNovelOrException(novelId);
+ userNovelService.updateEvaluation(user, novel, request);
+
+ return ResponseEntity
+ .status(NO_CONTENT)
+ .build();
+ }
+
 }

src/main/java/org/websoso/WSSServer/domain/UserNovel.java

@@ -73,4 +73,11 @@ public void setIsInterest(Boolean isInterest) {
  this.isInterest = isInterest;
  }
 
+ public void updateUserNovel(Float userNovelRating, ReadStatus status, LocalDate startDate, LocalDate endDate) {
+ this.userNovelRating = userNovelRating;
+ this.status = status;
+ this.startDate = startDate;
+ this.endDate = endDate;
+ }
+
 }

src/main/java/org/websoso/WSSServer/dto/userNovel/UserNovelUpdateRequest.java

@@ -0,0 +1,30 @@
+package org.websoso.WSSServer.dto.userNovel;
+
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import java.util.List;
+import org.hibernate.annotations.ColumnDefault;
+import org.websoso.WSSServer.domain.common.ReadStatus;
+import org.websoso.WSSServer.validation.UserNovelRatingConstraint;
+
+public record UserNovelUpdateRequest(
+ @UserNovelRatingConstraint
+ @ColumnDefault("0.0")
+ Float userNovelRating,
+ @NotNull(message = "읽기 상태는 null일 수 없습니다.")
+ ReadStatus status,
+ @Pattern(regexp = "\\d{4}-\\d{2}-\\d{2}", message = "시작 날짜는 yyyy-MM-dd 형식이어야 합니다.")
+ String startDate,
+ @Pattern(regexp = "\\d{4}-\\d{2}-\\d{2}", message = "종료 날짜는 yyyy-MM-dd 형식이어야 합니다.")
+ String endDate,
+ @JsonSetter(nulls = Nulls.AS_EMPTY)
+ @Size(max = 3, message = "매력 포인트는 최대 3개까지 가능합니다.")
+ List<String> attractivePoints,
+ @JsonSetter(nulls = Nulls.AS_EMPTY)
+ @Size(max = 10, message = "키워드는 최대 10개까지 가능합니다.")
+ List<Integer> keywordIds
+) {
+}

src/main/java/org/websoso/WSSServer/exception/error/CustomUserNovelError.java

@@ -14,7 +14,8 @@ public enum CustomUserNovelError implements ICustomError {
 
  USER_NOVEL_NOT_FOUND("USER_NOVEL-001", "해당 작품이 유저의 서재에 등록되어 있지 않습니다.", NOT_FOUND),
  USER_NOVEL_ALREADY_EXISTS("USER_NOVEL-002", "이미 서재에 등록된 작품입니다.", CONFLICT),
- ALREADY_INTERESTED("USER_NOVEL-003", "이미 해당 작품이 관심 작품으로 등록되어 있습니다.", CONFLICT);
+ ALREADY_INTERESTED("USER_NOVEL-003", "이미 해당 작품이 관심 작품으로 등록되어 있습니다.", CONFLICT),
+ NOT_EVALUATED("USER_NOVEL-005", "평가하지 않은 작품입니다.", CONFLICT);
 
  private final String code;
  private final String description;

src/main/java/org/websoso/WSSServer/repository/NovelKeywordRepository.java

@@ -1,8 +1,13 @@
 package org.websoso.WSSServer.repository;
 
 import java.util.List;
+import java.util.Set;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+import org.websoso.WSSServer.domain.Keyword;
 import org.websoso.WSSServer.domain.Novel;
 import org.websoso.WSSServer.domain.NovelKeyword;
 
@@ -13,4 +18,9 @@ public interface NovelKeywordRepository extends JpaRepository<NovelKeyword, Long
 
  List<NovelKeyword> findAllByNovel(Novel novel);
 
+ @Modifying
+ @Transactional
+ @Query("DELETE FROM NovelKeyword nk WHERE nk.keyword IN :keywords AND nk.novel = :novel AND nk.userId = :userId")
+ void deleteByKeywordsAndNovelAAndUserId(Set<Keyword> keywords, Novel novel, Long userId);
+
 }

src/main/java/org/websoso/WSSServer/repository/UserNovelAttractivePointRepository.java

@@ -1,8 +1,13 @@
 package org.websoso.WSSServer.repository;
 
 import java.util.List;
+import java.util.Set;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+import org.websoso.WSSServer.domain.AttractivePoint;
 import org.websoso.WSSServer.domain.Novel;
 import org.websoso.WSSServer.domain.UserNovel;
 import org.websoso.WSSServer.domain.UserNovelAttractivePoint;
@@ -13,4 +18,10 @@ public interface UserNovelAttractivePointRepository extends JpaRepository<UserNo
  List<UserNovelAttractivePoint> findAllByUserNovel(UserNovel userNovel);
 
  Integer countByUserNovel_NovelAndAttractivePoint_AttractivePointName(Novel novel, String attractivePoint);
+
+ @Modifying
+ @Transactional
+ @Query("DELETE FROM UserNovelAttractivePoint un WHERE un.userNovel = :userNovel AND un.attractivePoint IN :attractivePoints")
+ void deleteByAttractivePointsAndUserNovel(Set<AttractivePoint> attractivePoints, UserNovel userNovel);
+
 }

src/main/java/org/websoso/WSSServer/service/UserNovelService.java

@@ -1,13 +1,16 @@
 package org.websoso.WSSServer.service;
 
 import static org.websoso.WSSServer.exception.error.CustomNovelError.NOVEL_NOT_FOUND;
+import static org.websoso.WSSServer.exception.error.CustomUserNovelError.NOT_EVALUATED;
 import static org.websoso.WSSServer.exception.error.CustomUserNovelError.USER_NOVEL_ALREADY_EXISTS;
 import static org.websoso.WSSServer.exception.error.CustomUserNovelError.USER_NOVEL_NOT_FOUND;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,6 +24,7 @@
 import org.websoso.WSSServer.dto.keyword.KeywordGetResponse;
 import org.websoso.WSSServer.dto.userNovel.UserNovelCreateRequest;
 import org.websoso.WSSServer.dto.userNovel.UserNovelGetResponse;
+import org.websoso.WSSServer.dto.userNovel.UserNovelUpdateRequest;
 import org.websoso.WSSServer.exception.exception.CustomNovelException;
 import org.websoso.WSSServer.exception.exception.CustomUserNovelException;
 import org.websoso.WSSServer.repository.NovelKeywordRepository;
@@ -48,7 +52,7 @@ public UserNovel getUserNovelOrNull(User user, Novel novel) {
  return userNovelRepository.findByNovelAndUser(novel, user).orElse(null);
  }
 
- public void createUserNovel(User user, UserNovelCreateRequest request) {
+ 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"));
@@ -65,16 +69,89 @@ public void createUserNovel(User user, UserNovelCreateRequest request) {
  user,
  novel));
 
- for (String stringAttractivePoint : request.attractivePoints()) {
+ createUserNovelAttractivePoints(userNovel, request.attractivePoints());
+ createNovelKeywords(novel, user.getUserId(), request.keywordIds());
+
+ }
+
+ public void updateEvaluation(User user, Novel novel, UserNovelUpdateRequest request) {
+
+ UserNovel userNovel = getUserNovelOrNull(user, novel);
+
+ if (userNovel == null) {
+ throw new CustomUserNovelException(USER_NOVEL_NOT_FOUND,
+ "user novel with the given user and novel is not found");
+ }
+
+ if (userNovel.getStatus() == null) {
+ throw new CustomUserNovelException(NOT_EVALUATED, "this novel has not been evaluated by the user");
+ }
+
+ updateUserNovel(userNovel, request);
+ updateUserNovelAttractivePoints(userNovel, request.attractivePoints());
+ updateNovelKeywords(novel, user.getUserId(), request.keywordIds());
+
+ }
+
+ private void updateUserNovel(UserNovel userNovel, UserNovelUpdateRequest request) {
+ LocalDate startDate = request.startDate() == null ? null : convertToLocalDate(request.startDate());
+ LocalDate endDate = request.endDate() == null ? null : convertToLocalDate(request.endDate());
+
+ userNovel.updateUserNovel(request.userNovelRating(), request.status(), startDate, endDate);
+ }
+
+ private void updateUserNovelAttractivePoints(UserNovel userNovel, List<String> request) {
+
+ Set<AttractivePoint> previousAttractivePoints = userNovelAttractivePointRepository.findAllByUserNovel(userNovel)
+ .stream()
+ .map(UserNovelAttractivePoint::getAttractivePoint)
+ .collect(Collectors.toSet());
+
+ for (String stringAttractivePoint : request) {
  AttractivePoint attractivePoint = attractivePointService.getAttractivePointByString(stringAttractivePoint);
- userNovelAttractivePointRepository.save(UserNovelAttractivePoint.create(userNovel, attractivePoint));
+ if (previousAttractivePoints.contains(attractivePoint)) {
+ previousAttractivePoints.remove(attractivePoint);
+ } else {
+ userNovelAttractivePointRepository.save(UserNovelAttractivePoint.create(userNovel, attractivePoint));
+ }
  }
 
- for (Integer keywordId : request.keywordIds()) {
+ userNovelAttractivePointRepository.deleteByAttractivePointsAndUserNovel(previousAttractivePoints, userNovel);
+
+ }
+
+ private void updateNovelKeywords(Novel novel, Long userId, List<Integer> request) {
+
+ Set<Keyword> previousKeywords = novelKeywordRepository.findAllByNovelAndUserId(novel, userId)
+ .stream()
+ .map(NovelKeyword::getKeyword)
+ .collect(Collectors.toSet());
+
+ for (Integer keywordId : request) {
  Keyword keyword = keywordService.getKeywordOrException(keywordId);
- novelKeywordRepository.save(NovelKeyword.create(novel, keyword, user.getUserId()));
+ if (previousKeywords.contains(keyword)) {
+ previousKeywords.remove(keyword);
+ } else {
+ novelKeywordRepository.save(NovelKeyword.create(novel, keyword, userId));
+ }
+ }
+
+ novelKeywordRepository.deleteByKeywordsAndNovelAAndUserId(previousKeywords, novel, userId);
+
+ }
+
+ private void createUserNovelAttractivePoints(UserNovel userNovel, List<String> request) {
+ for (String stringAttractivePoint : request) {
+ AttractivePoint attractivePoint = attractivePointService.getAttractivePointByString(stringAttractivePoint);
+ userNovelAttractivePointRepository.save(UserNovelAttractivePoint.create(userNovel, attractivePoint));
  }
+ }
 
+ private void createNovelKeywords(Novel novel, Long userId, List<Integer> request) {
+ for (Integer keywordId : request) {
+ Keyword keyword = keywordService.getKeywordOrException(keywordId);
+ novelKeywordRepository.save(NovelKeyword.create(novel, keyword, userId));
+ }
  }
 
  public UserNovel createUserNovelByInterest(User user, Novel novel) {
@@ -91,7 +168,7 @@ private LocalDate convertToLocalDate(String string) {
  }
 
  @Transactional(readOnly = true)
- public UserNovelGetResponse getUserNovelInfo(User user, Novel novel) {
+ public UserNovelGetResponse getEvaluation(User user, Novel novel) {
 
  UserNovel userNovel = getUserNovelOrNull(user, novel);
  if (userNovel == null) {