From 174dc12380c54730014e86c8897be16389fc804f Mon Sep 17 00:00:00 2001 From: 박지현 <jhpark@maprex.co.kr> Date: 월, 21 2월 2022 11:42:38 +0900 Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/domain/IssueType.java | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/domain/IssueType.java b/src/main/java/kr/wisestone/owl/domain/IssueType.java index 1e0ca66..ca2ccf4 100644 --- a/src/main/java/kr/wisestone/owl/domain/IssueType.java +++ b/src/main/java/kr/wisestone/owl/domain/IssueType.java @@ -22,6 +22,7 @@ private String description; private String color; private Long usePartner; + private Boolean inheritPartners; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "workspace_id") @@ -35,9 +36,8 @@ @JoinColumn(name = "project_id") private Project project; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "complete_issue_status_id") - private IssueStatus issueStatus; + @OneToMany(mappedBy = "issueType", cascade = {CascadeType.ALL}, orphanRemoval = true) + private Set<IssueTypeApiEndStatus> issueTypeApiEndStatuses; /*@ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "company_id") @@ -57,13 +57,14 @@ public IssueType(){} - public IssueType(Workspace workspace, Workflow workflow, String name, String description, String color, Long usePartner){ + public IssueType(Workspace workspace, Workflow workflow, String name, String description, String color, Long usePartner, Boolean inheritPartners){ this.workspace = workspace; this.workflow = workflow; this.name = name; this.description = description; this.color = color; this.usePartner = usePartner; + this.inheritPartners = inheritPartners; } public Long getId() { @@ -138,11 +139,19 @@ this.usePartner = usePartner; } - public IssueStatus getIssueStatus() { - return issueStatus; + public Set<IssueTypeApiEndStatus> getIssueTypeApiEndStatuses() { + return issueTypeApiEndStatuses; } - public void setIssueStatus(IssueStatus issueStatus) { - this.issueStatus = issueStatus; + public void setIssueTypeApiEndStatuses(Set<IssueTypeApiEndStatus> issueTypeApiEndStatuses) { + this.issueTypeApiEndStatuses = issueTypeApiEndStatuses; + } + + public Boolean getInheritPartners() { + return inheritPartners; + } + + public void setInheritPartners(Boolean inheritPartners) { + this.inheritPartners = inheritPartners; } } -- Gitblit v1.8.0