From 145928e42a8ae18129fcbc720824a9e4f78999bd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 17 12월 2021 17:23:03 +0900
Subject: [PATCH] 상위이슈의 상세페이지에서 하위이슈에 대한 활동내역 보여주기
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 76 insertions(+), 24 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 61764f3..96d90c3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -211,6 +211,15 @@
this.issueVersionService.addIssueVersion(issue);
}
+ @Override
+ @Transactional
+ public void addIssueVersion(Long id, Long userId) {
+ Issue issue = this.getIssue(id);
+ User user = this.userService.getUser(userId);
+ // �씠�뒋 踰꾩쟾 �깮�꽦
+ this.issueVersionService.addIssueVersion(issue, user);
+ }
+
private IssueForm convertToIssueForm(IssueApiForm issueApiForm, User user) {
if (issueApiForm.getIssueTypeId() == null) {
@@ -366,10 +375,11 @@
IssueForm issueForm = this.convertToIssueForm(issueApiForm, user);
List<Issue> issues = Lists.newArrayList();
- if (issueForm.getParentIssueId() != null) {
+ if (issueForm.getParentIssueId() != null // 湲곗〈 異붽��맂 �긽�쐞 �씪媛먯씠 �뾾嫄곕굹 �꽕�젙�맂 以묐났 �씠�뒋 id媛� �뾾�쓣�븣
+ || issueApiForm.getUseIssueCustomFieldIds().size() == 0) {
issues.add(addIssue(user, issueForm, issueApiForm.getMultipartFiles()));
} else {
- // �긽�쐞 �씠�뒋 異붽�
+ // 媛��긽 �긽�쐞 �씠�뒋 異붽�
IssueForm parentIssueForm = issueForm.clone();
parentIssueForm.setUseIssueCustomFields(issueApiForm.getUseIssueCustomFieldIds());
Issue issue = addIssue(user, parentIssueForm, null);
@@ -1512,6 +1522,8 @@
this.setRegister(downIssue, downIssueVo); // �벑濡앹옄
this.setIssueDepartment(downIssue, downIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setIssueCustomFields(downIssue, downIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
+ this.setIssueHistory(downIssue, downIssueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
+ this.setIssueComments(downIssue, downIssueVo); // �뙎湲� �젙蹂� �뀑�똿
resultList.add(downIssueVo);
}
@@ -1535,10 +1547,10 @@
this.setIssueDepartment(issue, issueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
- this.setIssueComments(issue, issueVo); // �뙎湲� �젙蹂� �뀑�똿
- this.setIssueHistory(issue, issueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
this.setDownIssues(issue, issueVo); //�븯�쐞 �씪媛� �꽭�똿
+ this.setIssueComments(issue, issueVo); // �뙎湲� �젙蹂� �뀑�똿
+ this.setIssueHistory(issue, issueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
IssueType issueType = this.issueTypeService.getIssueType(issueVo.getIssueTypeVo().getId()); // �씠�뒋�쓽 �씠�뒋�쑀�삎 媛앹껜
Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
@@ -1560,7 +1572,7 @@
this.setParentIssue(issue,issueVo); //�긽�쐞 �씠�뒋 �젙蹂� �꽭�똿
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- if (user != null && this.checkHasPermission(issueVo, issueVo.getUserVos(), user, issueVo.getDepartmentVos())) {
+ if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user, issueVo.getDepartmentVos())) {
issueVo.setModifyPermissionCheck(Boolean.TRUE);
}
}
@@ -1720,7 +1732,7 @@
// �씠�뒋 湲곕줉 �젙蹂대�� �뀑�똿�븳�떎.
private void setIssueHistory(Issue issue, IssueVo issueVo) {
- issueVo.setIssueHistoryVos(this.issueHistoryService.findIssueHistory(issue.getId()));
+ issueVo.setIssueHistoryVos(this.issueHistoryService.findIssueHistory(issue));
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 媛숈� �씠�뒋 李얘린
@@ -2232,6 +2244,19 @@
this.verifyIssueModifyPermission(issue, user);
IssueStatus issueStatus = this.issueStatusService.getIssueStatus(issueForm.getIssueStatusId());
+
+ if (issueStatus.getIssueStatusType().toString().equals("CLOSE")) {
+ List<String> downIssuesStatus = issueForm.getDownIssuesStatus();
+ if (downIssuesStatus != null && downIssuesStatus.size() > 0) {
+ for (String downIssueStatus : downIssuesStatus) {
+ if (!downIssueStatus.equals("CLOSE")) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_MODIFY_STATUS));
+ }
+ }
+ }
+ }
+
// �씠�뒋 �긽�깭瑜� 蹂�寃쏀븷 �븣 �꽑�깮�븳 �씠�뒋 �긽�깭濡� 蹂�寃쏀븷 �닔 �엳�뒗吏� �솗�씤�븳�떎.
this.issueStatusService.checkNextIssueStatus(issue, issueStatus);
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
@@ -2869,7 +2894,7 @@
Map<String, Priority> priorityMaps = new HashMap<>(); // �슦�꽑 �닚�쐞 紐⑥쓬
Map<String, Severity> severityMaps = new HashMap<>(); // 以묒슂�룄 紐⑥쓬
Map<String, Object> userMaps = new HashMap<>(); // �궗�슜�옄 紐⑥쓬
- Map<String, Object> departmentMaps = new HashMap<>(); // 遺��꽌 紐⑥쓬
+ Map<String, DepartmentVo> departmentMaps = new HashMap<>(); // 遺��꽌 紐⑥쓬
Map<String, CustomField> customFieldMaps = new HashMap<>();
Map<String, IssueStatus> issueStatusReadyMaps = new HashMap<>(); // �긽�깭 �냽�꽦 '��湲�'�씤 �씠�뒋 �긽�깭
Map<Long, Long> issueNumberMaps = new HashMap<>(); // �씠�뒋 踰덊샇 紐⑥쓬
@@ -2919,7 +2944,7 @@
// 1踰� �뿤�뜑遺��꽣 �뜲�씠�꽣 �쁺�뿭
if (rowIndex > 1) {
// �씠�뒋濡� �벑濡앺븯湲� �쐞�빐 IssueForm �뿉 �뜲�씠�꽣瑜� �뀑�똿�븳�떎.
- issueForms.add(this.setIssueFormToExcelField(row, (rowIndex + 1), issueStatusReadyMaps, projectMaps, issueTypeMaps, priorityMaps, severityMaps, userMaps, customFieldMaps, issueNumberMaps, headers));
+ issueForms.add(this.setIssueFormToExcelField(row, (rowIndex + 1), issueStatusReadyMaps, projectMaps, issueTypeMaps, priorityMaps, severityMaps, userMaps, departmentMaps, customFieldMaps, issueNumberMaps, headers));
}
}
@@ -3070,7 +3095,7 @@
// �씠�뒋�쓽 二쇱슂 �냽�꽦�쓣 map �뿉 ���옣�븯�뿬 �뿊�� import �뿉�꽌 吏��젙�븳 ���긽(�씠�뒋 �냽�꽦)�쓣 鍮좊Ⅴ寃� 李얠쓣 �닔 �엳寃� �븳�떎.
private void IssueAttributeMapToList(Map<String, Project> projectMaps, Map<String, IssueType> issueTypeMaps, Map<String, Priority> priorityMaps, Map<String, Severity> severityMaps,
- Map<String, Object> userMaps, Map<String, Object> departmentMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, Map<String, Long> issueTypeCustomFieldMaps, Map<String, IssueStatus> issueStatusReadyMaps) {
+ Map<String, Object> userMaps, Map<String, DepartmentVo> departmentMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, Map<String, Long> issueTypeCustomFieldMaps, Map<String, IssueStatus> issueStatusReadyMaps) {
// �봽濡쒖젥�듃 �궎濡� 諛붾줈 李얠쓣 �닔 �엳寃� 以�鍮�
List<Project> projects = this.projectService.findByWorkspaceId();
List<Long> projectIds = Lists.newArrayList();
@@ -3094,16 +3119,7 @@
for (Map<String, Object> user : users) {
userMap.put(CommonUtil.decryptAES128(MapUtil.getString(user, "account")), MapUtil.getLong(user, "userId"));
}
-
userMaps.put(project.getProjectKey(), userMap);
-
- // �봽濡쒖젥�듃�뿉 李몄뿬�븯�뒗 遺��꽌 �젙蹂�
- List<Map<String, Object>> departments = this.departmentService.findProjectDepartment(project);
- List<Long> departmentList = Lists.newArrayList();
- // 遺��꽌 �젙蹂대�� ���옣
- for (Map<String, Object> department : departments) {
- departmentList.add(MapUtil.getLong(department, "departmentId"));
- }
}
// �씠�뒋 �쑀�삎�쓣 諛붾줈 李얠쓣 �닔 �엳寃� 以�鍮�
@@ -3113,6 +3129,13 @@
IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
issueStatusReadyMaps.put(issueType.getId().toString(), issueStatus);
+
+ // �썙�겕�뵆濡쒖슦�뿉 �냽�빐�엳�뒗 遺��꽌 �젙蹂�
+ List<DepartmentVo> departments = this.departmentService.findWorkflowDepartment(issueType.getId());
+ // 遺��꽌 �젙蹂대�� ���옣
+ for (DepartmentVo department : departments) {
+ departmentMaps.put(department.getDepartmentName(), department);
+ }
}
// �슦�꽑�닚�쐞瑜� 諛붾줈 李얠쓣 �닔 �엳寃� 以�鍮�
@@ -3136,7 +3159,7 @@
// �뿊�� �븘�뱶�뿉 �엳�뒗 �젙蹂대�� �씠�뒋 form �쑝濡� �삷湲대떎.
private IssueForm setIssueFormToExcelField(Row row, int rowIndex, Map<String, IssueStatus> issueStatusReadyMaps, Map<String, Project> projectMaps, Map<String, IssueType> issueTypeMaps, Map<String,
- Priority> priorityMaps, Map<String, Severity> severityMaps, Map<String, Object> userMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, List<String> headers) {
+ Priority> priorityMaps, Map<String, Severity> severityMaps, Map<String, Object> userMaps, Map<String, DepartmentVo> departmentMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, List<String> headers) {
IssueForm issueForm = new IssueForm();
issueForm.setRegisterId(this.webAppUtil.getLoginId());
Project project = null;
@@ -3180,9 +3203,13 @@
// 以묒슂�룄瑜� IssueForm �뿉 ���옣�븳�떎.
this.setIssueFormSeverity(cell, severityMaps, issueForm, rowIndex);
break;
+ /*case 6:
+ // �떞�떦�옄瑜� IssueForm �뿉 ���옣�븳�떎.
+ this.setIssueFormAssignee(cell, userMaps, issueForm, project);
+ break;*/
case 6:
// �떞�떦遺��꽌瑜� IssueForm �뿉 ���옣�븳�떎.
- this.setIssueFormAssignee(cell, userMaps, issueForm, project);
+ this.setIssueFormDepartment(cell, departmentMaps, issueForm, project);
break;
case 7:
// �떆�옉�씪�쓣 IssueForm �뿉 ���옣�븳�떎.
@@ -3193,7 +3220,7 @@
this.setIssueFormPeriod(cell, issueForm, false, rowIndex);
break;
default:
- // 8踰� �씠�긽遺��꽣�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶. �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� IssueForm �뿉 ���옣�븳�떎.
+ // 9踰� 遺��꽣�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶. �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� IssueForm �뿉 ���옣�븳�떎.
this.setIssueFormCustomFieldValue(cell, customFieldMaps, issueForm, headers.get(cellIndex), rowIndex);
}
}
@@ -3322,20 +3349,39 @@
issueForm.setSeverityId(severity.getId());
}
- // �떞�떦遺��꽌瑜� IssueForm �뿉 ���옣�븳�떎.
private void setIssueFormAssignee(Cell cell, Map<String, Object> userMaps, IssueForm issueForm, Project project) {
if (cell != null) {
String[] splitAssignee = CommonUtil.convertExcelStringToCell(cell).split("#");
Map<String, Object> userMap = (Map<String, Object>) MapUtil.getObject(userMaps, project.getProjectKey());
- List<Long> departmentIds = Lists.newArrayList();
+ List<Long> userIds = Lists.newArrayList();
for (String account : splitAssignee) {
if (MapUtil.getLong(userMap, account) != null) {
- departmentIds.add(MapUtil.getLong(userMap, account));
+ userIds.add(MapUtil.getLong(userMap, account));
}
}
+ issueForm.setUserIds(userIds);
+ }
+ }
+ // �떞�떦遺��꽌瑜� IssueForm �뿉 ���옣�븳�떎.
+ private void setIssueFormDepartment(Cell cell, Map<String, DepartmentVo> departmentMaps, IssueForm issueForm, Project project) {
+ if (cell != null) {
+ String[] splitDepartment = CommonUtil.convertExcelStringToCell(cell).split("#");
+
+ // 媛믪씠 怨듬갚�씠硫� 以묒�
+ String cellValue = CommonUtil.convertExcelStringToCell(cell);
+ if (StringUtils.isEmpty(cellValue)) {
+ return;
+ }
+
+ List<Long> departmentIds = Lists.newArrayList();
+
+ for (String department : splitDepartment) {
+ DepartmentVo departmentVo = departmentMaps.get(department);
+ departmentIds.add(departmentVo.getId());
+ }
issueForm.setDepartmentIds(departmentIds);
}
}
@@ -3344,6 +3390,12 @@
private void setIssueFormPeriod(Cell cell, IssueForm issueForm, Boolean checkStartDate, int rowIndex) {
if (cell != null && !cell.toString().equals("")) {
+ // 媛믪씠 怨듬갚�씠硫� 以묒�
+ String cellValue = CommonUtil.convertExcelStringToCell(cell);
+ if (StringUtils.isEmpty(cellValue)) {
+ return;
+ }
+
Date startDate;
try {
--
Gitblit v1.8.0