- 이슈 수정 시 파트너 정보 수정 오류 - 이슈 상세 페이지에서 연관/하위 이슈의 파트너 정보 보여주기

이민희

2022-01-14 716586b849dd2368fb59a54adeda2d65122f643b

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

@@ -31,6 +31,9 @@
    private IspFieldService ispFieldService;

    @Autowired
    private IssueService issueService;

    @Autowired
    private IssueHistoryService issueHistoryService;

    @Autowired
@@ -41,51 +44,75 @@
        return this.issueIspRepository;
    }


    /**
     * 이슈 ISP 만들기
     * @param ispFieldForm IspFieldForm
     * @param issue 이슈
     * @return IssueIsp
     */
    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) {
            issueIsp.setIspField(ispField);
        }

        return issueIsp;
    }


    /**
     *  이슈 ISP 만들기
     * @param ispFieldMap Map<String, Object> IspFieldForm map
     * @param issue 이슈
     * @return ISPIssue
     */
    private IssueIsp CreateIssueIsp(Map<String, Object> ispFieldMap, Issue issue) {
        IspFieldForm ispFieldForm = ConvertUtil.convertMapToClass(ispFieldMap, IspFieldForm.class);
        ispFieldForm.setId(MapUtil.getLong(ispFieldMap, "ispId"));
        return CreateIssueIsp(ispFieldForm, issue);
    }


    //  이슈에서 사용되는 업체 값을 업데이트한다.
    @Override
    @Transactional
    public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
        if (issue != null) {
            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 (param != null && param.get("ispId") != null  && param.get("ispId") != "") {
                    IspField ispField = this.ispFieldService.getIsp(MapUtil.getLong(param, "ispId"));

                    Set<IssueIsp> issueIsps = issue.getIssueIspFields();
                    IssueIsp issueIsp = new IssueIsp();
                    if (issueIsps != null && issueIsps.size() > 0) {//수정 할 경우
                        issueIsp = issueIsps.iterator().next();
                        // 변경 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());

                        issueIsp.setIspField(ispField);
                        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"));
                    } else  {//추가 할 경우
                        issueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
                        issueIsp.setIssue(issue);
                        if (ispField != null) {
                            issueIsp.setIspField(ispField);
                        }
                        // 추가 이력
                        StringBuilder sb = new StringBuilder();
                        issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, issueIsp, sb);
                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    }
                if (issueIsp != null) {//수정 시
                    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"));
                    // 변경 이력
                    StringBuilder sb = new StringBuilder();
                    issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                    this.issueIspRepository.saveAndFlush(issueIsp);
                }else {
                    this.issueIspRepository.deleteById(MapUtil.getLong(param, "id"));

                } 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);
                }
            } else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
            }
            // 사용자가 직접 입력시
            else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
                // issueIsp 필드 폼 만들기
                IspFieldForm ispFieldForm = new IspFieldForm();
                ispFieldForm.setName(issueForm.getIspName());
                ispFieldForm.setCode(issueForm.getIspCode());
@@ -95,17 +122,18 @@
                ispFieldForm.setTel(issueForm.getIspTel());
                ispFieldForm.setMemo(issueForm.getIspMemo());

                IspField ispField = this.ispFieldService.add(ispFieldForm);
                IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class);
                issueIsp.setIssue(issue);
                if (ispField != null) {
                    issueIsp.setIspField(ispField);
                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, null, ispField, issueIsp, sb);
                issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
                issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                this.issueIspRepository.saveAndFlush(issueIsp);
                this.issueIspRepository.saveAndFlush(newIssueIsp);
            }
        }
    }