last node & tree print

Author: lcs9317

back/src/main/java/com/back/domain/node/controller/BaseLineController.java

@@ -75,4 +75,15 @@ public ResponseEntity<List<BaseLineDto>> getMyBaseLines(
         List<BaseLineDto> list = nodeService.getMyBaseLines(me.getId());
         return ResponseEntity.ok(list);
     }
+
+    // 한줄 요약: 소유자 검증 후 베이스라인과 모든 연관 데이터 일괄 삭제
+    @DeleteMapping("/{baseLineId}")
+    public ResponseEntity<Void> deleteBaseLine(
+            @AuthenticationPrincipal CustomUserDetails me,
+            @PathVariable Long baseLineId
+    ) {
+        if (me == null) throw new ApiException(ErrorCode.HANDLE_ACCESS_DENIED, "login required");
+        nodeService.deleteBaseLineDeep(me.getId(), baseLineId); // 가장 많이 사용하는 호출: 파사드에 위임
+        return ResponseEntity.noContent().build();
+    }
 }

back/src/main/java/com/back/domain/node/dto/decision/DecNodeDto.java

@@ -7,7 +7,6 @@
 
 import com.back.domain.node.entity.FollowPolicy;
 import com.back.domain.node.entity.NodeCategory;
-
 import java.util.List;
 
 public record DecNodeDto(
@@ -46,11 +45,14 @@ public record DecNodeDto(
         Boolean root,                  // 라인 헤더면 true
         Long pivotLinkBaseNodeId,      // 베이스 분기 슬롯에서 올라온 첫 노드면 해당 BaseNode id
         Integer pivotSlotIndex,        // 0/1 (분기 슬롯 인덱스), 아니면 null
+        Long pivotLinkDecisionNodeId,
 
         // 단일 패스 렌더용 최소 힌트
         Integer renderPhase,           // 1=from-base 라인, 2..N=fork 깊이(부모 라인 +1)
         Long incomingFromId,           // 이 노드로 "들어오는" 에지의 from 노드 id(루트면 포크 원본, 아니면 parentId)
-        String incomingEdgeType        // "normal" | "fork"
+        String incomingEdgeType,       // "root","prelude","from-base","fork","normal"
+        // 포크 원본 라인 id(디버깅/렌더 보조용)
+        Long incomingFromLineId
 ) {
     // === 호환 오버로드(기존 서비스 호출 유지) ===
     public DecNodeDto(
@@ -70,6 +72,6 @@ public DecNodeDto(
                 followPolicy, pinnedCommitId, virtual, effectiveCategory, effectiveSituation,
                 effectiveDecision, effectiveOptions, effectiveDescription,
                 null, null, null, null,
-                null, null, null); // 새 필드는 null 기본값
+                null, null, null, null,null); // 새 필드는 null 기본값
     }
 }

back/src/main/java/com/back/domain/node/entity/DecisionLine.java

@@ -34,6 +34,9 @@ public class DecisionLine extends BaseEntity {
     @Column(nullable = false)
     private DecisionLineStatus status;
 
+    @Column(name = "parent_line_id")
+    private Long parentLineId;
+
     @OneToMany(mappedBy = "decisionLine", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<DecisionNode> decisionNodes = new ArrayList<>();
 

back/src/main/java/com/back/domain/node/entity/DecisionNode.java

@@ -82,6 +82,12 @@ public class DecisionNode extends BaseEntity {
     @JoinColumn(name = "override_version_id")
     private NodeAtomVersion overrideVersion;
 
+    @Column(name = "ai_next_situation", columnDefinition = "TEXT")
+    private String aiNextSituation;
+
+    @Column(name = "ai_next_recommended_option", columnDefinition = "TEXT")
+    private String aiNextRecommendedOption;
+
     // 다음 나이 검증
     public void guardNextAgeValid(int nextAge) {
         if (nextAge <= this.getAgeYear()) {
@@ -94,4 +100,9 @@ public void setOverride(NodeAtomVersion version) {
         this.followPolicy = FollowPolicy.OVERRIDE;
         this.overrideVersion = version;
     }
+
+    public void setAiHint(String nextSituation, String nextRecommended) {
+        this.aiNextSituation = nextSituation;
+        this.aiNextRecommendedOption = nextRecommended;
+    }
 }

back/src/main/java/com/back/domain/node/mapper/NodeMappers.java

@@ -128,8 +128,8 @@ public NodeMappers(VersionResolver resolver,
                     e.getSelectedIndex(),
                     e.getParentOptionIndex(),
                     e.getDescription(),
-                    null,
-                    null,
+                    e.getAiNextSituation(),
+                    e.getAiNextRecommendedOption(),
                     e.getFollowPolicy(),
                     pinnedCommitId,
                     null, // virtual 투영은 상위 레이어에서 주입

back/src/main/java/com/back/domain/node/repository/BaseLineRepository.java

@@ -32,4 +32,8 @@ public interface BaseLineRepository extends JpaRepository<BaseLine, Long> {
     // 사용자별 베이스라인 목록 조회 (페이징 및 N+1 방지)
     @Query("SELECT DISTINCT bl FROM BaseLine bl LEFT JOIN FETCH bl.baseNodes bn WHERE bl.user.id = :userId ORDER BY bl.createdDate DESC")
     Page<BaseLine> findAllByUserIdWithBaseNodes(@Param("userId") Long userId, Pageable pageable);
+
+    boolean existsByIdAndUser_Id(Long baseLineId, Long userId);
+
+    void deleteByIdAndUser_Id(Long baseLineId, Long userId);
 }

back/src/main/java/com/back/domain/node/repository/BaseNodeRepository.java

@@ -39,4 +39,6 @@ public interface BaseNodeRepository extends JpaRepository<BaseNode, Long> {
     @Query("update BaseNode b set b.altOpt2TargetDecisionId = null " +
             "where b.id = :id and b.altOpt2TargetDecisionId = :targetId")
     int unlinkAlt2IfMatches(@Param("id") Long id, @Param("targetId") Long targetId);
+
+    void deleteByBaseLine_Id(Long baseLineId);
 }

back/src/main/java/com/back/domain/node/repository/BaselineBranchRepository.java

@@ -7,6 +7,9 @@
 
 import com.back.domain.node.entity.BaselineBranch;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -20,4 +23,10 @@ public interface BaselineBranchRepository extends JpaRepository<BaselineBranch,
 
     // BaseLine 기준 브랜치 목록 조회
     List<BaselineBranch> findByBaseLine_Id(Long baseLineId);
+
+    void deleteByBaseLine_Id(Long baseLineId);
+
+    @Modifying
+    @Query("update BaselineBranch b set b.headCommit = null where b.baseLine.id = :baseLineId")
+    void clearHeadByBaseLineId(@Param("baseLineId") Long baseLineId);
 }

back/src/main/java/com/back/domain/node/repository/BaselineCommitRepository.java

@@ -25,4 +25,6 @@ public interface BaselineCommitRepository extends JpaRepository<BaselineCommit,
     // N+1 방지용: 부모 커밋 즉시 로딩
     @EntityGraph(attributePaths = {"parentCommit"})
     List<BaselineCommit> findAll();
+
+    void deleteByBranch_BaseLine_Id(Long baseLineId);
 }

back/src/main/java/com/back/domain/node/repository/BaselinePatchRepository.java

@@ -21,4 +21,6 @@ public interface BaselinePatchRepository extends JpaRepository<BaselinePatch, Lo
 
     // 커밋 집합과 ageYear로 필터링하여 최신 우선 정렬
     List<BaselinePatch> findByCommit_IdInAndAgeYearOrderByIdDesc(Collection<Long> commitIds, Integer ageYear);
+
+    void deleteByCommit_Branch_BaseLine_Id(Long baseLineId);
 }