- isp / hosting 값이 없을 경우 예외처리 추가

jhjang

2022-01-17 00b7d9049132b23712a342c92fc8d300439df946

- isp / hosting 값이 없을 경우 예외처리 추가

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

@@ -82,55 +82,57 @@
    public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
        if (issue != null) {
            List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
            Map<String, Object> param = issueHostingFields.get(0);

            if (issueHostingFields != null && issueHostingFields.size() > 0) {
                IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
                Map<String, Object> param = issueHostingFields.get(0);

                if (issueHosting != null) { //수정 시
                    issueHosting.setName(MapUtil.getString(param, "name"));
                    issueHosting.setEmail(MapUtil.getString(param, "email"));
                    issueHosting.setCode(MapUtil.getString(param, "code"));
                    issueHosting.setUrl(MapUtil.getString(param, "url"));
                    issueHosting.setManager(MapUtil.getString(param, "manager"));
                    issueHosting.setTel(MapUtil.getString(param, "tel"));
                    issueHosting.setMemo(MapUtil.getString(param, "memo"));
                    // 변경 이력
                    StringBuilder sb = new StringBuilder();
                    issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    this.issueHostingRepository.saveAndFlush(issueHosting);
                if (issueHostingFields != null && issueHostingFields.size() > 0) {
                    IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());

                } else { //추가 시
                    IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
                    if (issueHosting != null) { //수정 시
                        issueHosting.setName(MapUtil.getString(param, "name"));
                        issueHosting.setEmail(MapUtil.getString(param, "email"));
                        issueHosting.setCode(MapUtil.getString(param, "code"));
                        issueHosting.setUrl(MapUtil.getString(param, "url"));
                        issueHosting.setManager(MapUtil.getString(param, "manager"));
                        issueHosting.setTel(MapUtil.getString(param, "tel"));
                        issueHosting.setMemo(MapUtil.getString(param, "memo"));
                        // 변경 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                        this.issueHostingRepository.saveAndFlush(issueHosting);

                    } else { //추가 시
                        IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
                        // 추가 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                        this.issueHostingRepository.saveAndFlush(newIssueHosting);
                    }
                } else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
                    // issueHosting 필드 폼 만들기
                    HostingFieldForm hostingFieldForm = new HostingFieldForm();
                    hostingFieldForm.setName(issueForm.getHostingName());
                    hostingFieldForm.setCode(issueForm.getHostingCode());
                    hostingFieldForm.setEmail(issueForm.getHostingEmail());
                    hostingFieldForm.setUrl(issueForm.getHostingUrl());
                    hostingFieldForm.setManager(issueForm.getHostingManager());
                    hostingFieldForm.setTel(issueForm.getHostingTel());
                    hostingFieldForm.setMemo(issueForm.getHostingMemo());

                    IssueHosting newIssueHosting = CreateIssueHosting(hostingFieldForm, issue);
                    HostingField hostingField = new HostingField();
                    if (newIssueHosting.getHostingField() == null) { // 사용자가 직접 입력시에 호스팅 목록에 추가
                        hostingField = this.hostingFieldService.add(hostingFieldForm);
                        newIssueHosting.setHostingField(hostingField);
                    }
                    // 추가 이력
                    StringBuilder sb = new StringBuilder();
                    issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    this.issueHostingRepository.saveAndFlush(newIssueHosting);
                }
            } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
                // issueHosting 필드 폼 만들기
                HostingFieldForm hostingFieldForm = new HostingFieldForm();
                hostingFieldForm.setName(issueForm.getHostingName());
                hostingFieldForm.setCode(issueForm.getHostingCode());
                hostingFieldForm.setEmail(issueForm.getHostingEmail());
                hostingFieldForm.setUrl(issueForm.getHostingUrl());
                hostingFieldForm.setManager(issueForm.getHostingManager());
                hostingFieldForm.setTel(issueForm.getHostingTel());
                hostingFieldForm.setMemo(issueForm.getHostingMemo());

                IssueHosting newIssueHosting = CreateIssueHosting(hostingFieldForm, issue);
                HostingField hostingField = new HostingField();
                if (newIssueHosting.getHostingField() == null) { // 사용자가 직접 입력시에 호스팅 목록에 추가
                    hostingField = this.hostingFieldService.add(hostingFieldForm);
                    newIssueHosting.setHostingField(hostingField);
                }
                // 추가 이력
                StringBuilder sb = new StringBuilder();
                issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
                issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                this.issueHostingRepository.saveAndFlush(newIssueHosting);
            }
        }
    }

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

@@ -82,58 +82,60 @@
    public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
        if (issue != null) {
            List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
            Map<String, Object> param = issueIspFields.get(0);

            if (issueIspFields != null && issueIspFields.size() > 0) {
                IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
                Map<String, Object> param = issueIspFields.get(0);

                if (issueIsp != null) {//수정 시
                    issueIsp.setName(MapUtil.getString(param, "name"));
                    issueIsp.setEmail(MapUtil.getString(param, "email"));
                    issueIsp.setCode(MapUtil.getString(param, "code"));
                    issueIsp.setUrl(MapUtil.getString(param, "url"));
                    issueIsp.setManager(MapUtil.getString(param, "manager"));
                    issueIsp.setTel(MapUtil.getString(param, "tel"));
                    issueIsp.setMemo(MapUtil.getString(param, "memo"));
                    // 변경 이력
                    StringBuilder sb = new StringBuilder();
                    issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    this.issueIspRepository.saveAndFlush(issueIsp);
                if (issueIspFields != null && issueIspFields.size() > 0) {
                    IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());

                } else { //추가 시
                    IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
                    if (issueIsp != null) {//수정 시
                        issueIsp.setName(MapUtil.getString(param, "name"));
                        issueIsp.setEmail(MapUtil.getString(param, "email"));
                        issueIsp.setCode(MapUtil.getString(param, "code"));
                        issueIsp.setUrl(MapUtil.getString(param, "url"));
                        issueIsp.setManager(MapUtil.getString(param, "manager"));
                        issueIsp.setTel(MapUtil.getString(param, "tel"));
                        issueIsp.setMemo(MapUtil.getString(param, "memo"));
                        // 변경 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                        this.issueIspRepository.saveAndFlush(issueIsp);

                    } else { //추가 시
                        IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
                        // 추가 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                        this.issueIspRepository.saveAndFlush(newIssueIsp);
                    }
                }
                // 사용자가 직접 입력시
                else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
                    // issueIsp 필드 폼 만들기
                    IspFieldForm ispFieldForm = new IspFieldForm();
                    ispFieldForm.setName(issueForm.getIspName());
                    ispFieldForm.setCode(issueForm.getIspCode());
                    ispFieldForm.setEmail(issueForm.getIspEmail());
                    ispFieldForm.setUrl(issueForm.getIspUrl());
                    ispFieldForm.setManager(issueForm.getIspManager());
                    ispFieldForm.setTel(issueForm.getIspTel());
                    ispFieldForm.setMemo(issueForm.getIspMemo());

                    IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue);
                    IspField ispField = new IspField();
                    // 사용자가 직접 입력시에 ISP 목록에 추가
                    if (newIssueIsp.getIspField() == null) {
                        ispField = this.ispFieldService.add(ispFieldForm);
                        newIssueIsp.setIspField(ispField);
                    }
                    // 추가 이력
                    StringBuilder sb = new StringBuilder();
                    issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    this.issueIspRepository.saveAndFlush(newIssueIsp);
                }
            }
            // 사용자가 직접 입력시
            else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
                // issueIsp 필드 폼 만들기
                IspFieldForm ispFieldForm = new IspFieldForm();
                ispFieldForm.setName(issueForm.getIspName());
                ispFieldForm.setCode(issueForm.getIspCode());
                ispFieldForm.setEmail(issueForm.getIspEmail());
                ispFieldForm.setUrl(issueForm.getIspUrl());
                ispFieldForm.setManager(issueForm.getIspManager());
                ispFieldForm.setTel(issueForm.getIspTel());
                ispFieldForm.setMemo(issueForm.getIspMemo());

                IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue);
                IspField ispField = new IspField();
                // 사용자가 직접 입력시에 ISP 목록에 추가
                if (newIssueIsp.getIspField() == null) {
                    ispField = this.ispFieldService.add(ispFieldForm);
                    newIssueIsp.setIspField(ispField);
                }
                // 추가 이력
                StringBuilder sb = new StringBuilder();
                issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
                issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                this.issueIspRepository.saveAndFlush(newIssueIsp);
            }
        }
    }