Refactor: 타 도메인의 EdgeRepository 직접 의존 제거 및 EdgeService 메서드 추가

- BranchServiceTest를 EdgeService 의존 기준으로 수정

Author: lunarbae628

src/main/java/io/ejangs/docsa/domain/branch/app/BranchService.java

@@ -11,9 +11,8 @@
 import io.ejangs.docsa.domain.commit.dao.mongodb.CommitBlockSequenceRepository;
 import io.ejangs.docsa.domain.commit.entity.Commit;
 import io.ejangs.docsa.domain.doc.app.create.DocQueryService;
-import io.ejangs.docsa.domain.edge.dao.mysql.EdgeRepository;
+import io.ejangs.docsa.domain.edge.app.EdgeService;
 import io.ejangs.docsa.domain.doc.entity.Doc;
-import io.ejangs.docsa.domain.edge.entity.Edge;
 import io.ejangs.docsa.global.exception.CustomException;
 import io.ejangs.docsa.global.exception.errorcode.BranchErrorCode;
 import io.ejangs.docsa.global.exception.errorcode.DocErrorCode;
@@ -39,7 +38,7 @@ public class BranchService {
     private final BranchQueryService branchQueryService;
     private final CommitQueryService commitQueryService;
     private final CommitBlockSequenceRepository commitBlockSequenceRepository;
-    private final EdgeRepository edgeRepository;
+    private final EdgeService edgeService;
     private final ApplicationEventPublisher eventPublisher;
     private final BranchCreateOrchestrator branchCreateOrchestrator;
 
@@ -137,9 +136,7 @@ public void deleteBranch(Long documentId, Long branchId, Long userId) {
         }
 
         // 4. Edge 삭제
-        List<Edge> edgesToDelete =
-                edgeRepository.findAllByPrevCommitIdInOrNextCommitIdIn(commitsIds, commitsIds);
-        edgeRepository.deleteAll(edgesToDelete);
+        edgeService.deleteEdgesConnectedToCommits(commitsIds);
 
         // 5. 브랜치에서 삭제 가능한 블록과 시퀀스, SaveContent 삭제 이벤트 발행
         MongoIdsDto deletableMongoIds = collectDeletableMongoDataForBranch(branch, branchCommits);

src/main/java/io/ejangs/docsa/domain/commit/app/CommitService.java

@@ -35,9 +35,10 @@ public class CommitService {
     private final DocQueryService docQueryService;
     private final BranchQueryService branchQueryService;
     private final CommitQueryService commitQueryService;
+    private final EdgeService edgeService;
+
     private final CommitCreateOrchestrator commitCreateOrchestrator;
     private final MergeOrchestrator mergeCommitOrchestrator;
-    private final EdgeService edgeService;
 
     private final CommitContentAssembler assembler;
     private final MongoIdsCollector mongoIdsCollector;

src/main/java/io/ejangs/docsa/domain/doc/app/DocService.java

@@ -5,7 +5,7 @@
 import io.ejangs.docsa.domain.commit.app.CommitQueryService;
 import io.ejangs.docsa.domain.doc.app.create.DocCreateOrchestrator;
 import io.ejangs.docsa.domain.doc.app.create.DocQueryService;
-import io.ejangs.docsa.domain.edge.dao.mysql.EdgeRepository;
+import io.ejangs.docsa.domain.edge.app.EdgeService;
 import io.ejangs.docsa.domain.edge.dto.graph.BranchGraphDto;
 import io.ejangs.docsa.domain.edge.dto.graph.CommitGraphDto;
 import io.ejangs.docsa.domain.edge.dto.graph.EdgeDto;
@@ -44,7 +44,7 @@ public class DocService {
     private final DocQueryService docQueryService;
     private final BranchQueryService branchQueryService;
     private final CommitQueryService commitQueryService;
-    private final EdgeRepository edgeRepository;
+    private final EdgeService edgeService;
 
     private final DocCreateOrchestrator docCreateOrchestrator;
 
@@ -105,7 +105,7 @@ public GraphResponse getGraph(Long userId, Long documentId) {
             throw new CustomException(BranchErrorCode.BRANCH_NOT_FOUND);
         }
         List<CommitGraphDto> commits = commitQueryService.getCommitGraphList(documentId);
-        List<EdgeDto> edges = edgeRepository.findEdgesByDocId(documentId);
+        List<EdgeDto> edges = edgeService.getEdgeDtoByDocId(documentId);
 
         return GraphMapper.toCommitGraphResponse(docTitle, commits, edges, branches);
     }
@@ -119,7 +119,7 @@ public void delete(Long docId, Long userId) {
         List<Branch> branches = doc.getBranches();
 
         MongoIdsDto docDeleteMongoIds = mongoIdsCollector.collectFrom(branches);
-        edgeRepository.deleteAll(edges);
+        edgeService.deleteAll(edges);
 
         user.removeDocument(doc);
 

src/main/java/io/ejangs/docsa/domain/edge/app/EdgeService.java

@@ -3,6 +3,7 @@
 import io.ejangs.docsa.domain.commit.entity.Commit;
 import io.ejangs.docsa.domain.edge.dao.mysql.EdgeRepository;
 import io.ejangs.docsa.domain.doc.entity.Doc;
+import io.ejangs.docsa.domain.edge.dto.graph.EdgeDto;
 import io.ejangs.docsa.domain.edge.entity.Edge;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -18,6 +19,21 @@ public Edge saveEdge(Edge edge) {
         return edgeRepository.save(edge);
     }
 
+    public List<EdgeDto> getEdgeDtoByDocId(Long docId) {
+        return edgeRepository.findEdgesByDocId(docId);
+    }
+
+    public void deleteEdgesConnectedToCommits(List<Long> commitIds) {
+        List<Edge> deleteTarget = edgeRepository.findAllByPrevCommitIdInOrNextCommitIdIn(
+                commitIds, commitIds);
+
+        deleteAll(deleteTarget);
+    }
+
+    public void deleteAll(List<Edge> edges) {
+        edgeRepository.deleteAll(edges);
+    }
+
     public List<Commit> cutEdge(Doc doc, Long commitId) {
 
         List<Edge> edges = edgeRepository.findByNextCommitId(commitId);

src/test/java/io/ejangs/docsa/domain/branch/app/BranchServiceTest.java

@@ -10,6 +10,7 @@
 import io.ejangs.docsa.domain.commit.document.CommitBlockSequence;
 import io.ejangs.docsa.domain.commit.entity.Commit;
 import io.ejangs.docsa.domain.doc.app.create.DocQueryService;
+import io.ejangs.docsa.domain.edge.app.EdgeService;
 import io.ejangs.docsa.domain.edge.dao.mysql.EdgeRepository;
 import io.ejangs.docsa.domain.doc.entity.Doc;
 import io.ejangs.docsa.domain.save.entity.Save;
@@ -46,7 +47,7 @@ class BranchServiceTest {
     private DocQueryService docQueryService;
 
     @Mock
-    private EdgeRepository edgeRepository;
+    private EdgeService edgeService;
 
     @Mock
     private CommitBlockSequenceRepository commitBlockSequenceRepository;
@@ -261,8 +262,7 @@ void deleteBranch_success() {
                 .checkBranchInDocOwnedByUser(documentId, branchId, userId);
         when(branchQueryService.getById(branchId)).thenReturn(branch);
         when(branchQueryService.existsSubBranchByFromCommitIds(any())).thenReturn(false);
-        when(edgeRepository.findAllByPrevCommitIdInOrNextCommitIdIn(any(), any())).thenReturn(
-                List.of()); // 빈 리스트로 가정
+        doNothing().when(edgeService).deleteEdgesConnectedToCommits(any());
 
         when(commitBlockSequenceRepository.findById("seq1")).thenReturn(Optional.of(seq1));
         when(commitBlockSequenceRepository.findById("seq2")).thenReturn(Optional.of(seq2));

src/test/java/io/ejangs/docsa/domain/doc/unit/DocServiceUnitTests.java

@@ -15,6 +15,7 @@
 import io.ejangs.docsa.domain.doc.app.DocService;
 import io.ejangs.docsa.domain.doc.app.create.DocCreateOrchestrator;
 import io.ejangs.docsa.domain.doc.dao.mysql.DocRepository;
+import io.ejangs.docsa.domain.edge.app.EdgeService;
 import io.ejangs.docsa.domain.edge.dao.mysql.EdgeRepository;
 import io.ejangs.docsa.domain.doc.dto.RecentActivityDto;
 import io.ejangs.docsa.domain.doc.dto.RecentActivityDto.RecentType;
@@ -83,6 +84,9 @@ public class DocServiceUnitTests {
     @Mock
     private EdgeRepository edgeRepository;
 
+    @Mock
+    private EdgeService edgeService;
+
     @Mock
     private MongoIdsCollector mongoIdsCollector;
 
@@ -319,7 +323,7 @@ void getGraph_shouldReturnGraphResponse_whenDocExists() {
 
         when(branchQueryService.getBranchGraphList(docId)).thenReturn(branches);
         when(commitQueryService.getCommitGraphList(docId)).thenReturn(commits);
-        when(edgeRepository.findEdgesByDocId(docId)).thenReturn(edges);
+        when(edgeService.getEdgeDtoByDocId(docId)).thenReturn(edges);
 
         GraphResponse response = docService.getGraph(userId, docId);