이슈 - 업체,ISP,HOSTING 수정 시 중복코드 제거

이민희

2021-11-19 43aeca7b31394ab56ceecf2e054e01b758a2e953

이슈 - 업체,ISP,HOSTING 수정 시 중복코드 제거

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

@@ -44,11 +44,12 @@
                Map<String, Object> param = issueCompanyFields.get(0);

                if (param != null) {
                    CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId"));
                    CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId")); //companyId 가져오기

                    Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
                    IssueCompany issueCompany = null;
                    if (issueCompanies != null && issueCompanies.size() > 0) {

                    if (issueCompanies != null && issueCompanies.size() > 0) { //수정 할 경우
                        issueCompany = issueCompanies.iterator().next();
                        issueCompany.setCompanyField(companyField);
                        issueCompany.setName(MapUtil.getString(param, "name"));
@@ -56,7 +57,7 @@
                        issueCompany.setManager(MapUtil.getString(param, "manager"));
                        issueCompany.setTel(MapUtil.getString(param, "tel"));
                        issueCompany.setMemo(MapUtil.getString(param, "memo"));
                    } else  {
                    } else  { //추가 할 경우
                        issueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
                        issueCompany.setIssue(issue);
                        issueCompany.setCompanyField(companyField);

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

@@ -49,9 +49,10 @@
                    HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));

                    Set<IssueHosting> issueHostings = issue.getIssueHostingFields();
                    if (issueHostings != null && issueHostings.size() >0){
                        IssueHosting issueHosting = issueHostings.iterator().next();
                    IssueHosting issueHosting = null;

                    if (issueHostings != null && issueHostings.size() >0){//수정 할 경우
                        issueHosting = issueHostings.iterator().next();
                        issueHosting.setHostingField(hostingField);
                        issueHosting.setName(MapUtil.getString(param, "name"));
                        issueHosting.setEmail(MapUtil.getString(param, "email"));
@@ -59,16 +60,12 @@
                        issueHosting.setManager(MapUtil.getString(param, "manager"));
                        issueHosting.setTel(MapUtil.getString(param, "tel"));
                        issueHosting.setMemo(MapUtil.getString(param, "memo"));

                        this.issueHostingRepository.saveAndFlush(issueHosting);
                    }else{
                        IssueHosting newIssueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
                        newIssueHosting.setIssue(issue);
                        newIssueHosting.setHostingField(hostingField);

                        this.issueHostingRepository.saveAndFlush(newIssueHosting);
                    }else{//추가 할 경우
                        issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
                        issueHosting.setIssue(issue);
                        issueHosting.setHostingField(hostingField);
                    }

                    this.issueHostingRepository.saveAndFlush(issueHosting);
                }
            }
        }

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

@@ -47,9 +47,10 @@
                    IspField ispField = this.ispFieldService.getIsp(MapUtil.getLong(param, "ispId"));

                    Set<IssueIsp> issueIsps = issue.getIssueIspFields();
                    if (issueIsps != null && issueIsps.size() > 0) {
                        IssueIsp issueIsp = issueIsps.iterator().next();
                    IssueIsp issueIsp = null;

                    if (issueIsps != null && issueIsps.size() > 0) {//수정 할 경우
                        issueIsp = issueIsps.iterator().next();
                        issueIsp.setIspField(ispField);
                        issueIsp.setName(MapUtil.getString(param, "name"));
                        issueIsp.setEmail(MapUtil.getString(param, "email"));
@@ -57,16 +58,12 @@
                        issueIsp.setManager(MapUtil.getString(param, "manager"));
                        issueIsp.setTel(MapUtil.getString(param, "tel"));
                        issueIsp.setMemo(MapUtil.getString(param, "memo"));

                        this.issueIspRepository.saveAndFlush(issueIsp);

                    } else  {
                        IssueIsp newIssueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
                        newIssueIsp.setIssue(issue);
                        newIssueIsp.setIspField(ispField);

                        this.issueIspRepository.saveAndFlush(newIssueIsp);
                    } else  {//추가 할 경우
                        issueIsp = ConvertUtil.convertMapToClass(param, IssueIsp.class);
                        issueIsp.setIssue(issue);
                        issueIsp.setIspField(ispField);
                    }
                    this.issueIspRepository.saveAndFlush(issueIsp);
                }
            }
        }