From c88104169bc4fe457f98f33a91574c4dd33da573 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 03 12월 2021 20:08:01 +0900
Subject: [PATCH] - api 입력 오류 수정 - api 기본값 및 중복 설정 적용 수정
---
src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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..8c1e7a8 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
@@ -1,7 +1,9 @@
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;
@@ -10,6 +12,12 @@
import java.util.*;
public class IssueApiForm {
+
+ public enum ApiType {
+ add,
+ modify
+ }
+
private String token;
private String title;
private String projectKey;
@@ -20,6 +28,7 @@
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();
@@ -33,13 +42,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,7 +194,15 @@
CustomFieldValues = customFieldValues;
}
-// public List<Map<String, Object>> getFiles() {
+ public ApiType getApiType() {
+ return apiType;
+ }
+
+ public void setApiType(ApiType apiType) {
+ this.apiType = apiType;
+ }
+
+ // public List<Map<String, Object>> getFiles() {
// return files;
// }
//
--
Gitblit v1.8.0