From 617835a40ab2f88f8eadb0107e9c8c03ea108c72 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 09 2월 2022 18:02:55 +0900
Subject: [PATCH] - 이슈 추가, 수정 시 isp와 호스팅 CODE 유효성 체크
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 181 ++++++++++++++++++++++++++++++++-------------
1 files changed, 129 insertions(+), 52 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
index 0817429..36d686e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -1,7 +1,9 @@
package kr.wisestone.owl.service.impl;
+import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.IssueHistoryType;
+import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.HostingFieldMapper;
import kr.wisestone.owl.mapper.IssueHostingMapper;
import kr.wisestone.owl.repository.IssueHostingRepository;
@@ -11,6 +13,7 @@
import kr.wisestone.owl.vo.IssueHostingVo;
import kr.wisestone.owl.web.condition.IssueCondition;
import kr.wisestone.owl.web.form.HostingFieldForm;
+import kr.wisestone.owl.web.form.IspFieldForm;
import kr.wisestone.owl.web.form.IssueForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,6 +36,9 @@
private HostingFieldService hostingFieldService;
@Autowired
+ private IssueService issueService;
+
+ @Autowired
private IssueHistoryService issueHistoryService;
@Autowired
@@ -43,73 +49,144 @@
return this.issueHostingRepository;
}
+ /**
+ * �깉濡쒖슫 �샇�뒪�똿 吏곸젒 異붽�
+ * @param issueForm IssueForm
+ * @param issue Issue
+ */
+ private void CreateHostingField(IssueForm issueForm, Issue issue, StringBuilder sb) {
+ //肄붾뱶 �쑀�슚�꽦 泥댄겕
+ this.verifyCode(issueForm);
+
+ // issueHosting �븘�뱶 �뤌 留뚮뱾湲�
+ HostingFieldForm hostingFieldForm = new HostingFieldForm();
+ hostingFieldForm.setName(issueForm.getHostingName());
+ hostingFieldForm.setCode(issueForm.getHostingCode());
+ hostingFieldForm.setEmail(issueForm.getHostingEmail());
+ hostingFieldForm.setUrl(issueForm.getHostingUrl());
+ hostingFieldForm.setManager(issueForm.getHostingManager());
+ hostingFieldForm.setTel(issueForm.getHostingTel());
+ hostingFieldForm.setMemo(issueForm.getHostingMemo());
+
+ IssueHosting newIssueHosting = CreateIssueHosting(hostingFieldForm, issue);
+ HostingField hostingField = new HostingField();
+
+ // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 �샇�뒪�똿 紐⑸줉�뿉 異붽�
+ if (newIssueHosting.getHostingField() == null) {
+ IssueHosting oldIssueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
+ hostingField = this.hostingFieldService.add(hostingFieldForm);
+ hostingFieldForm.setId(hostingField.getId());
+ if (oldIssueHosting != null) {
+ this.issueHostingRepository.deleteById(oldIssueHosting.getId());
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, null, hostingFieldForm, oldIssueHosting, sb);
+ } else {
+ newIssueHosting.setHostingField(hostingField);
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingFieldForm, newIssueHosting, sb);
+ }
+ }
+ this.issueHostingRepository.saveAndFlush(newIssueHosting);
+ }
+
+ /**
+ * �씠�뒋 �샇�뒪�똿 留뚮뱾湲�
+ * @param hostingFieldForm HostingFieldForm
+ * @param issue �씠�뒋
+ * @return IssueHosting
+ */
+ private IssueHosting CreateIssueHosting(HostingFieldForm hostingFieldForm, Issue issue) {
+ IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class, "id");
+ issueHosting.setIssue(issue);
+ if (hostingFieldForm.getId() != null && hostingFieldForm.getId() != -1) {
+ HostingField hostingField = this.hostingFieldService.getHosting(hostingFieldForm.getId());
+ issueHosting.setHostingField(hostingField);
+ }
+ return issueHosting;
+ }
+
+
+ /**
+ * �씠�뒋 �샇�뒪�똿 留뚮뱾湲�
+ * @param hostingFieldMap Map<String, Object> hostingFieldMap
+ * @param issue �씠�뒋
+ * @return IssueHosting
+ */
+ private IssueHosting CreateIssueHosting(Map<String, Object> hostingFieldMap, Issue issue) {
+ HostingFieldForm hostingFieldForm = ConvertUtil.convertMapToClass(hostingFieldMap, HostingFieldForm.class);
+ hostingFieldForm.setId(MapUtil.getLong(hostingFieldMap, "hostingId"));
+ return CreateIssueHosting(hostingFieldForm, issue);
+ }
+
+ /**
+ * 肄붾뱶 �쑀�슚�꽦 寃��궗
+ * @param param Map<String, Object>
+ */
+ private void verifyCode(Map<String, Object> param) {
+ if (param != null) {
+ if (MapUtil.getString(param, "code") == null || Objects.equals(MapUtil.getString(param, "code"), "")) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.HOSTING_CODE_NOT_ENTER));
+ }
+ }
+ }
+
+ /**
+ * 肄붾뱶 �쑀�슚�꽦 寃��궗
+ * @param issueForm IssueForm
+ */
+ private void verifyCode(IssueForm issueForm) {
+ if (issueForm != null) {
+ if (issueForm.getHostingCode() == null || issueForm.getHostingCode().equals("")) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.HOSTING_CODE_NOT_ENTER));
+ }
+ }
+ }
+
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
- public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
+ public void modifyIssueHostingField(Issue issue, IssueForm issueForm, StringBuilder sb) {
if (issue != null) {
+ IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
if (issueHostingFields != null && issueHostingFields.size() > 0) {
Map<String, Object> param = issueHostingFields.get(0);
- if (param != null && param.get("hostingId") != null && param.get("hostingId") != "") {
- HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));
+ this.verifyCode(param); //肄붾뱶 �쑀�슚�꽦 泥댄겕
- Set<IssueHosting> issueHostings = issue.getIssueHostingFields();
- IssueHosting issueHosting = new IssueHosting();
+ // 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set�빐二쇨린
+ if (issueHosting != null) { //�닔�젙 �떆
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
- if (issueHostings != null && issueHostings.size() >0){//�닔�젙 �븷 寃쎌슦
- issueHosting = issueHostings.iterator().next();
- // 蹂�寃� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ issueHosting.setName(MapUtil.getString(param, "name"));
+ issueHosting.setEmail(MapUtil.getString(param, "email"));
+ issueHosting.setCode(MapUtil.getString(param, "code"));
+ issueHosting.setUrl(MapUtil.getString(param, "url"));
+ issueHosting.setManager(MapUtil.getString(param, "manager"));
+ issueHosting.setTel(MapUtil.getString(param, "tel"));
+ issueHosting.setMemo(MapUtil.getString(param, "memo"));
- issueHosting.setHostingField(hostingField);
- issueHosting.setName(MapUtil.getString(param, "name"));
- issueHosting.setEmail(MapUtil.getString(param, "email"));
- issueHosting.setCode(MapUtil.getString(param, "code"));
- issueHosting.setUrl(MapUtil.getString(param, "url"));
- issueHosting.setManager(MapUtil.getString(param, "manager"));
- issueHosting.setTel(MapUtil.getString(param, "tel"));
- issueHosting.setMemo(MapUtil.getString(param, "memo"));
- }else{//異붽� �븷 寃쎌슦
- issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
- issueHosting.setIssue(issue);
- if (hostingField != null) {
- issueHosting.setHostingField(hostingField);
- }
- // 異붽� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, issueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- }
this.issueHostingRepository.saveAndFlush(issueHosting);
- }else {
- this.issueHostingRepository.deleteById(MapUtil.getLong(param, "id"));
- }
- } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
- HostingFieldForm hostingFieldForm = new HostingFieldForm();
- hostingFieldForm.setName(issueForm.getHostingName());
- hostingFieldForm.setCode(issueForm.getHostingCode());
- hostingFieldForm.setEmail(issueForm.getHostingEmail());
- hostingFieldForm.setUrl(issueForm.getHostingUrl());
- hostingFieldForm.setManager(issueForm.getHostingManager());
- hostingFieldForm.setTel(issueForm.getHostingTel());
- hostingFieldForm.setMemo(issueForm.getHostingMemo());
- HostingField hostingField = this.hostingFieldService.add(hostingFieldForm);
- IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class);
- issueHosting.setIssue(issue);
- if (hostingField != null) {
- issueHosting.setHostingField(hostingField);
+ } else { //異붽� �떆
+ IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
+ // 異붽� �씠�젰
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
+ this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
- // 異붽� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingField, issueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueHostingRepository.saveAndFlush(issueHosting);
+
+ }else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
+ // �샇�뒪�똿 �젙蹂� 吏곸젒 異붽�
+ CreateHostingField(issueForm, issue, sb);
+ } else {
+ this.issueHostingRepository.deleteByIssueId(issue.getId());
+ this.issueHostingRepository.flush();
+
+ if (issueHosting != null) {
+ issueHistoryService.detectIssueHosting(IssueHistoryType.DELETE, null, null, issueHosting, sb);
+ }
}
+ //issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
}
--
Gitblit v1.8.0