- 이슈 임포트 시 cell null 이중체크

이민희

2022-02-08 079da7d7e3c08c4c38898d508b7568b5e451f5b3

 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 {
@@ -3481,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 {
@@ -3491,9 +3491,6 @@
        }
        return true;
    }




    //  엑셀 필드에 있는 정보를 이슈 form 으로 옮긴다.
    private IssueForm setIssueFormToExcelField(Row row, int rowIndex, Map<String, Priority> priorityMaps,
@@ -3508,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) {
@@ -3765,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(
@@ -3773,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);