From bd78ee158df93958380a6cc2460316fd87ed9713 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 08 2월 2022 11:39:08 +0900
Subject: [PATCH] - 이슈 임포트 시 IP주소 정규식 표현 체크 - 업체 추가 시 url을 입력하지 않을 경우 중복 체크 하는 오류 수정
---
src/main/java/kr/wisestone/owl/domain/IssueType.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueType.java b/src/main/java/kr/wisestone/owl/domain/IssueType.java
index d0379b8..1fffcee 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,9 +21,7 @@
private String name;
private String description;
private String color;
- private String companyYn = "N";
- private String ispYn = "N";
- private String hostingYn = "N";
+ private Long usePartner;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "workspace_id")
@@ -33,6 +34,9 @@
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "project_id")
private Project project;
+
+ @OneToMany(mappedBy = "issueType", cascade = {CascadeType.ALL}, orphanRemoval = true)
+ private Set<IssueTypeApiEndStatus> issueTypeApiEndStatuses;
/*@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "company_id")
@@ -52,12 +56,13 @@
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){
this.workspace = workspace;
this.workflow = workflow;
this.name = name;
this.description = description;
this.color = color;
+ this.usePartner = usePartner;
}
public Long getId() {
@@ -124,27 +129,19 @@
this.project = project;
}
- public String getCompanyYn() {
- return companyYn;
+ public Long getUsePartner() {
+ return usePartner;
}
- public void setCompanyYn(String companyYn) {
- this.companyYn = companyYn;
+ public void setUsePartner(Long usePartner) {
+ this.usePartner = usePartner;
}
- public String getIspYn() {
- return ispYn;
+ public Set<IssueTypeApiEndStatus> getIssueTypeApiEndStatuses() {
+ return issueTypeApiEndStatuses;
}
- public void setIspYn(String ispYn) {
- this.ispYn = ispYn;
- }
-
- public String getHostingYn() {
- return hostingYn;
- }
-
- public void setHostingYn(String hostingYn) {
- this.hostingYn = hostingYn;
+ public void setIssueTypeApiEndStatuses(Set<IssueTypeApiEndStatus> issueTypeApiEndStatuses) {
+ this.issueTypeApiEndStatuses = issueTypeApiEndStatuses;
}
}
--
Gitblit v1.8.0