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 | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/domain/IssueType.java b/src/main/java/kr/wisestone/owl/domain/IssueType.java index c100ca0..ca2ccf4 100644 --- a/src/main/java/kr/wisestone/owl/domain/IssueType.java +++ b/src/main/java/kr/wisestone/owl/domain/IssueType.java @@ -1,5 +1,7 @@ package kr.wisestone.owl.domain; +import org.hibernate.annotations.DynamicInsert; + import javax.persistence.*; import java.io.Serializable; import java.util.HashSet; @@ -9,6 +11,7 @@ * Created by wisestone on 2018-03-07. */ @Entity +@DynamicInsert public class IssueType extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -18,6 +21,8 @@ private String name; private String description; private String color; + private Long usePartner; + private Boolean inheritPartners; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "workspace_id") @@ -31,7 +36,10 @@ @JoinColumn(name = "project_id") private Project project; - @ManyToOne(fetch = FetchType.LAZY) + @OneToMany(mappedBy = "issueType", cascade = {CascadeType.ALL}, orphanRemoval = true) + private Set<IssueTypeApiEndStatus> issueTypeApiEndStatuses; + + /*@ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "company_id") private CompanyField companyField; @@ -41,7 +49,7 @@ @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "hosting_id") - private HostingField hostingField; + private HostingField hostingField;*/ @OneToMany(mappedBy = "issueType", cascade = { CascadeType.ALL }, orphanRemoval = true) private Set<IssueTypeCustomField> issueTypeCustomFields = new HashSet<>(); @@ -49,12 +57,14 @@ public IssueType(){} - public IssueType(Workspace workspace, Workflow workflow, String name, String description, String color){ + 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() { @@ -121,27 +131,27 @@ this.project = project; } - public CompanyField getCompanyField() { - return companyField; + public Long getUsePartner() { + return usePartner; } - public void setCompanyField(CompanyField companyField) { - this.companyField = companyField; + public void setUsePartner(Long usePartner) { + this.usePartner = usePartner; } - public IspField getIspField() { - return ispField; + public Set<IssueTypeApiEndStatus> getIssueTypeApiEndStatuses() { + return issueTypeApiEndStatuses; } - public void setIspField(IspField ispField) { - this.ispField = ispField; + public void setIssueTypeApiEndStatuses(Set<IssueTypeApiEndStatus> issueTypeApiEndStatuses) { + this.issueTypeApiEndStatuses = issueTypeApiEndStatuses; } - public HostingField getHostingField() { - return hostingField; + public Boolean getInheritPartners() { + return inheritPartners; } - public void setHostingField(HostingField hostingField) { - this.hostingField = hostingField; + public void setInheritPartners(Boolean inheritPartners) { + this.inheritPartners = inheritPartners; } } -- Gitblit v1.8.0