From 079da7d7e3c08c4c38898d508b7568b5e451f5b3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 08 2월 2022 15:37:03 +0900
Subject: [PATCH] - 이슈 임포트 시 cell null 이중체크
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 40f9cf2..12306c7 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -49,9 +49,9 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.regex.Pattern;
-import static kr.wisestone.owl.domain.enumType.CustomFieldType.DATETIME;
-import static kr.wisestone.owl.domain.enumType.CustomFieldType.INPUT;
+import static kr.wisestone.owl.domain.enumType.CustomFieldType.*;
@Service
public class IssueServiceImpl extends AbstractServiceImpl<Issue, Long, JpaRepository<Issue, Long>> implements IssueService {
@@ -311,7 +311,7 @@
issueApiForm.addUseIssueCustomFieldId(customFieldApiOverlap.getCustomField().getId());
}
- // 醫낅즺�긽�깭媛� �븘�땶 以묐났�맂 �긽�쐞 �씠�뒋寃��깋
+ // 以묐났�맂 �긽�쐞 �씠�뒋寃��깋
List<Issue> issues = this.findIssue(issueApiForm, customFieldApiOverlaps, user.getId());
int size = issues.size();
if (size > 0) {
@@ -468,7 +468,7 @@
issueCustomFieldValueCondition.setUseValue(concatUseValue);
issueCustomFieldValueCondition.setUseValues(userValues);
issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
- issueCustomFieldValueCondition.setIssueStatusType("CLOSE");
+// issueCustomFieldValueCondition.setIssueStatusType("CLOSE");
List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
if (results != null && results.size() > 0) {
for (Map<String, Object> result : results) {
@@ -523,6 +523,12 @@
if (issueForm.getParentIssueId() != null){
Issue parentIssue = this.getIssue(issueForm.getParentIssueId());
issue.setParentIssue(parentIssue);
+
+ // �긽�쐞 �씠�뒋媛� 醫낅즺�씪寃쎌슦 ��湲곕줈 蹂�寃�
+ IssueStatus parentIssueStatus = parentIssue.getIssueStatus();
+ if (parentIssueStatus.getIssueStatusType().equals(IssueStatusType.CLOSE)) {
+ parentIssue.setIssueStatus(issueStatus);
+ }
}
issue.setIssueNumber(this.issueNumberGeneratorService.generateIssueNumber(project)); // 媛� �봽濡쒖젥�듃�쓽 怨좎쑀 �씠�뒋 踰덊샇 �깮�꽦
@@ -3191,7 +3197,7 @@
// �씠�뒋 �떞�떦�옄 踰뚰겕 �벑濡�
this.bulkInsertIssueAssignee(issueForms, workspace);
// 0.361 - 0.705
-
+
// 1.816
/*StopWatch serviceStart = new StopWatch();
serviceStart.start();*/
@@ -3229,7 +3235,7 @@
issueCompany.setCompanyField(companyField);
issueCompany.setIssue(issue);
this.issueCompanyRepository.saveAndFlush(issueCompany);
-
+
// �궗�슜�옄媛� ISP瑜� 吏곸젒 �엯�젰�븯吏� �븡�븯�쓣 寃쎌슦 �뾽泥댁뿉 �벑濡앸릺�뼱�엳�뒗 ISP �꽕�젙
if (issueForm.getIssueIspFields() == null || issueForm.getIssueIspFields().size() < 1) {
// �뾽泥댁쓽 ISP媛� �엳�뒗 寃쎌슦 issueISP �벑濡�
@@ -3373,7 +3379,7 @@
issueCustomField.put("registerId", this.webAppUtil.getLoginId());
issueCustomFieldValueMaps.add(issueCustomField);
}
-
+
// �뿊���뿉 �뾽泥대챸�쓣 �엯�젰�븯吏� �븡�븯�쓣 寃쎌슦 媛숈� �룄硫붿씤 �뾽泥� 李얘린
if (issueForm.getIssueCompanyFields() == null || issueForm.getIssueCompanyFields().size() < 1) {
// 媛숈� �룄硫붿씤 �뾽泥� 李얘린
@@ -3475,7 +3481,7 @@
if (cellType < Cell.CELL_TYPE_BLANK) {
if (cellType == Cell.CELL_TYPE_STRING)
{
- if (cell.getStringCellValue() != null) {
+ if (cell.getStringCellValue() != null && !cell.getStringCellValue().equals("")) {
return false;
}
} else {
@@ -3485,9 +3491,6 @@
}
return true;
}
-
-
-
// �뿊�� �븘�뱶�뿉 �엳�뒗 �젙蹂대�� �씠�뒋 form �쑝濡� �삷湲대떎.
private IssueForm setIssueFormToExcelField(Row row, int rowIndex, Map<String, Priority> priorityMaps,
@@ -3502,17 +3505,21 @@
// �젣紐�, �궡�슜, �봽濡쒖젥�듃 �궎, �씠�뒋 ���엯, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, �떆�옉�씪, 醫낅즺�씪, �궗�슜�옄 �젙�쓽 �븘�뱶
for (int cellIndex = 0; cellIndex < headers.size(); cellIndex++) {
Cell cell = row.getCell(cellIndex);
- boolean isNull = cellNullCheck(cell);
+ boolean isNull = true;
String cellStr = "";
- if (!isNull) {
- cellStr = CommonUtil.convertExcelStringToCell(cell);
+ if (cell != null) {
+ isNull = cellNullCheck(cell);
- // 怨듬갚 �젣嫄�
- cell.setCellValue(cellStr.trim());
- } else {
- cell.setCellValue(cellStr);
+ if (!isNull) {
+ cellStr = CommonUtil.convertExcelStringToCell(cell);
+
+ // 怨듬갚 �젣嫄�
+ cell.setCellValue(cellStr.trim());
+ } else {
+ cell.setCellValue(cellStr);
+ }
}
switch (cellIndex) {
@@ -3712,7 +3719,7 @@
issueForm.setStartDate(DateUtil.convertDateToStr(startDate, "yyyy-MM-dd"));
} else {
issueForm.setCompleteDate(DateUtil.convertDateToStr(startDate, "yyyy-MM-dd"));
-
+
// 醫낅즺�씪留� �엯�젰 �뻽�쓣 寃쎌슦
if (issueForm.getCompleteDate() != null && issueForm.getStartDate() == null) {
throw new OwlRuntimeException(
@@ -3759,7 +3766,8 @@
this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_TEXT_TYPE_MAX_LENGTH_OUT));
}
- if (customField.getCustomFieldType() == DATETIME) { //DATETIME�씪 寃쎌슦 format 蹂�寃�
+ //DATETIME�씪 寃쎌슦 format 蹂�寃�
+ if (customField.getCustomFieldType() == DATETIME) {
Date date = DateUtil.convertStrToDate(cellValue);
if (date == null) {
throw new OwlRuntimeException(
@@ -3767,6 +3775,19 @@
}
}
+ //IP_ADDRESS�씪 寃쎌슦 �젙洹쒗몴�쁽�떇 泥댄겕
+ if (customField.getCustomFieldType() == IP_ADDRESS) {
+ String regExp = "^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\."
+ + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\."
+ + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\."
+ + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$";
+
+ if (!cellValue.matches(regExp)) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_IP_ADDRESS_NOT_VALIDITY, rowIndex));
+ }
+ }
+
issueCustomFieldMap.put("customFieldId", customField.getId());
issueCustomFieldMap.put("useValue", cellValue);
issueForm.addIssueCustomFields(issueCustomFieldMap);
--
Gitblit v1.8.0