Refactor: UX 개선에 따른 도메인 규칙 수정

README.md

@@ -43,7 +43,7 @@ Docsa는 문서의 변경 사항을 기록(commit) 단위로 추적하고, 버
 
 
 ## 👩‍💻 팀 이장님 소개
-<table align="center"> <thead> <tr> <th style="text-align:center;">팀원</th> <th style="text-align:center;">역할</th> <th style="text-align:left;">담당 업무</th> </tr> </thead> <tbody> <tr> <td align="center"> <a href="https://github.com/sleepyhoon"> <img src="https://avatars.githubusercontent.com/u/101882530?v=4" width="60"><br/> <sub><b>한승훈</b></sub> </a> </td> <td align="center"><b>PO</b></td> <td> - 프론트 개발자님과 소통<br> - 프로젝트 일정 관리<br> - 저장 관련 API 구현 </td> </tr> <tr> <td align="center"> <a href="https://github.com/heets-blue"> <img src="https://avatars.githubusercontent.com/u/89324994?v=4" width="60"><br/> <sub><b>배문성</b></sub> </a> </td> <td align="center"><b>BE 팀장</b></td> <td> - 문서 관련 API 구현<br> - 이종간 트랜잭션 삭제 로직 설계 및 구현 <br> - CI/CD 및 인프라 구축</td> </tr> <tr> <td align="center"> <a href="https://github.com/Jeongmin39"> <img src="https://avatars.githubusercontent.com/u/80705450?v=4" width="60"><br/> <sub><b>한정민</b></sub> </a> </td> <td align="center"><b>AWS 관리자</b></td> <td> - 인증 및 사용자 관련 API 구현<br> - AWS 인프라 운영<br> - Docker 기반 배포<br> - 모니터링 시스템 구축 </td> </tr> <tr> <td align="center"> <a href="https://github.com/2ternal"> <img src="https://avatars.githubusercontent.com/u/26919446?v=4" width="60"><br/> <sub><b>권우철</b></sub> </a> </td> <td align="center"><b>BE 팀원</b></td> <td> - 기록(커밋) 관련 API 구현<br> - 병합기능(머지) API 구현<br> - 이종간 트랜잭션 삭제 로직 설계 </td> </tr> <tr> <td align="center"> <a href="https://github.com/ky1nonly"> <img src="https://avatars.githubusercontent.com/u/117032989?v=4" width="60"><br/> <sub><b>이예원</b></sub> </a> </td> <td align="center"><b>BE 팀원</b></td> <td> - 버전(브랜치) 관련 API 구현<br> - 그래프 조회 API 구현 </td> </tr> </tbody> </table>
+<table align="center"> <thead> <tr> <th style="text-align:center;">팀원</th> <th style="text-align:center;">역할</th> <th style="text-align:left;">담당 업무</th> </tr> </thead> <tbody> <tr> <td align="center"> <a href="https://github.com/sleepyhoon"> <img src="https://avatars.githubusercontent.com/u/101882530?v=4" width="60"><br/> <sub><b>한승훈</b></sub> </a> </td> <td align="center"><b>PO</b></td> <td> - 프론트 개발자님과 소통<br> - 프로젝트 일정 관리<br> - 저장 관련 API 구현 </td> </tr> <tr> <td align="center"> <a href="https://github.com/heets-blue"> <img src="https://avatars.githubusercontent.com/u/89324994?v=4" width="60"><br/> <sub><b>배문성</b></sub> </a> </td> <td align="center"><b>BE 팀장</b></td> <td> - 문서 관련 API 구현<br> - Outbox 기반 이종간 정합성 삭제/보상 구조 설계 및 생성 경로 Orchestrator 패턴 리펙토링 <br> - CI/CD 및 인프라 구축</td> </tr> <tr> <td align="center"> <a href="https://github.com/Jeongmin39"> <img src="https://avatars.githubusercontent.com/u/80705450?v=4" width="60"><br/> <sub><b>한정민</b></sub> </a> </td> <td align="center"><b>AWS 관리자</b></td> <td> - 인증 및 사용자 관련 API 구현<br> - AWS 인프라 운영<br> - Docker 기반 배포<br> - 모니터링 시스템 구축 </td> </tr> <tr> <td align="center"> <a href="https://github.com/2ternal"> <img src="https://avatars.githubusercontent.com/u/26919446?v=4" width="60"><br/> <sub><b>권우철</b></sub> </a> </td> <td align="center"><b>BE 팀원</b></td> <td> - 기록(커밋) 관련 API 구현<br> - 병합기능(머지) API 구현<br> - 이종간 트랜잭션 삭제 로직 설계 </td> </tr> <tr> <td align="center"> <a href="https://github.com/ky1nonly"> <img src="https://avatars.githubusercontent.com/u/117032989?v=4" width="60"><br/> <sub><b>이예원</b></sub> </a> </td> <td align="center"><b>BE 팀원</b></td> <td> - 버전(브랜치) 관련 API 구현<br> - 그래프 조회 API 구현 </td> </tr> </tbody> </table>
 
 <div align="center">
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'io.EJangs'
-version = '0.0.1'
+version = '1.0.0'
 
 java {
     toolchain {

src/main/java/io/ejangs/docsa/domain/block/app/BlockService.java

@@ -2,9 +2,9 @@
 
 import io.ejangs.docsa.domain.block.dao.mongodb.BlockRepository;
 import io.ejangs.docsa.domain.block.document.Block;
-import io.ejangs.docsa.domain.block.dto.response.BlockDto;
 import io.ejangs.docsa.domain.block.util.BlockMapper;
 import java.util.List;
+import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -14,8 +14,8 @@ public class BlockService {
 
     private final BlockRepository blockRepository;
 
-    public List<Block> saveBlocks(List<BlockDto> blockDtos) {
-        List<Block> blocks = BlockMapper.toDocument(blockDtos);
+    public List<Block> saveBlocks(List<Map<String, Object>> blockDataList) {
+        List<Block> blocks = BlockMapper.toDocument(blockDataList);
         return blockRepository.saveAll(blocks);
     }
 

src/main/java/io/ejangs/docsa/domain/block/util/BlockMapper.java

@@ -1,19 +1,19 @@
 package io.ejangs.docsa.domain.block.util;
 
 import io.ejangs.docsa.domain.block.document.Block;
-import io.ejangs.docsa.domain.block.dto.response.BlockDto;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class BlockMapper {
 
-    public static Block toDocument(BlockDto block) {
+    public static Block toDocument(Map<String, Object> block) {
         return Block.builder()
-                .content(block.data())
+                .content(block)
                 .build();
     }
 
-    public static List<Block> toDocument(List<BlockDto> blocks) {
+    public static List<Block> toDocument(List<Map<String, Object>> blocks) {
         return blocks.stream()
                 .map(BlockMapper::toDocument)
                 .collect(Collectors.toList());

src/main/java/io/ejangs/docsa/domain/branch/api/BranchController.java

@@ -5,7 +5,7 @@
 import io.ejangs.docsa.domain.branch.dto.request.BranchRenameRequest;
 import io.ejangs.docsa.domain.branch.dto.response.BranchCreateResponse;
 import io.ejangs.docsa.domain.branch.dto.response.BranchRenameResponse;
-import io.ejangs.docsa.domain.branch.swagger.CreateBranchOrSaveDocs;
+import io.ejangs.docsa.domain.branch.swagger.CreateBranchDocs;
 import io.ejangs.docsa.domain.branch.swagger.DeleteBranchDocs;
 import io.ejangs.docsa.domain.branch.swagger.RenameBranchDocs;
 import io.ejangs.docsa.domain.user.security.CustomUserDetails;
@@ -25,17 +25,15 @@ public class BranchController {
 
     private final BranchService branchService;
 
-    // 브랜치에 이어서 새로운 저장 생성 or 새로운 브랜치 + 저장 생성
     @PostMapping
-    @CreateBranchOrSaveDocs
-    public ResponseEntity<BranchCreateResponse> createBranchOrSave(
+    @CreateBranchDocs
+    public ResponseEntity<BranchCreateResponse> createBranch(
             @AuthenticationPrincipal CustomUserDetails userDetails,
             @PathVariable Long documentId, @Valid @RequestBody BranchCreateRequest request) {
         return ResponseEntity.status(HttpStatus.CREATED)
-                .body(branchService.createBranchOrSave(documentId, request, userDetails.getId()));
+                .body(branchService.createBranch(documentId, request, userDetails.getId()));
     }
 
-    // 브랜치 이름 수정
     @PatchMapping("/{branchId}")
     @RenameBranchDocs
     public ResponseEntity<BranchRenameResponse> renameBranch(
@@ -47,7 +45,6 @@ public ResponseEntity<BranchRenameResponse> renameBranch(
                         userDetails.getId()));
     }
 
-    // 브랜치 삭제
     @DeleteMapping("/{branchId}")
     @DeleteBranchDocs
     public ResponseEntity<Void> deleteBranch(@AuthenticationPrincipal CustomUserDetails userDetails,

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

@@ -62,8 +62,8 @@ public void checkBranchInDocOwnedByUser(Long documentId, Long branchId, Long use
         }
     }
 
-    public boolean checkFromOrRootCommitInBranch(Commit commit) {
-        return branchRepository.existsByRootCommitIdOrFromCommitId(commit.getId());
+    public boolean checkFromCommitOrMergeCommitInBranch(Commit commit) {
+        return branchRepository.existsByFromOrMergeTargetCommitId(commit.getId());
     }
 
     public void checkDuplicatedWithBranchName(Long docId, String branchName) {

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

@@ -1,6 +1,6 @@
 package io.ejangs.docsa.domain.branch.app;
 
-import io.ejangs.docsa.domain.branch.app.create.BranchCreateContext;
+import io.ejangs.docsa.domain.branch.dto.BranchCreateContext;
 import io.ejangs.docsa.domain.branch.app.create.BranchCreateOrchestrator;
 import io.ejangs.docsa.domain.branch.dto.request.BranchCreateRequest;
 import io.ejangs.docsa.domain.branch.dto.response.BranchCreateResponse;
@@ -45,18 +45,12 @@ public class BranchService {
     private final BranchCreateOrchestrator branchCreateOrchestrator;
     private final MongoDeleteOutboxFactory mongoDeleteOutboxFactory;
 
-    /**
-     * '이어서 작업하기' 로직으로, 브랜치를 생성하고 저장을 추가하거나 기존 브랜치에 저장을 추가합니다.
-     * <p>
-     * fromCommitId가 존재하면 기존 커밋에서 브랜치를 만들거나 저장(save)을 추가하는 상황입니다. fromCommitId가 null이면 최초 브랜치 생성으로,
-     * 이 경우는 doc 도메인에서 처리합니다.
-     */
-    public BranchCreateResponse createBranchOrSave(Long documentId, BranchCreateRequest request,
+    public BranchCreateResponse createBranch(Long documentId, BranchCreateRequest request,
             Long userId) {
 
         BranchCreateContext context = prepareBranchCreateContext(documentId, request, userId);
 
-        return branchCreateOrchestrator.createBranchOrSave(context);
+        return branchCreateOrchestrator.create(context);
     }
 
     private BranchCreateContext prepareBranchCreateContext(Long documentId,
@@ -72,29 +66,15 @@ private BranchCreateContext prepareBranchCreateContext(Long documentId,
             throw new CustomException(DocErrorCode.COMMIT_NOT_IN_DOCUMENT);
         }
 
-        boolean isLeaf = fromBranch.getLeafCommit() != null
-                && fromBranch.getLeafCommit().getId().equals(fromCommitId);
+        branchQueryService.checkDuplicatedWithBranchName(documentId, request.name());
 
-        boolean isRoot = fromBranch.getRootCommit() != null
-                && fromBranch.getRootCommit().getId().equals(fromCommitId);
-        boolean hasSave = fromBranch.getSave() != null;
-
-        boolean createNewBranch =
-                !isLeaf || !fromBranch.getName().equals(request.name()) || (isLeaf && isRoot
-                        && hasSave);
-
-        if (createNewBranch) {
-            branchQueryService.checkDuplicatedWithBranchName(documentId, request.name());
-        }
 
         return new BranchCreateContext(
                 fromBranch.getDoc(),
                 fromBranch,
                 fromCommit,
                 request.name(),
-                fromCommit.getCommitMongoId(),
-                isLeaf,
-                createNewBranch
+                fromCommit.getCommitMongoId()
         );
     }
 

src/main/java/io/ejangs/docsa/domain/branch/app/create/BranchCreateMySqlTxService.java

@@ -1,6 +1,7 @@
 package io.ejangs.docsa.domain.branch.app.create;
 
 import io.ejangs.docsa.domain.branch.app.BranchQueryService;
+import io.ejangs.docsa.domain.branch.dto.BranchCreateContext;
 import io.ejangs.docsa.domain.branch.dto.response.BranchCreateResponse;
 import io.ejangs.docsa.domain.branch.entity.Branch;
 import io.ejangs.docsa.domain.branch.util.BranchMapper;
@@ -19,16 +20,13 @@ public class BranchCreateMySqlTxService {
     private final SaveQueryService saveQueryService;
 
     @Transactional(rollbackFor = Exception.class)
-    public BranchCreateResponse createBranchOrSave(BranchCreateContext context, String saveContentId) {
-        Branch targetBranch = context.fromBranch();
+    public BranchCreateResponse createMySqlPart(BranchCreateContext context, String saveContentId) {
 
-        if (context.createNewBranch()) {
-            targetBranch = branchQueryService.createBranch(context.doc(), context.branchName(), context.fromCommit());
-        }
+        Branch newBranch = branchQueryService.createBranch(context.doc(), context.branchName(), context.fromCommit());
 
-        Save save = saveQueryService.createSave(targetBranch, saveContentId);
+        Save save = saveQueryService.createSave(newBranch, saveContentId);
         RenewUpdatedAtHelper.touch(save);
 
-        return BranchMapper.toBranchCreateResponse(targetBranch, save);
+        return BranchMapper.toBranchCreateResponse(newBranch, save);
     }
 }

src/main/java/io/ejangs/docsa/domain/branch/app/create/BranchCreateOrchestrator.java

@@ -1,6 +1,9 @@
 package io.ejangs.docsa.domain.branch.app.create;
 
+import io.ejangs.docsa.domain.branch.dto.BranchCreateContext;
 import io.ejangs.docsa.domain.branch.dto.response.BranchCreateResponse;
+import io.ejangs.docsa.global.exception.CustomException;
+import io.ejangs.docsa.global.exception.errorcode.BranchErrorCode;
 import io.ejangs.docsa.global.mongo.outbox.dto.MongoIdsDto;
 import io.ejangs.docsa.global.mongo.outbox.entity.MongoDeleteOutbox.DomainType;
 import io.ejangs.docsa.global.mongo.outbox.entity.MongoDeleteOutbox.OriginType;
@@ -20,12 +23,12 @@ public class BranchCreateOrchestrator {
     private final BranchCreateMySqlTxService branchCreateMySqlTxService;
     private final MongoDeleteOutboxFactory mongoDeleteOutboxFactory;
 
-    public BranchCreateResponse createBranchOrSave(BranchCreateContext context) {
+    public BranchCreateResponse create(BranchCreateContext context) {
         String saveContentId = branchCreateMongoTxService.createSaveContentFromCommit(
                 context.fromCommitMongoId());
 
         try {
-            return branchCreateMySqlTxService.createBranchOrSave(context, saveContentId);
+            return branchCreateMySqlTxService.createMySqlPart(context, saveContentId);
         } catch (Exception e) {
             log.warn("[SAGA] 브랜치/저장 생성 실패 -> Mongo 삭제 Outbox 기록.", e);
             MongoIdsDto compensateTarget = new MongoIdsDto(List.of(saveContentId), null, null);
@@ -36,7 +39,7 @@ public BranchCreateResponse createBranchOrSave(BranchCreateContext context) {
                     saveContentId,
                     compensateTarget
             );
-            throw e;
+            throw new CustomException(BranchErrorCode.FAIL_CREATE_BRANCH);
         }
     }
 }

src/main/java/io/ejangs/docsa/domain/branch/dao/mysql/BranchRepository.java

@@ -16,6 +16,7 @@ public interface BranchRepository extends JpaRepository<Branch, Long> {
         b.name,
         b.createdAt,
         b.fromCommit.id,
+        b.mergeTargetCommit.id,
         b.rootCommit.id,
         b.leafCommit.id,
         (
@@ -34,11 +35,11 @@ public interface BranchRepository extends JpaRepository<Branch, Long> {
     @Query("""
                 SELECT CASE WHEN EXISTS (
                     SELECT 1 FROM Branch b
-                    WHERE b.rootCommit.id = :commitId OR b.fromCommit.id = :commitId
+                    WHERE b.fromCommit.id = :commitId
+                    OR b.mergeTargetCommit.id = :commitId
                 ) THEN true ELSE false END
             """)
-    boolean existsByRootCommitIdOrFromCommitId(@Param("commitId") Long commitId);
+    boolean existsByFromOrMergeTargetCommitId(@Param("commitId") Long commitId);
 
     boolean existsByDocIdAndName(Long docId, String name);
 }
-

src/main/java/io/ejangs/docsa/domain/branch/app/create/BranchCreateContext.java → src/main/java/io/ejangs/docsa/domain/branch/dto/BranchCreateContext.java

@@ -1,4 +1,4 @@
-package io.ejangs.docsa.domain.branch.app.create;
+package io.ejangs.docsa.domain.branch.dto;
 
 import io.ejangs.docsa.domain.branch.entity.Branch;
 import io.ejangs.docsa.domain.commit.entity.Commit;
@@ -9,9 +9,7 @@ public record BranchCreateContext(
         Branch fromBranch,
         Commit fromCommit,
         String branchName,
-        String fromCommitMongoId,
-        boolean leafCommit,
-        boolean createNewBranch
+        String fromCommitMongoId
 ) {
 
 }

src/main/java/io/ejangs/docsa/domain/branch/entity/Branch.java

@@ -54,6 +54,10 @@ public class Branch extends BaseEntity {
     @JoinColumn(name = "leaf_commit_id")
     private Commit leafCommit;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "merge_target_commit_id")
+    private Commit mergeTargetCommit;
+
     @OneToMany(mappedBy = "branch", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Commit> commits;
 
@@ -72,12 +76,16 @@ public void updateLeafCommit(Commit leafCommit) {
         this.leafCommit = leafCommit;
     }
 
-    public void initializeRootCommitIfNull(Commit commit) {
+    public void updateRootCommit(Commit commit) {
         if (this.rootCommit == null) {
             this.rootCommit = commit;
         }
     }
 
+    public void updateMergeTargetCommit(Commit mergeTargetCommit) {
+        this.mergeTargetCommit = mergeTargetCommit;
+    }
+
     public void setSave(Save save) {
         this.save = save;
         if (save.getBranch() != this) {
@@ -109,7 +117,16 @@ public void removeCommit(Commit commit) {
         this.commits.remove(commit);
     }
 
-    public void removeSave() {
-        this.save = null;
+    public void detachRootCommit(Commit commit) {
+        if (this.rootCommit != null && this.rootCommit.getId().equals(commit.getId())) {
+            this.rootCommit = null;
+        }
+
+        if (this.leafCommit != null && this.leafCommit.getId().equals(commit.getId())) {
+            this.leafCommit = null;
+        }
+
+        removeCommit(commit);
     }
+
 }

src/main/java/io/ejangs/docsa/domain/branch/merge/api/MergeController.java

@@ -0,0 +1,39 @@
+package io.ejangs.docsa.domain.branch.merge.api;
+
+import io.ejangs.docsa.domain.branch.merge.app.MergeService;
+import io.ejangs.docsa.domain.branch.merge.dto.request.MergeRequest;
+import io.ejangs.docsa.domain.branch.merge.dto.response.MergeResponse;
+import io.ejangs.docsa.domain.branch.merge.swagger.MergeDocs;
+import io.ejangs.docsa.domain.user.security.CustomUserDetails;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.tags.Tags;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@Tags({
+        @Tag(name = "Merge API")
+})
+public class MergeController {
+
+    private final MergeService mergeService;
+
+    @PostMapping("/api/document/{docId}/merge")
+    @MergeDocs
+    public ResponseEntity<MergeResponse> merge(
+            @AuthenticationPrincipal CustomUserDetails userDetails,
+            @PathVariable("docId") Long docId,
+            @RequestBody @Valid MergeRequest mergeRequest) {
+
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(mergeService.merge(docId, mergeRequest, userDetails.getId()));
+    }
+}