- 버그 수정

이민희

2022-01-17 07f4f6ad9592628ae6e0e77fdd4492b20af098fa

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

@@ -69,13 +69,14 @@

        // 사용자가 직접 입력시에 호스팅 목록에 추가
        if (newIssueHosting.getHostingField() == null) {
            hostingField = this.hostingFieldService.add(hostingFieldForm);
            newIssueHosting.setHostingField(hostingField);
            IssueHosting oldIssueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
            hostingField = this.hostingFieldService.add(hostingFieldForm);
            hostingFieldForm.setId(hostingField.getId());
            if (oldIssueHosting != null) {
                this.issueHostingRepository.deleteById(oldIssueHosting.getId());
                issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, null, hostingFieldForm, oldIssueHosting, sb);
            } else {
                newIssueHosting.setHostingField(hostingField);
                issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingFieldForm, newIssueHosting, sb);
            }
        }
@@ -118,18 +119,17 @@
    @Transactional
    public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
        if (issue != null) {
            IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
            StringBuilder sb = new StringBuilder();
            List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();

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

                if (issueHosting != null) { //수정 시
                    // 변경 이력 남기고 issueHosting에 set 해주기
                    issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    

                    issueHosting.setName(MapUtil.getString(param, "name"));
                    issueHosting.setEmail(MapUtil.getString(param, "email"));
                    issueHosting.setCode(MapUtil.getString(param, "code"));
@@ -137,7 +137,7 @@
                    issueHosting.setManager(MapUtil.getString(param, "manager"));
                    issueHosting.setTel(MapUtil.getString(param, "tel"));
                    issueHosting.setMemo(MapUtil.getString(param, "memo"));
                    

                    this.issueHostingRepository.saveAndFlush(issueHosting);

                } else { //추가 시
@@ -147,12 +147,17 @@
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    this.issueHostingRepository.saveAndFlush(newIssueHosting);
                }
            } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
            }else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
                // 호스팅 정보 직접 추가
                CreateHostingField(issueForm, issue);
            } else {
                this.issueHostingRepository.deleteByIssueId(issue.getId());
                this.issueHostingRepository.flush();

                if (issueHosting != null) {
                    issueHistoryService.detectIssueHosting(IssueHistoryType.DELETE, null, null, issueHosting, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                }
            }
        }
    }