From d78323a9138aab73f9f1b25e0a74283780176452 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 20:43:47 +0900
Subject: [PATCH] - 이슈전체보기/이슈프로젝트보기 권한 생성 - 워크스페이스 권한을 가진 사용자 OWL정보 오류 해결
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 357 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 279 insertions(+), 78 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 ff02b9d..2306be7 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -3,11 +3,9 @@
import com.google.common.collect.Lists;
import com.sun.org.apache.bcel.internal.generic.NEW;
import kr.wisestone.owl.common.ExcelConditionCheck;
+import kr.wisestone.owl.common.IssueCustomFieldValueFormComparator;
import kr.wisestone.owl.config.CommonConfiguration;
-import kr.wisestone.owl.constant.Constants;
-import kr.wisestone.owl.constant.ElasticSearchConstants;
-import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.constant.UsePartner;
+import kr.wisestone.owl.constant.*;
import kr.wisestone.owl.data.CheckIssueData;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
@@ -17,7 +15,10 @@
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.IssueMapper;
import kr.wisestone.owl.mapper.ProjectMapper;
+import kr.wisestone.owl.repository.IssueRelationRepository;
import kr.wisestone.owl.repository.IssueRepository;
+import kr.wisestone.owl.repository.UserDepartmentRepository;
+import kr.wisestone.owl.repository.WorkflowDepartmentRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.util.DateUtil;
@@ -55,6 +56,9 @@
@Autowired
private ProjectService projectService;
+
+ @Autowired
+ private IssueTableConfigService issueTableConfigService;
@Autowired
private IssueStatusService issueStatusService;
@@ -153,6 +157,9 @@
private IssueRelationService issueRelationService;
@Autowired
+ private IssueRelationRepository issueRelationRepository;
+
+ @Autowired
private ExcelView excelView;
@Autowired
@@ -163,6 +170,12 @@
@Autowired
private SimpMessagingTemplate simpMessagingTemplate;
+
+ @Autowired
+ private UserDepartmentRepository userDepartmentRepository;
+
+ @Autowired
+ private WorkflowDepartmentRepository workflowDepartmentRepository;
@Override
protected JpaRepository<Issue, Long> getRepository() {
@@ -234,7 +247,7 @@
issueForm.setSeverityId(issueApiDefault.getSeverity().getId());
}
- // 以묐났 媛� �븯�쐞 �씠�뒋濡� 泥섎━�븯湲�
+ // 以묐났 媛� �긽�쐞 �씠�뒋�쓽 �븯�쐞 �씠�뒋濡� 泥섎━�븯湲�
CustomFieldApiOverlapForm customFieldApiOverlapForm = new CustomFieldApiOverlapForm();
customFieldApiOverlapForm.setUserId(user.getId());
customFieldApiOverlapForm.setIssueTypeId(issueForm.getIssueTypeId());
@@ -248,11 +261,8 @@
List<IssueVo> issueVos = this.findIssue(issueApiForm, customFieldApiOverlaps, user.getId());
int size = issueVos.size();
- if (size == 1) {
+ if (size > 0) {
issueForm.setParentIssueId(issueVos.get(0).getId());
- } else if (size > 1) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.API_OVERLAP_ERROR));
}
issueForm.setIsApi(Issue.IS_API_YES);
@@ -303,38 +313,46 @@
return issues;
}
+ // �긽�쐞 �씠�뒋 媛��졇�삤湲�
+ private IssueVo getParentIssueVo(Long parentIssueId) {
+ if (parentIssueId != null) {
+ Issue parentIssue = this.getIssue(parentIssueId);
+ return ConvertUtil.copyProperties(parentIssue, IssueVo.class);
+ }
+ return null;
+ }
+
// 以묐났�맂 �긽�쐞 �씠�뒋 寃��깋
- private List<IssueVo> findIssue(IssueApiForm issueApiForm, List<CustomFieldApiOverlap> customFieldApiOverlaps, Long userId) {
+ private List<IssueVo> findIssue(IssueApiForm issueApiform, List<CustomFieldApiOverlap> customFieldApiOverlaps, Long userId) {
+ List<IssueCustomFieldValueForm> issueCustomFieldValueForms = issueApiform.getIssueCustomFieldValues();
+ List<IssueVo> resultIssueVos = Lists.newArrayList();
+ String comma = ",";
- List<IssueVo> resultIssueVos = new ArrayList<>();
- if (customFieldApiOverlaps != null && customFieldApiOverlaps.size() > 0) {
- for (CustomFieldApiOverlap customFieldApiOverlap : customFieldApiOverlaps) {
- for (IssueCustomFieldValueForm issueCustomFieldValue : issueApiForm.getIssueCustomFieldValues()) {
- IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
- if (customFieldApiOverlap.getCustomField().getId().equals(issueCustomFieldValue.getCustomFieldId())) {
- issueCustomFieldValueCondition.setUseValue(issueCustomFieldValue.getUseValue());
+ if (issueCustomFieldValueForms.size() > 0) {
+ String concatUseValue = "";
+ int useIdx = 0;
- List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
- if (results != null && results.size() > 0) {
- List<IssueVo> findIssueVos = new ArrayList<>();
- Collections.copy(resultIssueVos, findIssueVos);
- resultIssueVos.clear();
- for (Map<String, Object> result : results) {
- IssueVo issueVo = ConvertUtil.convertMapToClass(result, IssueVo.class);
- if (findIssueVos.size() == 0) {
- resultIssueVos.add(issueVo);
- } else {
- IssueVo findIssueVo = findIssueVo(findIssueVos, issueVo.getId());
- if (findIssueVo != null) {
- resultIssueVos.add(findIssueVo);
- }
- }
- }
- } else {
- resultIssueVos.clear();
- return resultIssueVos;
+ IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
+ Collections.sort(issueCustomFieldValueForms, comp);
+
+ for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {
+ for(CustomFieldApiOverlap customFieldApiOverlap : customFieldApiOverlaps) {
+ if (customFieldApiOverlap.getCustomField().getId().equals(issueCustomFieldValueForm.getCustomFieldId())) {
+ if (useIdx > 0) {
+ concatUseValue = concatUseValue.concat(comma);
}
+ concatUseValue = concatUseValue.concat(issueCustomFieldValueForm.getUseValue());
+ useIdx++;
}
+ }
+ }
+
+ IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
+ issueCustomFieldValueCondition.setUseValue(concatUseValue);
+ List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
+ if (results != null && results.size() > 0) {
+ for (Map<String, Object> result : results) {
+ resultIssueVos.add(ConvertUtil.convertMapToClass(result, IssueVo.class));
}
}
}
@@ -369,7 +387,7 @@
// �궇吏� �쑀�슚�꽦 泥댄겕
this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
// �떞�떦 遺��꽌 �쑀�슚�꽦 泥댄겕
- this.verifyIssueDepartment(project, issueForm);
+ //this.verifyIssueDepartment(project, issueForm);
// �씠�뒋 �긽�깭 �쑀�삎�씠 '��湲�' �씤 �씠�뒋 �긽�깭 媛��졇�삤湲�
IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
@@ -455,7 +473,7 @@
// �궇吏� �쑀�슚�꽦 泥댄겕
this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
// �떞�떦 遺��꽌 �쑀�슚�꽦 泥댄겕
- this.verifyIssueDepartment(project, issueForm);
+ //this.verifyIssueDepartment(project, issueForm);
// �씠�뒋 �긽�깭 �쑀�삎�씠 '��湲�' �씤 �씠�뒋 �긽�깭 媛��졇�삤湲�
IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
@@ -660,11 +678,41 @@
}
}
+ void SetMyDepartmentId(IssueCondition issueCondition){
+ Long loginId = issueCondition.getLoginUserId();
+ List<Long> myDepartmentIds = Lists.newArrayList();
+ List<UserDepartment> myDepartments = this.userDepartmentRepository.findByUserId(loginId);
+
+ if(myDepartments != null && myDepartments.size() > 0){
+ for(UserDepartment myDepartment : myDepartments){
+ myDepartmentIds.add(myDepartment.getDepartmentId());
+ }
+ }
+ issueCondition.setMyDepartmentIds(myDepartmentIds);
+ }
+
+ void SetWorkflowDepartment(List<IssueVo> issueVos){
+ for(IssueVo issueVo : issueVos){
+ Long issueTypeId = issueVo.getIssueTypeId();
+ IssueType issueType = this.issueTypeService.getIssueType(issueTypeId);
+ Long workflowId = issueType.getWorkflow().getId();
+ List<WorkflowDepartment> workflowDepartmentList = this.workflowDepartmentRepository.findByWorkflowId(workflowId);
+ List<Long> workflowDepartmentIds = Lists.newArrayList();
+ if(workflowDepartmentList != null && workflowDepartmentList.size()>0){
+ for(WorkflowDepartment workflowDepartment : workflowDepartmentList){
+ workflowDepartmentIds.add(workflowDepartment.getDepartment().getId());
+ }
+ }
+ if(issueVo.getIssueTypeId().equals(issueTypeId)){
+ issueVo.setWorkflowDepartmentIds(workflowDepartmentIds);
+ }
+ }
+ }
+
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
- public List<IssueVo> findIssue(Map<String, Object> resJsonData,
- IssueCondition issueCondition, Pageable pageable) {
+ public List<IssueVo> findIssue(Map<String, Object> resJsonData, IssueCondition issueCondition, Pageable pageable) {
// 寃��깋 議곌굔�쓣 留뚮뱺�떎
if (!this.makeIssueSearchCondition(issueCondition, Lists.newArrayList("01", "02", "03"), pageable)) {
@@ -690,12 +738,27 @@
List<String> issueKeys = Lists.newArrayList(issueIds);
issueCondition.setIssueIds(issueKeys);
- List<Map<String, Object>> results = this.issueMapper.find(issueCondition);
+ issueCondition.setLoginUserId(this.webAppUtil.getLoginId());
+ issueCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ User user = this.webAppUtil.getLoginUserObject();
+
+
+ List<Map<String, Object>> results = Lists.newArrayList();
+ Long totalCount = 0L;
+
+ if (this.userWorkspaceService.checkWorkspaceManager(user) || user.getPermission() >= MngPermission.USER_PERMISSION_MNG_ISSUE_ALL) {
+ results = this.issueMapper.find(issueCondition);
+ totalCount = this.issueMapper.count(issueCondition);
+ } else{
+ this.SetMyDepartmentId(issueCondition);
+ results = this.issueMapper.findByDepartment(issueCondition);
+ totalCount = this.issueMapper.countByDepartment(issueCondition);
+ }
+
// �뒠�떇 �쟾 - 0.8, 0.9, 0.9, 0.9, 0.9
/*StopWatch serviceStart = new StopWatch();
serviceStart.start();*/
- Long totalCount = this.issueMapper.count(issueCondition);
// �뒠�떇 �쟾 - 1.1, 1.1, 1.3, 1.2
/*serviceStart.stop();
@@ -703,12 +766,13 @@
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
// �씠�뒋 �븘�씠�뵒 珥덇린�솕
+ issueCondition.setIsApi(issueCondition.getIsApi());
issueCondition.setIssueIds(Lists.newArrayList());
// Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
- User user = this.webAppUtil.getLoginUserObject();
this.setMapToIssueVo(results, issueVos, issueCondition, user);
this.setCountDownIssues(results, issueVos);
+ this.SetWorkflowDepartment(issueVos); //�썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 媛��졇�삤湲�
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVos);
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
@@ -719,21 +783,33 @@
return issueVos;
}
- private void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
+ @Override
+ @Transactional(readOnly = true)
+ public void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
for (Map<String, Object> result : results){
List<Issue> downIssues = this.issueRepository.findByParentIssueId((Long) result.get("id")); //�븯�쐞�씠�뒋 媛��졇�삤湲�
if(downIssues != null && downIssues.size() > 0){ //�긽�쐞�씠�뒋 媛�吏�怨� �엳�뒗 �븷�뱾�씠 �엳�쑝硫�
- int downIssueCount = 0;
+ int downIssueAllCount = 0;// �븯�쐞�씠�뒋 �쟾泥� 移댁슫�듃
+ int downIssueCount = 0;// �븯�쐞�씠�뒋 誘몄셿猷� 移댁슫�듃
for(Issue downIssue : downIssues){
- downIssueCount ++;
+ downIssueAllCount ++;
Long parentIssueId = downIssue.getParentIssue().getId();
Issue parentIssue = this.getIssue(parentIssueId);
IssueVo parentIssueVo = ConvertUtil.copyProperties(parentIssue, IssueVo.class);
- parentIssueVo.setDownIssueCount(downIssueCount);
+ parentIssueVo.setDownIssueAllCount(downIssueAllCount);
+
+ IssueStatus downIssueStatus = this.issueStatusService.getIssueStatus(downIssue.getIssueStatus().getId());
+ IssueVo downIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
+ downIssueVo.setIssueStatusType(downIssueStatus.getIssueStatusType().toString());
+
+ if(!downIssueVo.getIssueStatusType().equals("CLOSE")){ //誘몄셿猷� �븯�쐞�씠�뒋 泥댄겕
+ downIssueCount ++;
+ }
for(IssueVo issueVo : issueVos){
if(issueVo.getId().equals(parentIssueVo.getId())){
- issueVo.setDownIssueCount(parentIssueVo.getDownIssueCount());
+ issueVo.setDownIssueCount(downIssueCount);
+ issueVo.setDownIssueAllCount(parentIssueVo.getDownIssueAllCount());
}
}
}
@@ -1147,6 +1223,7 @@
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
this.setIssueDetail(issueVo, issue); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
+ this.setIssueTableConfigs(issue, issueVo);
issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
break;
}
@@ -1157,6 +1234,26 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVo);
}
+
+ // �뀒�씠釉� �꽕�젙 �뀑�똿
+ private void setIssueTableConfigs(Issue issue, IssueVo issueVo) {
+ Long IssueTypeId = issue.getIssueType().getId();
+
+ for (int tableConfigType : IssueTableConfig.IssueTableTypes) {
+ if (tableConfigType != IssueTableConfig.ISSUE_TABLE_TYPE_MAIN) {
+ issueVo.addIssueTableConfigVo(createIssueTableConfigVo(IssueTypeId, tableConfigType));
+ }
+ }
+ }
+
+ private IssueTableConfigVo createIssueTableConfigVo(Long issueTypeId, int tableConfigType) {
+ IssueTableConfig issueTableConfig = this.issueTableConfigService.findByUserIdAndWorkspaceIdAndIssueTypeIdAndIssueTableType(issueTypeId, tableConfigType);
+ if (issueTableConfig != null) {
+ return ConvertUtil.copyProperties(issueTableConfig, IssueTableConfigVo.class);
+ }
+ return new IssueTableConfigVo();
+ }
+
// �븯�쐞 �씠�뒋 �젙蹂대�� �뀑�똿�븳�떎
private void setDownIssues(Issue issue, IssueVo issueVo) {
@@ -1378,34 +1475,27 @@
@Override
@Transactional
public List<IssueVo> findIssue(IssueApiForm issueApiform) {
+
List<IssueCustomFieldValueForm> issueCustomFieldValueForms = issueApiform.getIssueCustomFieldValues();
- List<IssueVo> resultIssueVos = new ArrayList<>();
+ List<IssueVo> resultIssueVos = Lists.newArrayList();
+ String comma = ",";
- IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
if (issueCustomFieldValueForms.size() > 0) {
- for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {
-// issueCustomFieldValueCondition.addUseValue(issueCustomFieldValueForm.getUseValue());
- issueCustomFieldValueCondition.setUseValue(issueCustomFieldValueForm.getUseValue());
- List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
- if (results != null && results.size() > 0) {
- List<IssueVo> findIssueVos = new ArrayList<>();
- Collections.copy(resultIssueVos, findIssueVos);
- resultIssueVos.clear();
- for (Map<String, Object> result : results) {
- IssueVo issueVo = ConvertUtil.convertMapToClass(result, IssueVo.class);
+ String concatUseValue = "";
+ for (int i = 0; i < issueCustomFieldValueForms.size(); i++) {
+ IssueCustomFieldValueForm issueCustomFieldValueForm = issueCustomFieldValueForms.get(i);
+ if (i > 0) {
+ concatUseValue = concatUseValue.concat(comma);
+ }
+ concatUseValue = concatUseValue.concat(issueCustomFieldValueForm.getUseValue());
+ }
- if (findIssueVos.size() == 0) {
- resultIssueVos.add(issueVo);
- } else {
- IssueVo findIssueVo = findIssueVo(findIssueVos, issueVo.getId());
- if (findIssueVo != null) {
- resultIssueVos.add(findIssueVo);
- }
- }
- }
- } else {
- resultIssueVos.clear();
- return resultIssueVos;
+ IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
+ issueCustomFieldValueCondition.setUseValue(concatUseValue);
+ List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
+ if (results != null && results.size() > 0) {
+ for (Map<String, Object> result : results) {
+ resultIssueVos.add(ConvertUtil.convertMapToClass(result, IssueVo.class));
}
}
}
@@ -1435,8 +1525,29 @@
if (issueVos != null && issueVos.size() > 0) {
List<Issue> issue = Lists.newArrayList();
for (IssueVo issueVo : issueVos) {
+ IssueVo parentIssueVo = issueVo.getParentIssueVo();
issueForm.setId(issueVo.getId());
- issue.add(this.modifyIssueForApi(user, issueForm, files));
+
+ // �옄�룞 醫낅즺 �긽�깭 �꽕�젙�씠 �릺�뼱 �엳吏� �븡�쑝硫� �삤瑜섎컻�깮
+ Issue modifyIssue = this.modifyIssueForApi(user, issueForm, files);
+ Issue parentIssue = modifyIssue.getParentIssue();
+ IssueType issueType = modifyIssue.getIssueType();
+ IssueStatus issueStatus = issueType.getIssueStatus();
+ if (issueStatus == null) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_COMPLETE_ISSUE_STATUS_NOT_EXIST));
+ }
+
+ if (parentIssue != null) {
+ IssueCondition issueCondition = new IssueCondition(issueVo.getId(), parentIssue.getId());
+ List<Map<String, Object>> results = this.issueMapper.findNotCompleteByParentIssueId(issueCondition);
+ // �븯�쐞 �씪媛먯씠 紐⑤몢 醫낅즺 �긽�깭�씪�븣 �긽�쐞 �씪媛먮룄 醫낅즺 泥섎━
+ if (results == null || results.size() == 0) {
+ parentIssue.setIssueStatus(issueType.getIssueStatus());
+ this.issueRepository.saveAndFlush(parentIssue);
+ }
+ }
+
+ issue.add(modifyIssue);
}
return issue;
} else {
@@ -1481,7 +1592,7 @@
// �떞�떦�옄 �쑀�슚�꽦 泥댄겕
//this.verifyIssueAssignee(project, issueForm);
// �떞�떦遺��꽌 �쑀�슚�꽦 泥댄겕
- this.verifyIssueDepartment(project, issueForm);
+ //this.verifyIssueDepartment(project, issueForm);
CheckIssueData checkIssueData = new CheckIssueData();
checkIssueData.setIssue(issue);
@@ -1519,6 +1630,7 @@
this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
}
+ // db�뿉 ���옣
issue = this.saveIssue(issueForm, checkIssueData);
// �씠�뒋 �씠�젰 �벑濡�
@@ -1759,6 +1871,9 @@
//hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ASSIGNEE, issueVo, issueUserVos);
// �떞�떦�옄媛� �뾾�쑝硫� 紐⑤뱺 �궗�슜�옄媛� �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ALL_ISSUE_MANAGER, issueVo, null, null, user);
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ALL_PROJECT_MANAGER, issueVo, null, null, user);
+
return hasPermission;
}
@@ -1955,20 +2070,95 @@
List<Issue> removeIssues = Lists.newArrayList();
for (Long issueId : issueForm.getRemoveIds()) {
+ //�븯�쐞�씠�뒋 泥댄겕
+ List<Issue> downIssues = this.issueRepository.findByParentIssueId(issueId);
+ if(downIssues != null && downIssues.size() > 0){
+ for(Issue downIssue : downIssues){
+ if(downIssue.getParentIssue() != null){
+ downIssue.setParentIssue(null);
+ }
+ }
+ }
+
Issue issue = this.issueRemoves(issueId, user);
removeIssues.add(issue);
}
- if (removeIssues.size() > 0) {
- //this.issueRepository.deleteAll(removeIssues);
- }
+ /*if (removeIssues.size() > 0) {
+ this.issueRepository.deleteAll(removeIssues);
+ }*/
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_REMOVE));
}
+ // �씠�뒋瑜� �궘�젣�븳�떎.
+ @Override
+ @Transactional
+ public void removeAllIssues(IssueForm issueForm) {
+ // �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
+ User user = this.webAppUtil.getLoginUserObject();
+ this.workspaceService.checkUseWorkspace();
+
+ if (issueForm.getRemoveIds().size() < 1) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_REMOVE_NOT_SELECT));
+ }
+
+ List<Issue> removeIssues = Lists.newArrayList();
+
+ for (Long issueId : issueForm.getRemoveIds()) {
+ //�븯�쐞�씠�뒋 泥댄겕
+ List<Issue> downIssues = this.issueRepository.findByParentIssueId(issueId);
+ if(downIssues != null && downIssues.size() > 0){
+ for(Issue downIssue : downIssues){
+ Long downIssueId = downIssue.getId();
+ downIssue = this.issueRemoves(downIssueId, user);
+ removeIssues.add(downIssue);
+ }
+ }
+ Issue issue = this.issueRemoves(issueId, user);
+ removeIssues.add(issue);
+ }
+ // �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_REMOVE));
+ }
+
+ // �븯�쐞�씠�뒋瑜� �궘�젣�븳�떎.
+ @Override
+ @Transactional
+ public void removeDownIssues(IssueForm issueForm) {
+ // �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
+ User user = this.webAppUtil.getLoginUserObject();
+ this.workspaceService.checkUseWorkspace();
+
+ if (issueForm.getRemoveIds().size() < 1) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_REMOVE_NOT_SELECT));
+ }
+
+ List<Issue> removeIssues = Lists.newArrayList();
+ Long downIssueId = 0L;
+ for (Long issueId : issueForm.getRemoveIds()) {
+ //�궘�젣 �븷 �씠�뒋�쓽 �븯�쐞�씠�뒋 泥댄겕
+ List<Issue> downIssues = this.issueRepository.findByParentIssueId(issueId);
+ if(downIssues != null && downIssues.size() > 0){
+ for(Issue downIssue : downIssues){
+ downIssueId = downIssue.getId();
+ }
+ }
+ Issue issue = this.issueRemoves(downIssueId, user);
+ removeIssues.add(issue);
+ }
+ // �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_REMOVE));
+ }
+
private Issue issueRemoves(Long issueId, User user) {
- Issue issue = this.getIssue(issueId);
+ Issue issue = null;
+ if(issueId != null){
+ issue = this.getIssue(issueId);
+ }
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
this.verifyIssueModifyPermission(issue, user);
@@ -1983,6 +2173,17 @@
this.attachedFileService.removeAttachedFiles(attachedFileIds);
}
+ // 吏��슱 �씠�뒋媛� �뿰愿��씠�뒋�씤吏� 泥댄겕 �썑 �뿰愿��씠�뒋 �뀒�씠釉붿뿉�꽌�룄 �궘�젣�븳�떎.
+ List<IssueRelation> issueRelationList = this.issueRelationRepository.findByRelationIssueId(issueId);
+ if (issueRelationList != null && issueRelationList.size() > 0) {
+ for(IssueRelation issueRelation : issueRelationList){
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectRelationIssue(IssueHistoryType.DELETE, issueRelation, sb);
+ issueHistoryService.addIssueHistory(issueRelation.getIssue(), IssueHistoryType.MODIFY, sb.toString());
+ this.issueRelationRepository.delete(issueRelation);
+ }
+ }
+
// �씠�뒋 �깮�꽦, �궘�젣�떆 �삁�빟 �씠硫붿씪�뿉 �벑濡앺빐�넃�뒗�떎.
this.reservationIssueEmail(issue, EmailType.ISSUE_REMOVE);
// �씠�뒋 �궘�젣
--
Gitblit v1.8.0