- 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크...

minhee

2022-03-15 ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50

- 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거
- 이슈 상세페이지 setHideCompleteIssue null 체크
- api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가

 src/main/java/kr/wisestone/owl/constant/MsgConstants.java

@@ -301,6 +301,11 @@
    public static final String PARENT_SECTOR_NOT_EQUAL = "PARENT_SECTOR_NOT_EQUAL";   // 선택한 업종(중분류)는 업종(대분류)에 속해있지 않습니다.

    /**
     * 이슈 유형에 파트너 설정이 안 되어 있을 경우
     */
    public static final String API_PARTNER_SETTING_NOT_EXIST = "API_PARTNER_SETTING_NOT_EXIST";

    /**
     * api 파라미터 오류(이슈타입)
     */
    public static final String API_PARAMETER_ISSUE_TYPE_ERROR = "API_PARAMETER_ISSUE_TYPE_ERROR";

 src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java

@@ -784,9 +784,9 @@
     * @return String
     */
    private String verifyEmail(String email) {
        if (!Pattern.matches("^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}$", email)) {
        /*if (!Pattern.matches("^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}$", email)) {
            throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.EMAIL_NOT_INVALID));
        }
        }*/

        if (email.contains(" ")) {
            email = email.replace(" ", "");

 src/main/java/kr/wisestone/owl/service/impl/HostingFieldServiceImpl.java

@@ -479,9 +479,9 @@
     * @return String
     */
    private String verifyEmail(String email) {
        if (!Pattern.matches("^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}$", email)) {
        /*if (!Pattern.matches("^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}$", email)) {
            throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.EMAIL_NOT_INVALID));
        }
        }*/

        if (email.contains(" ")) {
            email = email.replace(" ", "");

 src/main/java/kr/wisestone/owl/service/impl/IspFieldServiceImpl.java

@@ -485,9 +485,9 @@
     * @return String
     */
    private String verifyEmail(String email) {
        if (!Pattern.matches("^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}$", email)) {
        /*if (!Pattern.matches("^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}$", email)) {
            throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.EMAIL_NOT_INVALID));
        }
        }*/

        if (email.contains(" ")) {
            email = email.replace(" ", "");

 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java

@@ -1700,6 +1700,9 @@
                    break;

                case "02": //  프로젝트, 이슈 유형, 이슈 상태,  우선순위, 중요도, 담당자, 첨부파일, 사용자 정의 필드 정보, 댓글, 기록을 셋팅한다.
                    if (issueCondition.getHideCompleteIssue() == null) {
                        issueCondition.setHideCompleteIssue(true);
                    }
                    this.setIssueDetail(issueVo, issue, user, issueCondition.getHideCompleteIssue());    //  이슈 상세 정보를 셋팅한다.
                    this.setIssueTableConfigs(issue, issueVo, issueCondition);
                    issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));

 src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java

@@ -86,6 +86,10 @@
            sb.append(issue.getProject().getProjectKey()).append("-").append(issue.getIssueNumber());
        }

        if (issues.get(0).getIssueCompanies() != null && issues.get(0).getIssueType().getUsePartner() < 1) {
            sb.append(", 업체가 해당 이슈유형에 설정되어 있지 않습니다.");
        }

        resJsonData.put(Constants.RES_KEY_MSG_SUCCESS, sb.toString());
        return resJsonData;
    }

 src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties

@@ -273,3 +273,5 @@
IP_NOT_INVALID=IP\uC8FC\uC18C \uD615\uC2DD\uC774 \uB9DE\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
IP_START_NOT_LARGER_THAN_END=\uC2DC\uC791 IP\uAC00 \uB05D IP \uBCF4\uB2E4 \uD074 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
COMPANY_EXIST_IP=\uD574\uB2F9 ip \uB300\uC5ED\uB300\uB294 \uC774\uBBF8 \uC874\uC7AC\uD569\uB2C8\uB2E4.

API_PARTNER_SETTING_NOT_EXIST=\uD30C\uD2B8\uB108(\uC5C5\uCCB4/ISP/\uD638\uC2A4\uD305)\uAC00 \uD574\uB2F9 \uC774\uC288\uC720\uD615\uC5D0 \uC124\uC815\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.

 src/main/webapp/assets/styles/main.css

@@ -993,6 +993,7 @@
        -ms-flex: 0 0 16.6666666667%;
        flex: 0 0 16.6666666667%;
        max-width: 16.6666666667%;
        word-break: break-word;
    }

    .col-sm-3 {