From d78323a9138aab73f9f1b25e0a74283780176452 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 09 12월 2021 20:43:47 +0900 Subject: [PATCH] - 이슈전체보기/이슈프로젝트보기 권한 생성 - 워크스페이스 권한을 가진 사용자 OWL정보 오류 해결 --- src/main/java/kr/wisestone/owl/domain/Issue.java | 99 +++++++++++++++++++++++++++++++------------------ 1 files changed, 63 insertions(+), 36 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/domain/Issue.java b/src/main/java/kr/wisestone/owl/domain/Issue.java index b9ed37a..90cc583 100644 --- a/src/main/java/kr/wisestone/owl/domain/Issue.java +++ b/src/main/java/kr/wisestone/owl/domain/Issue.java @@ -1,5 +1,8 @@ package kr.wisestone.owl.domain; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.*; import java.io.Serializable; import java.util.HashSet; @@ -9,12 +12,20 @@ * Created by wisestone on 2018-01-03. */ @Entity +@DynamicInsert +@DynamicUpdate public class Issue extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; public static final String WORKSPACE_MANAGER = "WORKSPACE_MANAGER"; // �뾽臾� 怨듦컙 愿�由ъ옄 public static final String PROJECT_MANAGER = "PROJECT_MANAGER"; // �봽濡쒖젥�듃 愿�由ъ옄 + public static final String ALL_ISSUE_MANAGER = "ALL_ISSUE_MANAGER"; // �쟾泥� �씠�뒋 愿�由ъ옄 + public static final String ALL_PROJECT_MANAGER = "ALL_PROJECT_MANAGER"; // �쟾泥� �봽濡쒖젥�듃 愿�由ъ옄 public static final String REGISTER = "REGISTER"; // �씠�뒋 �벑濡앹옄 public static final String ASSIGNEE = "ASSIGNEE"; // �씠�뒋 �떞�떦�옄 + public static final String DEPARTMENT = "DEPARTMENT"; // �씠�뒋 �떞�떦遺��꽌 + + public static final String IS_API_YES = "Y"; + public static final String IS_API_NO = "N"; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -25,6 +36,7 @@ private Long issueNumber; private String startDate; private String completeDate; + private String isApi; @ManyToOne(fetch=FetchType.LAZY) @JoinColumn(name = "project_id") @@ -45,18 +57,6 @@ @ManyToOne(fetch=FetchType.LAZY) @JoinColumn(name = "severity_id") private Severity severity; - - @ManyToOne(fetch=FetchType.LAZY) - @JoinColumn(name = "company_id") - private CompanyField companyField; - - @ManyToOne(fetch=FetchType.LAZY) - @JoinColumn(name = "hosting_id") - private HostingField hostingFieldId; - - @ManyToOne(fetch=FetchType.LAZY) - @JoinColumn(name = "isp_id") - private IspField ispFieldId; @OneToOne(mappedBy = "issue", cascade = {CascadeType.ALL}, orphanRemoval = true) private IssueRisk issueRisk; @@ -89,6 +89,15 @@ private Set<IssueCustomFieldValue> issueCustomFieldValues = new HashSet<>(); @OneToMany(mappedBy = "issue", cascade = { CascadeType.ALL }, orphanRemoval = true) + private Set<IssueCompany> issueCompanies = new HashSet<>(); + + @OneToMany(mappedBy = "issue", cascade = { CascadeType.ALL }, orphanRemoval = true) + private Set<IssueIsp> issueIsps = new HashSet<>(); + + @OneToMany(mappedBy = "issue", cascade = { CascadeType.ALL }, orphanRemoval = true) + private Set<IssueHosting> issueHostings = new HashSet<>(); + + @OneToMany(mappedBy = "issue", cascade = { CascadeType.ALL }, orphanRemoval = true) private Set<IssueVersion> issueVersions = new HashSet<>(); @OneToMany(mappedBy = "issue", cascade = { CascadeType.ALL }, orphanRemoval = true) @@ -100,6 +109,10 @@ @ManyToOne(fetch=FetchType.LAZY) @JoinColumn(name = "workflow_status_id") private WorkflowStatus workflowStatus; + + @ManyToOne(fetch=FetchType.LAZY) + @JoinColumn(name = "parent_issue_id") + private Issue parentIssue; public Long getId() { return id; @@ -171,30 +184,6 @@ public void setSeverity(Severity severity) { this.severity = severity; - } - - public CompanyField getCompanyField() { - return companyField; - } - - public void setCompanyField(CompanyField companyField) { - this.companyField = companyField; - } - - public HostingField getHostingFieldId() { - return hostingFieldId; - } - - public void setHostingFieldId(HostingField hostingFieldId) { - this.hostingFieldId = hostingFieldId; - } - - public IspField getIspFieldId() { - return ispFieldId; - } - - public void setIspFieldId(IspField ispFieldId) { - this.ispFieldId = ispFieldId; } public IssueRisk getIssueRisk() { @@ -269,6 +258,30 @@ this.issueCustomFieldValues = issueCustomFieldValues; } + public Set<IssueCompany> getIssueCompanies() { + return issueCompanies; + } + + public void setIssueCompanies(Set<IssueCompany> issueCompanies) { + this.issueCompanies = issueCompanies; + } + + public Set<IssueIsp> getIssueIspFields() { + return issueIsps; + } + + public void setIssueIspFields(Set<IssueIsp> issueIsps) { + this.issueIsps = issueIsps; + } + + public Set<IssueHosting> getIssueHostingFields() { + return issueHostings; + } + + public void setIssueHostingFields(Set<IssueHosting> issueHostings) { + this.issueHostings = issueHostings; + } + public String getStartDate() { return startDate; } @@ -321,5 +334,19 @@ this.issueRelations.clear(); } + public Issue getParentIssue() { + return parentIssue; + } + public void setParentIssue(Issue parentIssue) { + this.parentIssue = parentIssue; + } + + public String getIsApi() { + return isApi; + } + + public void setIsApi(String isApi) { + this.isApi = isApi; + } } -- Gitblit v1.8.0