From b2b9e785e10c8fd59c3fcee8c8fda2aeb86be8c3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 13:34:22 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java b/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
index ed11829..42c5467 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
@@ -1,30 +1,37 @@
 package kr.wisestone.owl.web.form;
 
 import com.google.common.collect.Lists;
-import kr.wisestone.owl.domain.IssueCustomFieldValue;
 import kr.wisestone.owl.util.ConvertUtil;
 import kr.wisestone.owl.util.MapUtil;
-import kr.wisestone.owl.vo.CustomFieldVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
 
 public class IssueApiForm {
+
+    public enum ApiType {
+        add,
+        modify
+    }
+
     private String token;
     private String title;
     private String projectKey;
     private String description;
     private Long issueTypeId;
+    private Long issueStatusId;
     private Long priorityId;
     private Long severityId;
     private Date startDate;
     private Date endDate;
     private Date searchTime;
+    private ApiType apiType;
     private List<DepartmentForm> departments = Lists.newArrayList();
     private List<IssueCustomFieldValueForm> issueCustomFieldValues = Lists.newArrayList();
     private List<Map<String, Object>> CustomFieldValues = Lists.newArrayList();
-//    private List<Map<String, Object>> files = Lists.newArrayList();
     private List<MultipartFile> multipartFiles = Lists.newArrayList();
+    private List<Long> useIssueCustomFieldIds = Lists.newArrayList();       // �궗�쐞�씪媛먯슜 �궗�슜�옄�븘�뱶媛�
+    private String url;             // �깘吏� �떆�뒪�뀥�뿉�꽌留� �쟻�슜
 
     public IssueApiForm() {
     }
@@ -33,13 +40,21 @@
         IssueApiForm form = ConvertUtil.convertMapToClass(content, IssueApiForm.class);
         form.setMultipartFiles(files);
 
+        // api ���엯
+        if (MapUtil.getString(content, "apiType") != null) {
+            try {
+                form.setApiType(ApiType.valueOf(MapUtil.getString(content, "apiType")));
+            } catch (Exception ex) {
+                return null;
+            }
+        }
+
         //  �궗�슜�옄 �븘�뱶 �젙蹂�
         if (MapUtil.getObject(content, "customFields") != null){
             List<Map<String, Object>> customFields = (List)MapUtil.getObject(content, "customFields");
             for (Map<String, Object> customField : customFields) {
                 IssueCustomFieldValueForm issueCustomFieldValueForm = ConvertUtil.convertMapToClass(customField, IssueCustomFieldValueForm.class);
                 form.addIssueCustomFieldValue(issueCustomFieldValueForm);
-
 
                 Map<String, Object> customFieldVo = new HashMap<>();
                 customFieldVo.put("id", issueCustomFieldValueForm.getCustomFieldId());
@@ -177,13 +192,13 @@
         CustomFieldValues = customFieldValues;
     }
 
-//    public List<Map<String, Object>> getFiles() {
-//        return files;
-//    }
-//
-//    public void setFiles(List<Map<String, Object>> files) {
-//        this.files = files;
-//    }
+    public ApiType getApiType() {
+        return apiType;
+    }
+
+    public void setApiType(ApiType apiType) {
+        this.apiType = apiType;
+    }
 
     public List<MultipartFile> getMultipartFiles() {
         return multipartFiles;
@@ -192,4 +207,34 @@
     public void setMultipartFiles(List<MultipartFile> multipartFiles) {
         this.multipartFiles = multipartFiles;
     }
+
+    public Long getIssueStatusId() {
+        return issueStatusId;
+    }
+
+    public void setIssueStatusId(Long issueStatusId) {
+        this.issueStatusId = issueStatusId;
+    }
+
+    public List<Long> getUseIssueCustomFieldIds() {
+        return useIssueCustomFieldIds;
+    }
+
+    public void setUseIssueCustomFieldIds(List<Long> useIssueCustomFieldIds) {
+        this.useIssueCustomFieldIds = useIssueCustomFieldIds;
+    }
+
+    public void addUseIssueCustomFieldId(Long customFieldId) {
+        if (this.useIssueCustomFieldIds != null) {
+            this.useIssueCustomFieldIds.add(customFieldId);
+        }
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }

--
Gitblit v1.8.0