From 2b1333088342a6962ac91648003da5275c539e88 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 일, 12 12월 2021 22:17:37 +0900
Subject: [PATCH] - 히스토리 코드 분리
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 7f68b4e..f05fc49 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1663,40 +1663,42 @@
private Issue modifyIssueForApi(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
CheckIssueData checkIssueData = this.checkIssue(user, issueForm);
- Issue issue = checkIssueData.getIssue();
- Project project = checkIssueData.getProject();
- IssueType issueType = checkIssueData.getIssueType();
- IssueStatus oldIssueStatus = checkIssueData.getOldIssueStatus();
- IssueStatus issueStatus = checkIssueData.getNewIssueStatus();
+ // �씠�뒋 �씠�젰 �궓湲곌린
+ this.addIssueHistoryModify(user, issueForm, checkIssueData, multipartFiles);
+ // db�뿉 ���옣
+ return this.saveIssue(issueForm, checkIssueData);
+ }
+
+ private void addIssueHistoryModify(User user, IssueForm issueForm, CheckIssueData checkIssueData, List<MultipartFile> multipartFiles) {
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
StringBuilder detectIssueChange = this.issueHistoryService.detectIssueChange(issueForm, checkIssueData, multipartFiles);
// �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �씠�뒋 �꽆踰꾨�� �깉濡� �뵲�빞 �븳�떎.
- this.checkChangeProject(checkIssueData.getProject(), issue);
+ this.checkChangeProject(checkIssueData.getProject(), checkIssueData.getIssue());
// �씠�뒋 �쑀�삎�씠 蹂�寃쎈릺�뿀�뒗吏� �솗�씤�븯怨� 蹂�寃쎈릺�뿀�떎硫� �씠�뒋 �긽�깭 �냽�꽦�씠 '��湲�' �씤 �씠�뒋 �긽�깭濡� 援먯껜�븳�떎.
- if (this.checkChangeIssueType(issueType, issueStatus, issue)) {
- issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
+ if (this.checkChangeIssueType(checkIssueData.getIssueType(), checkIssueData.getNewIssueStatus(), checkIssueData.getIssue())) {
+ checkIssueData.setNewIssueStatus(this.issueStatusService.findByIssueStatusTypeIsReady(checkIssueData.getIssueType().getWorkflow()));
// �씠�뒋 �긽�깭 蹂�寃� �씠�젰 �궓湲곌린 - �씠�젰�쓣 �궓湲곌린 �쐞�빐 issueForm �뿉 issueStatus Id 媛믪쓣 ���옣.
- issueForm.setIssueStatusId(issueStatus.getId());
- this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
+ issueForm.setIssueStatusId(checkIssueData.getNewIssueStatus().getId());
+ this.issueHistoryService.detectIssueStatus(checkIssueData.getIssue(), issueForm, detectIssueChange, checkIssueData.getOldIssueStatus(), checkIssueData.getNewIssueStatus());
}
// db�뿉 ���옣
- issue = this.saveIssue(issueForm, checkIssueData);
+// checkIssueData.setIssue(this.saveIssue(issueForm, checkIssueData));
// �씠�뒋 �씠�젰 �벑濡�
if (!StringUtils.isEmpty(detectIssueChange.toString())) {
- this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
+ this.issueHistoryService.addIssueHistory(checkIssueData.getIssue(), user, IssueHistoryType.MODIFY, detectIssueChange.toString());
}
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));
-
- return issue;
}
+
+
private Issue saveIssue(IssueForm issueForm, CheckIssueData checkIssueData) {
Issue issue = checkIssueData.getIssue();
ConvertUtil.copyProperties(issueForm, issue, "id");
--
Gitblit v1.8.0