From 94bc0a6bad49e818e54a5438a6f202448de05ee0 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 26 1월 2022 15:51:16 +0900
Subject: [PATCH] - 이슈 수정 시 대분류만 선택하고 수정 시 오류 해결 - 전체 댓글 + 메일 보기 / 하위 이슈 댓글 + 메일 보기
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 86 +++++++++++++++++++++++++++----------------
1 files changed, 54 insertions(+), 32 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 5e55c83..932da15 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -48,6 +48,41 @@
}
/**
+ * �깉濡쒖슫 �샇�뒪�똿 吏곸젒 異붽�
+ * @param issueForm IssueForm
+ * @param issue Issue
+ */
+ private void CreateHostingField(IssueForm issueForm, Issue issue, StringBuilder sb) {
+ // 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 �씠�뒋
@@ -56,8 +91,8 @@
private IssueHosting CreateIssueHosting(HostingFieldForm hostingFieldForm, Issue issue) {
IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class);
issueHosting.setIssue(issue);
- HostingField hostingField = this.hostingFieldService.getHosting(hostingFieldForm.getId());
- if (hostingField != null) {
+ if (hostingFieldForm.getId() != null && hostingFieldForm.getId() != -1) {
+ HostingField hostingField = this.hostingFieldService.getHosting(hostingFieldForm.getId());
issueHosting.setHostingField(hostingField);
}
return issueHosting;
@@ -79,15 +114,17 @@
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@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();
- Map<String, Object> param = issueHostingFields.get(0);
-
if (issueHostingFields != null && issueHostingFields.size() > 0) {
- IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
+ Map<String, Object> param = issueHostingFields.get(0);
if (issueHosting != null) { //�닔�젙 �떆
+ // 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set �빐二쇨린
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
+
issueHosting.setName(MapUtil.getString(param, "name"));
issueHosting.setEmail(MapUtil.getString(param, "email"));
issueHosting.setCode(MapUtil.getString(param, "code"));
@@ -95,43 +132,28 @@
issueHosting.setManager(MapUtil.getString(param, "manager"));
issueHosting.setTel(MapUtil.getString(param, "tel"));
issueHosting.setMemo(MapUtil.getString(param, "memo"));
- // 蹂�寃� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+
this.issueHostingRepository.saveAndFlush(issueHosting);
} else { //異붽� �떆
IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
// 異붽� �씠�젰
- StringBuilder sb = new StringBuilder();
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("")) {
- // 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) { // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 �샇�뒪�똿 紐⑸줉�뿉 異붽�
- hostingField = this.hostingFieldService.add(hostingFieldForm);
- newIssueHosting.setHostingField(hostingField);
+ }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);
}
- // 異붽� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
+ //issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
}
--
Gitblit v1.8.0