- 이슈 추가,수정 시 이력 남기는 부분 코드 수정

이민희

2022-01-17 9f30425f290c710a12b95d98a7f67ec66016b470

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

@@ -44,6 +44,42 @@
        return this.issueIspRepository;
    }

    /**
     * 새로운 ISP 직접 추가
     * @param issueForm IssueForm
     * @param issue Issue
     */
    private void CreateIspField(IssueForm issueForm, Issue issue) {
        // 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();
        StringBuilder sb = new StringBuilder();

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

    /**
     * 이슈 ISP 만들기
@@ -54,20 +90,18 @@
    private IssueIsp CreateIssueIsp(IspFieldForm ispFieldForm, Issue issue) {
        IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class);
        issueIsp.setIssue(issue);
        IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
        if (ispField != null) {
        if (ispFieldForm.getId() != null && ispFieldForm.getId() != -1) {
            IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
            issueIsp.setIspField(ispField);
        }

        return issueIsp;
    }


    /**
     *  이슈 ISP 만들기
     * @param ispFieldMap Map<String, Object> IspFieldForm map
     * @param issue 이슈
     * @return ISPIssue
     * @return IssueIsp CreateIssueIsp
     */
    private IssueIsp CreateIssueIsp(Map<String, Object> ispFieldMap, Issue issue) {
        IspFieldForm ispFieldForm = ConvertUtil.convertMapToClass(ispFieldMap, IspFieldForm.class);
@@ -75,19 +109,23 @@
        return CreateIssueIsp(ispFieldForm, issue);
    }


    //  이슈에서 사용되는 업체 값을 업데이트한다.
    @Override
    @Transactional
    public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
        if (issue != null) {
            StringBuilder sb = new StringBuilder();
            List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
            Map<String, Object> param = issueIspFields.get(0);

            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);
                    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"));
@@ -95,16 +133,12 @@
                    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);
@@ -112,28 +146,11 @@
            }
            // 사용자가 직접 입력시
            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);
                //ISP정보 직접 추가
                CreateIspField(issueForm, issue);
            } else {
                this.issueIspRepository.deleteByIssueId(issue.getId());
                this.issueIspRepository.flush();
            }
        }
    }