이슈 히스토리 - 중복되어서 나오는 문제 해결 및 업체에 추가된 항목들도 변경 시 이력 남기도록 수정

이민희

2022-01-19 b2b8a75a8f5a35717bb89a07c2fe35ea16b6a99c

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

@@ -49,7 +49,7 @@
     * @param issueForm IssueForm
     * @param issue Issue
     */
    private void CreateIspField(IssueForm issueForm, Issue issue) {
    private void CreateIspField(IssueForm issueForm, Issue issue, StringBuilder sb) {
        // issueIsp 필드 폼 만들기
        IspFieldForm ispFieldForm = new IspFieldForm();
        ispFieldForm.setName(issueForm.getIspName());
@@ -62,7 +62,6 @@

        IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue);
        IspField ispField = new IspField();
        StringBuilder sb = new StringBuilder();

        // 사용자가 직접 입력시에 ISP 목록에 추가
        if (newIssueIsp.getIspField() == null) {
@@ -77,8 +76,6 @@
                issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, null, ispFieldForm, newIssueIsp, sb);
            }
        }
        // 추가 이력
        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
        this.issueIspRepository.saveAndFlush(newIssueIsp);
    }

@@ -116,46 +113,47 @@
    //  이슈에서 사용되는 업체 값을 업데이트한다.
    @Override
    @Transactional
    public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
    public void modifyIssueIspField(Issue issue, IssueForm issueForm, StringBuilder sb) {
        if (issue != null) {
            StringBuilder sb = new StringBuilder();
            IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
            List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();

            if (issueIspFields != null && issueIspFields.size() > 0) {
                Map<String, Object> param = issueIspFields.get(0);

                    IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
                if (issueIsp != null) {//수정 시
                    // 변경 이력 남기고 issueIsp에 set해주기
                    issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);

                    if (issueIsp != null) {//수정 시
                        // 변경 이력 남기고 issueIsp에 set해주기
                        issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    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"));

                        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"));
                    this.issueIspRepository.saveAndFlush(issueIsp);

                        this.issueIspRepository.saveAndFlush(issueIsp);
                } else { //추가 시
                    IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
                    // 추가 이력
                    issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
                    this.issueIspRepository.saveAndFlush(newIssueIsp);
                }

                    } else { //추가 시
                        IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
                        // 추가 이력
                        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("")) {
            } else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
                //ISP정보 직접 추가
                CreateIspField(issueForm, issue);
            }
            else {
                CreateIspField(issueForm, issue, sb);
            } else {
                this.issueIspRepository.deleteByIssueId(issue.getId());
                this.issueIspRepository.flush();

                if (issueIsp != null) {
                    issueHistoryService.detectIssueIsp(IssueHistoryType.DELETE, null, null, issueIsp, sb);
                }
            }
            //issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
        }
    }