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/IssueIspServiceImpl.java | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
index b354bce..eeaecba 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.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.IssueIspMapper;
import kr.wisestone.owl.repository.IssueIspRepository;
import kr.wisestone.owl.service.*;
@@ -49,7 +51,10 @@
* @param issueForm IssueForm
* @param issue Issue
*/
- private void CreateIspField(IssueForm issueForm, Issue issue) {
+ private void CreateIspField(IssueForm issueForm, Issue issue, StringBuilder sb) {
+ //肄붾뱶 �쑀�슚�꽦 泥댄겕
+ this.verifyCode(issueForm);
+
// issueIsp �븘�뱶 �뤌 留뚮뱾湲�
IspFieldForm ispFieldForm = new IspFieldForm();
ispFieldForm.setName(issueForm.getIspName());
@@ -62,7 +67,6 @@
IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue);
IspField ispField = new IspField();
- StringBuilder sb = new StringBuilder();
// �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 ISP 紐⑸줉�뿉 異붽�
if (newIssueIsp.getIspField() == null) {
@@ -77,8 +81,6 @@
issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, null, ispFieldForm, newIssueIsp, sb);
}
}
- // 異붽� �씠�젰
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
this.issueIspRepository.saveAndFlush(newIssueIsp);
}
@@ -89,14 +91,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 留뚮뱾湲�
@@ -110,23 +114,49 @@
return CreateIssueIsp(ispFieldForm, 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.ISP_CODE_NOT_ENTER));
+ }
+ }
+ }
+
+ /**
+ * 肄붾뱶 �쑀�슚�꽦 寃��궗
+ * @param issueForm IssueForm
+ */
+ private void verifyCode(IssueForm issueForm) {
+ if (issueForm != null) {
+ if (issueForm.getIspCode() == null || issueForm.getIspCode().equals("")) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISP_CODE_NOT_ENTER));
+ }
+ }
+ }
+
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@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());
+
+ this.verifyCode(param); //肄붾뱶 �쑀�슚�꽦 泥댄겕
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"));
@@ -141,18 +171,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());
}
}
--
Gitblit v1.8.0