Merge pull request #38 from prgrms-web-devcourse-final-project/node/4

[REFACTOR]: 소유자 검증 & 분기점에서 새로운 결정 분기 라인 생성 & 헤더 추가

Author: lcs9317

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

@@ -7,6 +7,9 @@
 package com.back.domain.node.controller;
 
 import com.back.domain.node.dto.*;
+import com.back.domain.node.dto.base.BaseLineBulkCreateRequest;
+import com.back.domain.node.dto.base.BaseLineBulkCreateResponse;
+import com.back.domain.node.dto.base.BaseNodeDto;
 import com.back.domain.node.service.NodeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

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

@@ -7,13 +7,11 @@
  */
 package com.back.domain.node.controller;
 
-import com.back.domain.node.dto.DecLineDto;
-import com.back.domain.node.dto.DecisionLineLifecycleDto;
-import com.back.domain.node.dto.DecisionNodeFromBaseRequest;
-import com.back.domain.node.dto.DecisionNodeNextRequest;
+import com.back.domain.node.dto.decision.*;
 import com.back.domain.node.service.NodeService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -25,13 +23,13 @@ public class DecisionFlowController {
 
     // from-base: 라인+피벗(순번/나이)+분기슬롯 인덱스만 받아 서버가 pivotBaseNodeId를 해석
     @PostMapping("/from-base")
-    public ResponseEntity<DecLineDto> createFromBase(@RequestBody DecisionNodeFromBaseRequest request) {
+    public ResponseEntity<DecNodeDto> createFromBase(@RequestBody DecisionNodeFromBaseRequest request) {
         return ResponseEntity.status(HttpStatus.CREATED).body(nodeService.createDecisionNodeFromBase(request));
     }
 
     // next: 부모 결정 id만 받아 서버가 라인/다음 나이/베이스 매칭을 해석
     @PostMapping("/next")
-    public ResponseEntity<DecLineDto> createNext(@RequestBody DecisionNodeNextRequest request) {
+    public ResponseEntity<DecNodeDto> createNext(@RequestBody DecisionNodeNextRequest request) {
         return ResponseEntity.status(HttpStatus.CREATED).body(nodeService.createDecisionNodeNext(request));
     }
 
@@ -46,4 +44,10 @@ public ResponseEntity<DecisionLineLifecycleDto> cancel(@PathVariable Long decisi
     public ResponseEntity<DecisionLineLifecycleDto> complete(@PathVariable Long decisionLineId) {
         return ResponseEntity.ok(nodeService.completeDecisionLine(decisionLineId));
     }
+
+    // 분기점까지의 라인 복제(포크) 및 새로운 라인 생성
+    @PostMapping("/fork")
+    public ResponseEntity<DecNodeDto> fork(@RequestBody ForkFromDecisionRequest request) {
+        return ResponseEntity.status(HttpStatus.CREATED).body(nodeService.forkFromDecision(request));
+    }
 }

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

@@ -5,8 +5,8 @@
  */
 package com.back.domain.node.controller;
 
-import com.back.domain.node.dto.DecisionLineDetailDto;
-import com.back.domain.node.dto.DecisionLineListDto;
+import com.back.domain.node.dto.decision.DecisionLineDetailDto;
+import com.back.domain.node.dto.decision.DecisionLineListDto;
 import com.back.domain.node.service.NodeQueryService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;

back/src/main/java/com/back/domain/node/dto/PivotListDto.java

@@ -16,6 +16,7 @@ public record PivotDto(
             Long baseNodeId,
             NodeCategory category,
             String situation,
-            Integer ageYear
+            Integer ageYear,
+            String description
     ) {}
 }

back/src/main/java/com/back/domain/node/dto/TreeDto.java

@@ -7,9 +7,12 @@
  */
 package com.back.domain.node.dto;
 
+import com.back.domain.node.dto.base.BaseNodeDto;
+import com.back.domain.node.dto.decision.DecNodeDto;
+
 import java.util.List;
 
 public record TreeDto(
         List<BaseNodeDto> baseNodes,
-        List<DecLineDto> decisionNodes
+        List<DecNodeDto> decisionNodes
 ) {}

back/src/main/java/com/back/domain/node/dto/BaseLineBulkCreateRequest.java renamed to back/src/main/java/com/back/domain/node/dto/base/BaseLineBulkCreateRequest.java

@@ -2,7 +2,7 @@
  * [DTO-REQ] BaseLine을 라인 단위로 일괄 생성 요청(헤더~꼬리까지)
  * - nodes: 0=헤더, 마지막=꼬리, 사이가 피벗(분기점)
  */
-package com.back.domain.node.dto;
+package com.back.domain.node.dto.base;
 
 import com.back.domain.node.entity.NodeCategory;
 import java.util.List;
@@ -16,6 +16,7 @@ public record BaseNodePayload(
             NodeCategory category,
             String situation,
             String decision,
-            Integer ageYear
+            Integer ageYear,
+            String description
     ) {}
 }

back/src/main/java/com/back/domain/node/dto/BaseLineBulkCreateResponse.java renamed to back/src/main/java/com/back/domain/node/dto/base/BaseLineBulkCreateResponse.java

@@ -2,7 +2,7 @@
  * [DTO-RES] BaseLine 일괄 생성 응답
  * - 생성된 BaseLine id와 각 노드의 id/인덱스 반환
  */
-package com.back.domain.node.dto;
+package com.back.domain.node.dto.base;
 
 import java.util.List;
 

back/src/main/java/com/back/domain/node/dto/BaseNodeCreateRequestDto.java renamed to back/src/main/java/com/back/domain/node/dto/base/BaseNodeCreateRequestDto.java

@@ -2,7 +2,7 @@
  * [DTO-REQ] BaseNode 단건 생성 요청
  * - nodeKind는 BASE 권장
  */
-package com.back.domain.node.dto;
+package com.back.domain.node.dto.base;
 
 import com.back.domain.node.entity.NodeCategory;
 import com.back.domain.node.entity.NodeType;
@@ -11,5 +11,6 @@ public record BaseNodeCreateRequestDto(
         NodeType nodeKind,
         NodeCategory category,
         String situation,
-        Integer ageYear
+        Integer ageYear,
+        String description
 ) {}

back/src/main/java/com/back/domain/node/dto/BaseNodeDto.java renamed to back/src/main/java/com/back/domain/node/dto/base/BaseNodeDto.java

@@ -2,7 +2,7 @@
  * [DTO-RES] BaseNode 응답
  * - 고정 선택과 분기 2칸 및 각 타겟 링크를 포함한다
  */
-package com.back.domain.node.dto;
+package com.back.domain.node.dto.base;
 
 import com.back.domain.node.entity.NodeCategory;
 
@@ -21,5 +21,6 @@ public record BaseNodeDto(
         String altOpt1,
         String altOpt2,
         Long altOpt1TargetDecisionId,
-        Long altOpt2TargetDecisionId
+        Long altOpt2TargetDecisionId,
+        String description
 ) {}

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

@@ -2,12 +2,12 @@
  * [DTO-RES] DecisionNode 응답
  * - options/selectedIndex/parentOptionIndex를 포함해 프론트 렌더 정보를 제공한다
  */
-package com.back.domain.node.dto;
+package com.back.domain.node.dto.decision;
 
 import com.back.domain.node.entity.NodeCategory;
 import java.util.List;
 
-public record DecLineDto(
+public record DecNodeDto(
         Long id,
         Long userId,
         String type,
@@ -21,5 +21,6 @@ public record DecLineDto(
         String background,
         List<String> options,
         Integer selectedIndex,
-        Integer parentOptionIndex
+        Integer parentOptionIndex,
+        String description
 ) {}