Skip to content

[FIX]: 트리 출력 버그 수정 및 베이스라인 삭제 #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 13, 2025
Merged

[FIX]: 트리 출력 버그 수정 및 베이스라인 삭제 #100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2d788c
last node & tree print
lcs9317 Oct 12, 2025
94e55c5
sql add
lcs9317 Oct 12, 2025
7740410
connect
lcs9317 Oct 13, 2025
9cc30d3
fix
lcs9317 Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions back/src/main/java/com/back/domain/node/entity/BaseLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.back.domain.node.entity;

import com.back.domain.scenario.entity.Scenario;
import com.back.domain.user.entity.User;
import com.back.global.baseentity.BaseEntity;
import jakarta.persistence.*;
Expand Down Expand Up @@ -35,6 +36,10 @@ public class BaseLine extends BaseEntity {
@Builder.Default
private List<BaseNode> baseNodes = new ArrayList<>();

@OneToMany(mappedBy = "baseLine", cascade = CascadeType.ALL, orphanRemoval = true)
@Builder.Default
private List<Scenario> scenarios = new ArrayList<>();

//중간 피벗 나이 목록 반환(헤더/꼬리 제외, 중복 제거, 오름차순)
public List<Integer> pivotAges() {
List<BaseNode> nodes = this.baseNodes;
Expand Down
5 changes: 5 additions & 0 deletions back/src/main/java/com/back/domain/node/entity/DecisionLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/
package com.back.domain.node.entity;

import com.back.domain.scenario.entity.Scenario;
import com.back.domain.user.entity.User;
import com.back.global.baseentity.BaseEntity;
import jakarta.persistence.*;
Expand Down Expand Up @@ -49,6 +50,10 @@ public class DecisionLine extends BaseEntity {
@JoinColumn(name = "pinned_commit_id")
private BaselineCommit pinnedCommit;

@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "scenario_id")
private Scenario scenario;

Copy link
Collaborator

@Gooraeng Gooraeng Oct 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

@OneToOne(mappedBy = "decisionLine", fetch = FetchType.LAZㅛ)
private Scenario scenario;

시나리오 쪽에서 OneToOne 설정이 되어 있어서 이 방향으로 고민해봐주실 수 있을까요?

추가적으로 sql 구문은 추가할 필요 없을 것 같습니다! 감사합니다!!

// 라인 취소 상태 전이
public void cancel() {
if (this.status == DecisionLineStatus.COMPLETED) {
Expand Down