From 6adb341db180240e0af34ace40100912d4ed5257 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 11:02:57 +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 |  111 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 60 insertions(+), 51 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 93d7e48..9ab2b02 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
@@ -1,17 +1,16 @@
 package kr.wisestone.owl.web.form;
 
 import com.google.common.collect.Lists;
-import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.domain.IssueCustomFieldValue;
-import kr.wisestone.owl.exception.OwlRuntimeException;
 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.io.Serializable;
 import java.util.*;
 
-public class IssueApiForm {
+/**
+ * API �씠�뒋 異붽� / �닔�젙�슜 form class
+ */
+public class IssueApiForm implements Serializable {
 
     public enum ApiType {
         add,
@@ -33,50 +32,38 @@
     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;             // �깘吏� �떆�뒪�뀥�뿉�꽌留� �쟻�슜
+    private String comment;
 
     public IssueApiForm() {
     }
 
-    public static IssueApiForm make(Map<String, Object> content, List<MultipartFile> files) {
-        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;
-            }
+    /**
+     * �궗�슜�옄 �젙�쓽 �븘�뱶 蹂��솚
+     * @param customFieldJson �궗�슜�옄 �젙�쓽 �븘�뱶 json
+     */
+    public void parseCustomFields(String customFieldJson) {
+
+        Map<String, Object> json = ConvertUtil.convertJsonToMap(customFieldJson);
+        List<Map<String, Object>> customFields = (List) MapUtil.getObject(json, "customFields");
+        for (Map<String, Object> customField : customFields) {
+            IssueCustomFieldValueForm issueCustomFieldValueForm = ConvertUtil.convertMapToClass(customField, IssueCustomFieldValueForm.class);
+            this.addIssueCustomFieldValue(issueCustomFieldValueForm);
+
+            Map<String, Object> customFieldVo = new HashMap<>();
+            customFieldVo.put("id", issueCustomFieldValueForm.getCustomFieldId());
+
+            customField.put("customFieldVo", customFieldVo);
+
+            List<String> useValues = Lists.newArrayList();
+            useValues.add(issueCustomFieldValueForm.getUseValue());
+            customField.put("useValues", useValues);
+
+            this.addCustomFieldValue(customField);
         }
-
-        //  �궗�슜�옄 �븘�뱶 �젙蹂�
-        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());
-
-                customField.put("customFieldVo", customFieldVo);
-
-                List<String> useValues = Lists.newArrayList();
-                useValues.add(issueCustomFieldValueForm.getUseValue());
-                customField.put("useValues", useValues);
-
-                form.addCustomFieldValue(customField);
-            }
-        }
-
-        // 泥⑤� �뙆�씪
-//        if (MapUtil.getObject(content, "files") != null){
-//            form.setFiles((List)MapUtil.getObject(content, "files"));
-//        }
-        return form;
     }
 
     public String getToken() {
@@ -203,14 +190,6 @@
         this.apiType = apiType;
     }
 
-    //    public List<Map<String, Object>> getFiles() {
-//        return files;
-//    }
-//
-//    public void setFiles(List<Map<String, Object>> files) {
-//        this.files = files;
-//    }
-
     public List<MultipartFile> getMultipartFiles() {
         return multipartFiles;
     }
@@ -226,4 +205,34 @@
     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;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
 }

--
Gitblit v1.8.0