[BE] refactor: 도메인을 활용한 하이라이트 추가 및 수정 로직 리팩토링

backend/src/main/java/reviewme/highlight/controller/HighlightController.java

@@ -22,7 +22,7 @@ public ResponseEntity<Void> highlight(
             @Valid @RequestBody HighlightsRequest request,
             @ReviewGroupSession ReviewGroup reviewGroup
     ) {
-        highlightService.highlight(request, reviewGroup);
+        highlightService.editHighlight(request, reviewGroup);
         return ResponseEntity.ok().build();
     }
 }

backend/src/main/java/reviewme/highlight/domain/Highlight.java

@@ -26,11 +26,15 @@ public class Highlight {
     @Column(name = "answer_id", nullable = false)
     private long answerId;
 
+    @Column(name = "line_index", nullable = false)
+    private int lineIndex;
+
     @Embedded
-    private HighlightPosition highlightPosition;
+    private HighlightRange highlightRange;
 
-    public Highlight(long answerId, int lineIndex, int startIndex, int endIndex) {
+    public Highlight(long answerId, int lineIndex, HighlightRange range) {
         this.answerId = answerId;
-        this.highlightPosition = new HighlightPosition(lineIndex, startIndex, endIndex);
+        this.lineIndex = lineIndex;
+        this.highlightRange = range;
     }
 }

backend/src/main/java/reviewme/highlight/domain/HighlightPosition.java → backend/src/main/java/reviewme/highlight/domain/HighlightRange.java

@@ -6,41 +6,36 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import reviewme.highlight.domain.exception.HighlightStartIndexExceedEndIndexException;
-import reviewme.highlight.domain.exception.NegativeHighlightIndexException;
+import reviewme.highlight.domain.exception.InvalidHighlightIndexRangeException;
 
 @Embeddable
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 @EqualsAndHashCode
-public class HighlightPosition {
-
-    @Column(name = "line_index", nullable = false)
-    private int lineIndex;
+public class HighlightRange {
 
     @Column(name = "start_index", nullable = false)
     private int startIndex;
 
     @Column(name = "end_index", nullable = false)
     private int endIndex;
 
-    public HighlightPosition(int lineIndex, int startIndex, int endIndex) {
+    public HighlightRange(int startIndex, int endIndex) {
         validateNonNegativeIndexNumber(startIndex, endIndex);
         validateEndIndexOverStartIndex(startIndex, endIndex);
-        this.lineIndex = lineIndex;
         this.startIndex = startIndex;
         this.endIndex = endIndex;
     }
 
-    private void validateNonNegativeIndexNumber(long startIndex, long endIndex) {
+    private void validateNonNegativeIndexNumber(int startIndex, int endIndex) {
         if (startIndex < 0 || endIndex < 0) {
-            throw new NegativeHighlightIndexException(startIndex, endIndex);
+            throw new InvalidHighlightIndexRangeException(startIndex, endIndex);
         }
     }
 
-    private void validateEndIndexOverStartIndex(long startIndex, long endIndex) {
+    private void validateEndIndexOverStartIndex(int startIndex, int endIndex) {
         if (startIndex > endIndex) {
-            throw new HighlightStartIndexExceedEndIndexException(startIndex, endIndex);
+            throw new InvalidHighlightIndexRangeException(startIndex, endIndex);
         }
     }
 }

backend/src/main/java/reviewme/highlight/domain/HighlightedLine.java

@@ -0,0 +1,32 @@
+package reviewme.highlight.domain;
+
+import java.util.HashSet;
+import java.util.Set;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import reviewme.highlight.domain.exception.HighlightIndexExceedLineLengthException;
+
+@Getter
+@EqualsAndHashCode
+public class HighlightedLine {
+
+    private final String content;
+    private final Set<HighlightRange> ranges;
+
+    public HighlightedLine(String content) {
+        this.content = content;
+        this.ranges = new HashSet<>();
+    }
+
+    public void addRange(int startIndex, int endIndex) {
+        validateRangeByContentLength(startIndex, endIndex);
+        ranges.add(new HighlightRange(startIndex, endIndex));
+    }
+
+    private void validateRangeByContentLength(int startIndex, int endIndex) {
+        int contentLength = content.length();
+        if (startIndex >= contentLength || endIndex >= contentLength) {
+            throw new HighlightIndexExceedLineLengthException(content.length(), startIndex, endIndex);
+        }
+    }
+}

backend/src/main/java/reviewme/highlight/domain/HighlightedLines.java

@@ -0,0 +1,40 @@
+package reviewme.highlight.domain;
+
+import java.util.Arrays;
+import java.util.List;
+import lombok.Getter;
+import reviewme.highlight.domain.exception.InvalidHighlightLineIndexException;
+import reviewme.highlight.domain.exception.NegativeHighlightLineIndexException;
+
+@Getter
+public class HighlightedLines {
+
+    public static final String LINE_SEPARATOR = "\n";
+
+    private final List<HighlightedLine> lines;
+
+    public HighlightedLines(String content) {
+        this.lines = Arrays.stream(content.split(LINE_SEPARATOR))
+                .map(HighlightedLine::new)
+                .toList();
+    }
+
+    public void addRange(int lineIndex, int startIndex, int endIndex) {
+        validateNonNegativeLineIndexNumber(lineIndex);
+        validateLineIndexRange(lineIndex);
+        HighlightedLine line = lines.get(lineIndex);
+        line.addRange(startIndex, endIndex);
+    }
+
+    private void validateNonNegativeLineIndexNumber(int lineIndex) {
+        if (lineIndex < 0) {
+            throw new NegativeHighlightLineIndexException(lineIndex);
+        }
+    }
+
+    private void validateLineIndexRange(int lineIndex) {
+        if (lineIndex >= lines.size()) {
+            throw new InvalidHighlightLineIndexException(lineIndex, lines.size());
+        }
+    }
+}

backend/src/main/java/reviewme/highlight/domain/exception/HighlightIndexExceedLineLengthException.java

@@ -0,0 +1,14 @@
+package reviewme.highlight.domain.exception;
+
+import lombok.extern.slf4j.Slf4j;
+import reviewme.global.exception.BadRequestException;
+
+@Slf4j
+public class HighlightIndexExceedLineLengthException extends BadRequestException {
+
+    public HighlightIndexExceedLineLengthException(int lineLength, int startIndex, int endIndex) {
+        super("하이라이트 위치가 텍스트의 범위를 벗어났어요.");
+        log.info("Highlight index exceed line length - lineLength: {}, startIndex: {}, endIndex: {}",
+                lineLength, startIndex, endIndex);
+    }
+}

backend/src/main/java/reviewme/highlight/domain/exception/HighlightStartIndexExceedEndIndexException.java

@@ -6,7 +6,7 @@
 @Slf4j
 public class HighlightStartIndexExceedEndIndexException extends BadRequestException {
 
-    public HighlightStartIndexExceedEndIndexException(long startIndex, long endIndex) {
+    public HighlightStartIndexExceedEndIndexException(int startIndex, int endIndex) {
         super("하이라이트 끝 위치는 시작 위치보다 같거나 커야 해요.");
         log.info("Highlight start index exceed end index - startIndex: {}, endIndex: {}", startIndex, endIndex);
     }

backend/src/main/java/reviewme/highlight/domain/exception/InvalidHighlightIndexRangeException.java

@@ -0,0 +1,13 @@
+package reviewme.highlight.domain.exception;
+
+import lombok.extern.slf4j.Slf4j;
+import reviewme.global.exception.BadRequestException;
+
+@Slf4j
+public class InvalidHighlightIndexRangeException extends BadRequestException {
+
+    public InvalidHighlightIndexRangeException(int startIndex, int endIndex) {
+        super("유효하지 않은 하이라이트 위치에요. 하이라이트 시작 위치: %d, 종료 위치: %d".formatted(startIndex, endIndex));
+        log.info("Highlight index is a negative number - startIndex: {}, endIndex: {}", startIndex, endIndex);
+    }
+}

backend/src/main/java/reviewme/highlight/service/exception/InvalidHighlightLineIndexException.java → backend/src/main/java/reviewme/highlight/domain/exception/InvalidHighlightLineIndexException.java

@@ -1,13 +1,13 @@
-package reviewme.highlight.service.exception;
+package reviewme.highlight.domain.exception;
 
 import lombok.extern.slf4j.Slf4j;
 import reviewme.global.exception.BadRequestException;
 
 @Slf4j
 public class InvalidHighlightLineIndexException extends BadRequestException {
 
-    public InvalidHighlightLineIndexException(long submittedLineIndex, long providedMaxLineIndex) {
-        super("줄 번호는 %d 이하여야해요.".formatted(providedMaxLineIndex));
+    public InvalidHighlightLineIndexException(int submittedLineIndex, int providedMaxLineIndex) {
+        super("하이라이트 위치가 답변의 라인을 벗어났어요.");
         log.info("Line index is out of bound - maxIndex: {}, submittedLineIndex: {}", providedMaxLineIndex,
                 submittedLineIndex);
     }

backend/src/main/java/reviewme/highlight/domain/exception/NegativeHighlightLineIndexException.java

@@ -0,0 +1,13 @@
+package reviewme.highlight.domain.exception;
+
+import lombok.extern.slf4j.Slf4j;
+import reviewme.global.exception.BadRequestException;
+
+@Slf4j
+public class NegativeHighlightLineIndexException extends BadRequestException {
+
+    public NegativeHighlightLineIndexException(int lineIndex) {
+        super("하이라이트 할 라인의 위치는 0 이상의 수이어야 해요.");
+        log.info("Highlight index is a negative number - lineIndex: {}", lineIndex);
+    }
+}

backend/src/main/java/reviewme/highlight/repository/HighlightRepository.java

@@ -1,7 +1,17 @@
 package reviewme.highlight.repository;
 
+import java.util.Collection;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import reviewme.highlight.domain.Highlight;
 
 public interface HighlightRepository extends JpaRepository<Highlight, Long> {
+
+    @Modifying
+    @Query("""
+            DELETE FROM Highlight h
+            WHERE h.answerId IN :answerIds
+            """)
+    void deleteAllByAnswerIds(Collection<Long> answerIds);
 }

backend/src/main/java/reviewme/highlight/service/HighlightService.java

@@ -1,19 +1,15 @@
 package reviewme.highlight.service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import reviewme.highlight.domain.Highlight;
 import reviewme.highlight.repository.HighlightRepository;
-import reviewme.highlight.service.dto.HighlightIndexRangeRequest;
-import reviewme.highlight.service.dto.HighlightRequest;
-import reviewme.highlight.service.dto.HighlightedLineRequest;
 import reviewme.highlight.service.dto.HighlightsRequest;
+import reviewme.highlight.service.mapper.HighlightMapper;
 import reviewme.highlight.service.validator.HighlightValidator;
-import reviewme.review.domain.Answer;
 import reviewme.review.repository.AnswerRepository;
 import reviewme.reviewgroup.domain.ReviewGroup;
 
@@ -25,36 +21,16 @@ public class HighlightService {
     private final AnswerRepository answerRepository;
 
     private final HighlightValidator highlightValidator;
+    private final HighlightMapper highlightMapper;
 
     @Transactional
-    public void highlight(HighlightsRequest request, ReviewGroup reviewGroup) {
-        long reviewGroupId = reviewGroup.getId();
-        highlightValidator.validate(request, reviewGroupId);
-        deleteOldHighlight(request.questionId(), reviewGroupId);
-        saveNewHighlight(request);
-    }
-
-    private void deleteOldHighlight(long questionId, long reviewGroupId) {
-        Set<Answer> answersByReviewGroup = answerRepository.findAllByReviewGroupId(reviewGroupId);
-        List<Long> answersByReviewQuestion = answersByReviewGroup.stream()
-                .filter(answer -> answer.getQuestionId() == questionId)
-                .map(Answer::getId)
-                .toList();
+    public void editHighlight(HighlightsRequest highlightsRequest, ReviewGroup reviewGroup) {
+        highlightValidator.validate(highlightsRequest, reviewGroup);
+        List<Highlight> highlights = highlightMapper.mapToHighlights(highlightsRequest);
 
-        highlightRepository.deleteAllById(answersByReviewQuestion);
-    }
+        Set<Long> answerIds = answerRepository.findIdsByQuestionId(highlightsRequest.questionId());
+        highlightRepository.deleteAllByAnswerIds(answerIds);
 
-    private void saveNewHighlight(HighlightsRequest highlightsRequest) {
-        List<Highlight> highlights = new ArrayList<>();
-        for (HighlightRequest highlight : highlightsRequest.highlights()) {
-            for (HighlightedLineRequest line : highlight.lines()) {
-                for (HighlightIndexRangeRequest range : line.ranges()) {
-                    Highlight highLight = new Highlight(highlight.answerId(),
-                            line.index(), range.startIndex(), range.endIndex());
-                    highlights.add(highLight);
-                }
-            }
-        }
         highlightRepository.saveAll(highlights);
     }
 }

backend/src/main/java/reviewme/highlight/service/dto/HighlightsRequest.java

@@ -12,4 +12,12 @@ public record HighlightsRequest(
         @Valid @NotNull(message = "하이라이트할 부분을 입력해주세요.")
         List<HighlightRequest> highlights
 ) {
+
+    public List<Long> getUniqueAnswerIds() {
+        return highlights()
+                .stream()
+                .map(HighlightRequest::answerId)
+                .distinct()
+                .toList();
+    }
 }