- 버그 수정

이민희

2022-01-17 07f4f6ad9592628ae6e0e77fdd4492b20af098fa

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

@@ -48,6 +48,44 @@
    }

    /**
     * 새로운 호스팅 직접 추가
     * @param issueForm IssueForm
     * @param issue Issue
     */
    private void CreateHostingField(IssueForm issueForm, Issue issue) {
        StringBuilder sb = new StringBuilder();
        // 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) {
            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);
            }
        }
        // 추가 이력
        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
        this.issueHostingRepository.saveAndFlush(newIssueHosting);
    }

    /**
     * 이슈 호스팅 만들기
     * @param hostingFieldForm HostingFieldForm
     * @param issue 이슈
@@ -56,8 +94,8 @@
    private IssueHosting CreateIssueHosting(HostingFieldForm hostingFieldForm, Issue issue) {
        IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class);
        issueHosting.setIssue(issue);
        HostingField hostingField = this.hostingFieldService.getHosting(hostingFieldForm.getId());
        if (hostingField != null) {
        if (hostingFieldForm.getId() != null && hostingFieldForm.getId() != -1) {
            HostingField hostingField = this.hostingFieldService.getHosting(hostingFieldForm.getId());
            issueHosting.setHostingField(hostingField);
        }
        return issueHosting;
@@ -81,58 +119,45 @@
    @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);

                if (issueHostingFields != null && issueHostingFields.size() > 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());

                    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);
                    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"));

                    } 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());
                    this.issueHostingRepository.saveAndFlush(issueHosting);

                    IssueHosting newIssueHosting = CreateIssueHosting(hostingFieldForm, issue);
                    HostingField hostingField = new HostingField();
                    if (newIssueHosting.getHostingField() == null) { // 사용자가 직접 입력시에 호스팅 목록에 추가
                        hostingField = this.hostingFieldService.add(hostingFieldForm);
                        newIssueHosting.setHostingField(hostingField);
                    }
                } 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("")) {
                // 호스팅 정보 직접 추가
                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());
                }
            }
        }
    }