From c317ab1a948b95337bfbc730fdef9d7edde67eec Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 09 12월 2021 14:23:05 +0900
Subject: [PATCH] - API 입력 및 수정시 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 401 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 318 insertions(+), 83 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 8383256..f0022e5 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -3,6 +3,7 @@
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;
@@ -17,7 +18,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 +59,9 @@
@Autowired
private ProjectService projectService;
+
+ @Autowired
+ private IssueTableConfigService issueTableConfigService;
@Autowired
private IssueStatusService issueStatusService;
@@ -153,6 +160,9 @@
private IssueRelationService issueRelationService;
@Autowired
+ private IssueRelationRepository issueRelationRepository;
+
+ @Autowired
private ExcelView excelView;
@Autowired
@@ -163,6 +173,12 @@
@Autowired
private SimpMessagingTemplate simpMessagingTemplate;
+
+ @Autowired
+ private UserDepartmentRepository userDepartmentRepository;
+
+ @Autowired
+ private WorkflowDepartmentRepository workflowDepartmentRepository;
@Override
protected JpaRepository<Issue, Long> getRepository() {
@@ -214,7 +230,6 @@
}
}
-
// �봽濡쒖젥�듃 �엯�젰
Project project = issueType.getProject();
if (project == null){
@@ -235,18 +250,22 @@
issueForm.setSeverityId(issueApiDefault.getSeverity().getId());
}
- // 以묐났 媛� �븯�쐞 �씠�뒋濡� 泥섎━�븯湲�
+ // 以묐났 媛� �긽�쐞 �씠�뒋�쓽 �븯�쐞 �씠�뒋濡� 泥섎━�븯湲�
CustomFieldApiOverlapForm customFieldApiOverlapForm = new CustomFieldApiOverlapForm();
customFieldApiOverlapForm.setUserId(user.getId());
customFieldApiOverlapForm.setIssueTypeId(issueForm.getIssueTypeId());
- List<IssueVo> issueVos = this.findIssue(issueApiForm, user.getId());
+ // �긽�쐞�씪媛먯뿉 �궗�슜�븷 以묐났媛� �꽕�젙
+ List<CustomFieldApiOverlap> customFieldApiOverlaps = this.customFieldApiOverlapService.find(user.getId(), issueApiForm.getIssueTypeId());
+ for(int i=0; i < customFieldApiOverlaps.size() ; i++ ){
+ CustomFieldApiOverlap customFieldApiOverlap = customFieldApiOverlaps.get(i);
+ issueApiForm.addUseIssueCustomFieldId(customFieldApiOverlap.getCustomField().getId());
+ }
+
+ 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);
@@ -276,49 +295,67 @@
// API 瑜� �넻�빐 �씠�뒋 異붽�.
@Override
@Transactional
- public Issue addApiIssue(IssueApiForm issueApiForm) {
+ public List<Issue> addApiIssue(IssueApiForm issueApiForm) throws CloneNotSupportedException {
User user = convertToUser(issueApiForm.getToken());
IssueForm issueForm = this.convertToIssueForm(issueApiForm, user);
- return addIssue(user, issueForm, issueApiForm.getMultipartFiles());
+ List<Issue> issues = Lists.newArrayList();
+ if (issueForm.getParentIssueId() != null) {
+ issues.add(addIssue(user, issueForm, issueApiForm.getMultipartFiles()));
+ } else {
+ // �긽�쐞 �씠�뒋 異붽�
+ IssueForm parentIssueForm = issueForm.clone();
+ parentIssueForm.setUseIssueCustomFields(issueApiForm.getUseIssueCustomFieldIds());
+ Issue issue = addIssue(user, parentIssueForm, null);
+ issues.add(issue);
+ // �븯�쐞 �씠�뒋 異붽�
+ issueForm.setParentIssueId(issue.getId());
+ issues.add(addIssue(user, issueForm, issueApiForm.getMultipartFiles()));
+ }
+
+ 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, 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<CustomFieldApiOverlap> customFieldApiOverlaps = this.customFieldApiOverlapService.find(userId, issueApiForm.getIssueTypeId());
+ if (issueCustomFieldValueForms.size() > 0) {
+ String concatUseValue = "";
+ int useIdx = 0;
- 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());
+ IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
+ Collections.sort(issueCustomFieldValueForms, comp);
- 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;
+ 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));
}
}
}
@@ -353,7 +390,7 @@
// �궇吏� �쑀�슚�꽦 泥댄겕
this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
// �떞�떦 遺��꽌 �쑀�슚�꽦 泥댄겕
- this.verifyIssueDepartment(project, issueForm);
+ //this.verifyIssueDepartment(project, issueForm);
// �씠�뒋 �긽�깭 �쑀�삎�씠 '��湲�' �씤 �씠�뒋 �긽�깭 媛��졇�삤湲�
IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
@@ -385,6 +422,91 @@
// HOSTING �젙蹂� ���옣
this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
+
+ // 泥⑤� �뙆�씪 ���옣
+ // multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
+ List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
+ this.attachedFileService.addAttachedFile(convertFileMaps, issue, user.getAccount());
+
+ // �뀓�뒪�듃 �뿉�뵒�꽣�뿉 泥⑤��븳 �뙆�씪�쓣 �씠�뒋�� �뿰寃�
+ this.checkNotHaveIssueIdAttachedFile(issue, issueForm);
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 ���옣
+ this.issueCustomFieldValueService.modifyIssueCustomFieldValue(issue, issueForm.getIssueCustomFields());
+ // �씠�뒋 �씠�젰 �깮�꽦
+ this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.ADD, null);
+ // �씠�뒋 �쐞�뿕 愿�由� �깮�꽦
+ this.issueRiskService.addIssueRisk(issue, project.getWorkspace());
+ // �쁺�냽�꽦 而⑦뀓�뒪�듃 鍮꾩슦湲�
+ this.clear();
+ // �씠�뒋 �깮�꽦, �궘�젣�떆 �삁�빟 �씠硫붿씪�뿉 �벑濡앺빐�넃�뒗�떎.
+ this.reservationIssueEmail(issue, EmailType.ISSUE_ADD);
+ // �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
+
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_ADD));
+
+ return issue;
+ }
+
+ // �뿰愿��씠�뒋瑜� �깮�꽦�븳�떎.
+ @Override
+ @Transactional
+ public Issue addRelIssue(IssueForm issueForm, List<MultipartFile> multipartFiles) {
+ User user = this.webAppUtil.getLoginUserObject();
+ return addRelIssue(user, issueForm, multipartFiles);
+ }
+
+ // �뿰愿��씠�뒋瑜� �깮�꽦�븳�떎.
+ @Override
+ @Transactional
+ public Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
+ // �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
+ Workspace workspace = this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
+ // �봽濡쒖젥�듃 �쑀�슚�꽦 泥댄겕
+ Project project = this.projectService.getProject(issueForm.getProjectId());
+ // �씠�뒋 �쑀�삎 �쑀�슚�꽦 泥댄겕
+ IssueType issueType = this.issueTypeService.getIssueType(issueForm.getIssueTypeId());
+ // �슦�꽑�닚�쐞 �쑀�슚�꽦 泥댄겕
+ Priority priority = this.priorityService.getPriority(issueForm.getPriorityId());
+ // 以묒슂�룄 �쑀�슚�꽦 泥댄겕
+ Severity severity = this.severityService.getSeverity(issueForm.getSeverityId());
+
+ // �젣紐� �쑀�슚�꽦 泥댄겕
+ this.verifyTitle(issueForm.getTitle());
+ // �궇吏� �쑀�슚�꽦 泥댄겕
+ this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
+ // �떞�떦 遺��꽌 �쑀�슚�꽦 泥댄겕
+ //this.verifyIssueDepartment(project, issueForm);
+
+ // �씠�뒋 �긽�깭 �쑀�삎�씠 '��湲�' �씤 �씠�뒋 �긽�깭 媛��졇�삤湲�
+ IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
+
+ Issue issue = ConvertUtil.copyProperties(issueForm, Issue.class);
+ issue.setProject(project);
+ issue.setIssueStatus(issueStatus);
+ issue.setIssueType(issueType);
+ issue.setPriority(priority);
+ issue.setSeverity(severity);
+ if (issueForm.getParentIssueId() != null){
+ Issue parentIssue = this.getIssue(issueForm.getParentIssueId());
+ issue.setParentIssue(parentIssue);
+ }
+
+ issue.setIssueNumber(this.issueNumberGeneratorService.generateIssueNumber(project)); // 媛� �봽濡쒖젥�듃�쓽 怨좎쑀 �씠�뒋 踰덊샇 �깮�꽦
+
+ issue = this.issueRepository.saveAndFlush(issue);
+
+ issue.setReverseIndex(issue.getId() * -1); // 荑쇰━ �냽�룄 媛쒖꽑�쓣 �쐞�빐 由щ쾭�뒪 �씤�뜳�뒪 �깮�꽦
+ // �떞�떦�옄 吏��젙
+ //this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
+ // �떞�떦遺��꽌 吏��젙
+ this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
+ // �뾽泥� �젙蹂� ���옣
+ this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
+ // ISP �젙蹂� ���옣
+ this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
+ // HOSTING �젙蹂� ���옣
+ this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
// 泥⑤� �뙆�씪 ���옣
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
@@ -559,11 +681,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)) {
@@ -589,12 +741,26 @@
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)) {
+ 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();
@@ -604,10 +770,10 @@
// �씠�뒋 �븘�씠�뵒 珥덇린�솕
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(),
@@ -618,21 +784,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());
}
}
}
@@ -1046,6 +1224,7 @@
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
this.setIssueDetail(issueVo, issue); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
+ this.setIssueTableConfigs(issue, issueVo);
issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
break;
}
@@ -1057,21 +1236,46 @@
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) {
List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId());
if(downIssues != null && downIssues.size()>0){
List<IssueVo> resultList = new ArrayList<>();
for(Issue downIssue : downIssues){
- IssueVo newIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
- newIssueVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class));
- newIssueVo.setPriorityVo(ConvertUtil.copyProperties(downIssue.getPriority(), PriorityVo.class));
- newIssueVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class));
- this.setRegister(downIssue, newIssueVo); // �벑濡앹옄
- this.setIssueDepartment(downIssue, newIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
- this.setIssueCustomFields(downIssue, newIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
+ IssueVo downIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
+ downIssueVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class));
+ downIssueVo.setPriorityVo(ConvertUtil.copyProperties(downIssue.getPriority(), PriorityVo.class));
+ downIssueVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class));
+ //�씠�뒋 �긽�깭 異붽�
+ IssueStatusVo issueStatusVo = ConvertUtil.copyProperties(downIssue.getIssueStatus(), IssueStatusVo.class, "issueStatusType");
+ issueStatusVo.setIssueStatusType(downIssue.getIssueStatus().getIssueStatusType().toString());
+ downIssueVo.setIssueStatusVo(issueStatusVo);
- resultList.add(newIssueVo);
+ this.setRegister(downIssue, downIssueVo); // �벑濡앹옄
+ this.setIssueDepartment(downIssue, downIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ this.setIssueCustomFields(downIssue, downIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
+
+ resultList.add(downIssueVo);
}
issueVo.setIssueDownVos(resultList);
}
@@ -1165,6 +1369,11 @@
issueRelationVo.setIssueTypeVo(ConvertUtil.copyProperties(relationIssue.getIssueType(), IssueTypeVo.class));
issueRelationVo.setPriorityVo(ConvertUtil.copyProperties(relationIssue.getPriority(), PriorityVo.class));
issueRelationVo.setSeverityVo(ConvertUtil.copyProperties(relationIssue.getSeverity(), SeverityVo.class));
+ //�씠�뒋 �긽�깭 異붽�
+ IssueStatusVo issueStatusVo = ConvertUtil.copyProperties(relationIssue.getIssueStatus(), IssueStatusVo.class, "issueStatusType");
+ issueStatusVo.setIssueStatusType(relationIssue.getIssueStatus().getIssueStatusType().toString());
+ issueRelationVo.setIssueStatusVo(issueStatusVo);
+
this.setRegister(relationIssue, relIssueVo); // �벑濡앹옄
this.setIssueDepartment(relationIssue, relIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setIssueCustomFields(relationIssue, relIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
@@ -1267,34 +1476,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));
}
}
}
@@ -1324,8 +1526,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 {
@@ -1370,7 +1593,7 @@
// �떞�떦�옄 �쑀�슚�꽦 泥댄겕
//this.verifyIssueAssignee(project, issueForm);
// �떞�떦遺��꽌 �쑀�슚�꽦 泥댄겕
- this.verifyIssueDepartment(project, issueForm);
+ //this.verifyIssueDepartment(project, issueForm);
CheckIssueData checkIssueData = new CheckIssueData();
checkIssueData.setIssue(issue);
@@ -1408,6 +1631,7 @@
this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
}
+ // db�뿉 ���옣
issue = this.saveIssue(issueForm, checkIssueData);
// �씠�뒋 �씠�젰 �벑濡�
@@ -1872,6 +2096,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