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 | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 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 be17a29..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;
@@ -52,8 +54,10 @@
* @param issueForm IssueForm
* @param issue Issue
*/
- private void CreateHostingField(IssueForm issueForm, Issue issue) {
- StringBuilder sb = new StringBuilder();
+ private void CreateHostingField(IssueForm issueForm, Issue issue, StringBuilder sb) {
+ //肄붾뱶 �쑀�슚�꽦 泥댄겕
+ this.verifyCode(issueForm);
+
// issueHosting �븘�뱶 �뤌 留뚮뱾湲�
HostingFieldForm hostingFieldForm = new HostingFieldForm();
hostingFieldForm.setName(issueForm.getHostingName());
@@ -80,8 +84,6 @@
issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingFieldForm, newIssueHosting, sb);
}
}
- // 異붽� �씠�젰
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
@@ -92,7 +94,7 @@
* @return IssueHosting
*/
private IssueHosting CreateIssueHosting(HostingFieldForm hostingFieldForm, Issue issue) {
- IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class);
+ 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());
@@ -114,23 +116,48 @@
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) {
- StringBuilder sb = new StringBuilder();
+ 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);
- IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
+ this.verifyCode(param); //肄붾뱶 �쑀�슚�꽦 泥댄겕
+
+ // 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set�빐二쇨린
if (issueHosting != null) { //�닔�젙 �떆
- // 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set �빐二쇨린
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"));
@@ -138,23 +165,28 @@
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 = CreateIssueHosting(param, issue);
// 異붽� �씠�젰
issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
- } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
+
+ }else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
// �샇�뒪�똿 �젙蹂� 吏곸젒 異붽�
- CreateHostingField(issueForm, issue);
+ 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