- 이슈 호스팅/isp 생성시 id가 호스팅/isp 필드 id 입력되는 오류 수정

jhjang

2022-02-08 db658dfc2bd0a2919b9566c6e0683ebd44b72de8

 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,22 +62,20 @@

        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());
            ispField = this.ispFieldService.add(ispFieldForm);
            ispFieldForm.setId(ispField.getId());
            if (oldIssueIsp != null) {
                issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, null, ispFieldForm, oldIssueIsp, sb);
                this.issueIspRepository.deleteById(oldIssueIsp.getId());
            } else {
                newIssueIsp.setIspField(ispField);
                issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, null, ispFieldForm, newIssueIsp, sb);
            }
        }
        // 추가 이력
        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
        this.issueIspRepository.saveAndFlush(newIssueIsp);
    }

@@ -88,14 +86,16 @@
     * @return IssueIsp
     */
    private IssueIsp CreateIssueIsp(IspFieldForm ispFieldForm, Issue issue) {
        IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class);
        IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class, "id");
        issueIsp.setIssue(issue);
        if (ispFieldForm.getId() != null && ispFieldForm.getId() != -1) {
            IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
            issueIsp.setIspField(ispField);
        }

        return issueIsp;
    }


    /**
     *  이슈 ISP 만들기
@@ -109,23 +109,22 @@
        return CreateIssueIsp(ispFieldForm, issue);
    }


    //  이슈에서 사용되는 업체 값을 업데이트한다.
    @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);
                    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"));
@@ -140,18 +139,21 @@
                    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);
                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());
        }
    }