From 47c5ce77b114324effdce5b3735ed0e661846108 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 10:58:23 +0900
Subject: [PATCH] - 이슈 상세페이지 연관,하위 이슈 페이징 처리
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 110 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 81 insertions(+), 29 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 25aaee7..b4b9710 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -14,6 +14,7 @@
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.DepartmentMapper;
import kr.wisestone.owl.mapper.IssueMapper;
+import kr.wisestone.owl.mapper.IssueRelationMapper;
import kr.wisestone.owl.mapper.ProjectMapper;
import kr.wisestone.owl.repository.IssueRelationRepository;
import kr.wisestone.owl.repository.IssueRepository;
@@ -33,6 +34,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -195,6 +198,9 @@
@Autowired
private WorkflowDepartmentRepository workflowDepartmentRepository;
+ @Autowired
+ private IssueRelationMapper issueRelationMapper;
+
@Override
protected JpaRepository<Issue, Long> getRepository() {
return this.issueRepository;
@@ -313,7 +319,7 @@
}
}
- private void findCompanyField(IssueForm issueForm) {
+ private IssueForm findCompanyField(IssueForm issueForm) {
if(issueForm.getIssueCustomFields() != null && issueForm.getIssueCustomFields().size() > 0) {
CompanyFieldCondition condition = new CompanyFieldCondition();
List<Map<String, Object>> companyFields = this.companyFieldService.find(condition);
@@ -356,6 +362,7 @@
issueForm.setIssueHostingFields(issueHostingFields);
}
}
+ return issueForm;
}
private User convertToUser(String token) {
@@ -381,7 +388,14 @@
} else {
// 媛��긽 �긽�쐞 �씠�뒋 異붽�
IssueForm parentIssueForm = issueForm.clone();
+ // 媛��긽 �긽�쐞 �씠�뒋 異붽�
parentIssueForm.setUseIssueCustomFields(issueApiForm.getUseIssueCustomFieldIds());
+ // 媛숈� �룄硫붿씤 �뾽泥� 李얘린
+ IssueForm partners = this.findCompanyField(parentIssueForm);
+ parentIssueForm.setIssueCompanyFields(partners.getIssueCompanyFields());
+ parentIssueForm.setIssueIspFields(partners.getIssueIspFields());
+ parentIssueForm.setIssueHostingFields(partners.getIssueHostingFields());
+
Issue issue = addIssue(user, parentIssueForm, null);
issues.add(issue);
// �븯�쐞 �씠�뒋 異붽�
@@ -414,7 +428,9 @@
IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
Collections.sort(issueCustomFieldValueForms, comp);
+ List<String> userValues = Lists.newArrayList();
for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {
+ userValues.add(issueCustomFieldValueForm.getUseValue());
for(CustomFieldApiOverlap customFieldApiOverlap : customFieldApiOverlaps) {
if (customFieldApiOverlap.getCustomField().getId().equals(issueCustomFieldValueForm.getCustomFieldId())) {
if (useIdx > 0) {
@@ -428,6 +444,7 @@
IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
issueCustomFieldValueCondition.setUseValue(concatUseValue);
+ issueCustomFieldValueCondition.setUseValues(userValues);
issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
if (results != null && results.size() > 0) {
@@ -498,7 +515,6 @@
this.issueIspService.modifyIssueIspField(issue, issueForm);
// HOSTING �젙蹂� ���옣
this.issueHostingService.modifyIssueHostingField(issue, issueForm);
-
// 泥⑤� �뙆�씪 ���옣
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
@@ -716,7 +732,7 @@
}
// �씠�뒋 �젙蹂대�� �씠硫붿씪 �쟾�넚�뿉 �궗�슜�븯湲� �쐞�빐 Map �삎�깭濡� 蹂��솚�븳�떎.
- private void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap) {
+ public void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap) {
issueMap.put("title", issue.getTitle());
issueMap.put("issueNumber", issue.getIssueNumber());
issueMap.put("issueTypeName", issue.getIssueType().getName());
@@ -1455,13 +1471,19 @@
// �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
- public void detailIssue(Map<String, Object> resJsonData, IssueCondition issueCondition) {
+ public void detailIssue(Map<String, Object> resJsonData, IssueCondition issueCondition, Pageable relPageable, Pageable downPageable) {
IssueVo issueVo = new IssueVo();
if (issueCondition.getId() != null) {
Issue issue = this.getIssue(issueCondition.getId());
issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
User user = this.webAppUtil.getLoginUserObject();
+
+ issueVo.setRelPage(relPageable.getPageNumber() * relPageable.getPageSize());
+ issueVo.setRelPageSize(relPageable.getPageSize());
+
+ issueVo.setDownPage(downPageable.getPageNumber() * downPageable.getPageSize());
+ issueVo.setDownPageSize(downPageable.getPageSize());
switch (issueCondition.getDeep()) {
case "01": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦遺��꽌, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� �뀑�똿�븳�떎.
@@ -1478,7 +1500,6 @@
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
this.setDownIssues(issue, issueVo); //�븯�쐞 �씠�뒋 �꽭�똿
-
break;
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
@@ -1488,11 +1509,19 @@
break;
}
}
+ Long relTotalCount = issueVo.getRelTotalCount();
+ int relTotalPage = issueVo.getRelTotalPage();
+ Long downTotalCount = issueVo.getDownTotalCount();
+ int downTotalPage = issueVo.getDownTotalPage();
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_DETAIL));
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVo);
+ resJsonData.put(Constants.REQ_KEY_RELATION_ISSUE_PAGE_VO, new ResPage(relPageable.getPageNumber(), relPageable.getPageSize(),
+ relTotalPage, relTotalCount));
+ resJsonData.put(Constants.REQ_KEY_DOWN_ISSUE_PAGE_VO, new ResPage(downPageable.getPageNumber(), downPageable.getPageSize(),
+ downTotalPage, downTotalCount));
}
// �뀒�씠釉� �꽕�젙 �뀑�똿
@@ -1517,8 +1546,13 @@
// �븯�쐞 �씠�뒋 �젙蹂대�� �뀑�똿�븳�떎
private void setDownIssues(Issue issue, IssueVo issueVo) {
- List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId());
- if(downIssues != null && downIssues.size()>0){
+ //List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId());
+ int startPage = (int) Math.floor(issueVo.getDownPage()/issueVo.getDownPageSize());
+ Pageable pageable = PageRequest.of(startPage, issueVo.getDownPageSize());
+ Page<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId(), pageable);
+ issueVo.setDownTotalPage(downIssues.getTotalPages());
+ issueVo.setDownTotalCount(downIssues.getTotalElements());
+ if(downIssues != null){
List<IssueVo> resultList = new ArrayList<>();
for(Issue downIssue : downIssues){
IssueVo downIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
@@ -1618,13 +1652,18 @@
// �뿰愿� �씠�뒋 �젙蹂대�� �뀑�똿�븳�떎
private void setRelationIssue(Issue issue, IssueVo issueVo) {
- Set<IssueRelation> issueRelations = issue.getIssueRelations();
- if (issue != null && issueVo != null && issueRelations.size() > 0) {
- for (IssueRelation issueRelation : issueRelations) {
- IssueRelationVo issueRelationVo = ConvertUtil.copyProperties(issueRelation, IssueRelationVo.class);
+ //Set<IssueRelation> issueRelations = issue.getIssueRelations();
+ List<Map<String, Object>> results = this.issueRelationMapper.findByIssueId(issueVo);
+ Long totalCount = this.issueRelationMapper.count(issueVo);
- Issue relationIssue = issueRelation.getRelationIssue();
+ int totalPage = (int) Math.ceil((totalCount - 1) / issueVo.getRelPageSize()) + 1;
+ issueVo.setRelTotalPage(totalPage);
+ issueVo.setRelTotalCount(totalCount);
+ if (issue != null && issueVo != null && results.size() > 0) {
+ for (Map<String, Object> result : results) {
+ IssueRelationVo issueRelationVo = ConvertUtil.convertMapToClass(result, IssueRelationVo.class);
+ Issue relationIssue = this.findOne(issueRelationVo.getId());
IssueVo relIssueVo = ConvertUtil.copyProperties(relationIssue, IssueVo.class);
Project project = this.projectService.getProject(relationIssue.getProject().getId());
relIssueVo.setProjectId(project.getId());
@@ -1759,6 +1798,7 @@
List<Issue> resultIssueVos = Lists.newArrayList();
String comma = ",";
+ List<String> userValues = Lists.newArrayList();
if (issueCustomFieldValueForms.size() > 0) {
IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
Collections.sort(issueCustomFieldValueForms, comp);
@@ -1766,6 +1806,7 @@
String concatUseValue = "";
for (int i = 0; i < issueCustomFieldValueForms.size(); i++) {
IssueCustomFieldValueForm issueCustomFieldValueForm = issueCustomFieldValueForms.get(i);
+ userValues.add(issueCustomFieldValueForm.getUseValue());
if (i > 0) {
concatUseValue = concatUseValue.concat(comma);
}
@@ -1774,6 +1815,7 @@
IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
issueCustomFieldValueCondition.setUseValue(concatUseValue);
+ issueCustomFieldValueCondition.setUseValues(userValues);
issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
if (results != null && results.size() > 0) {
@@ -1897,6 +1939,13 @@
// �씠�뒋 �닔�젙(API�슜)
private Issue modifyIssueForApi(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
CheckIssueData checkIssueData = this.checkIssue(user, issueForm);
+
+ if (issueForm.getComment() != null && !issueForm.getComment().equals("")) { //�뙎湲� 異붽�
+ IssueCommentForm issueCommentForm = new IssueCommentForm();
+ issueCommentForm.setDescription(issueForm.getComment());
+ issueCommentForm.setIssueId(issueForm.getId());
+ this.issueCommentService.addIssueComment(issueCommentForm, user);
+ }
// �씠�뒋 �씠�젰 �궓湲곌린
this.addIssueHistoryModify(user, issueForm, checkIssueData, multipartFiles);
@@ -3712,28 +3761,31 @@
@Transactional
@Override
public void modifyParentIssue(IssueForm issueDownForm) {
- Issue issue = this.getIssue(issueDownForm.getId()); //�븯�쐞 �씠�뒋
+ //Issue issue = this.getIssue(issueDownForm.getId()); //�븯�쐞 �씠�뒋
Long newParentIssueId = issueDownForm.getParentIssueId(); //蹂�寃쏀븷 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
-
StringBuilder sb = new StringBuilder();
- Issue parentIssue = issue.getParentIssue(); //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
- if(parentIssue != null && parentIssue.getId().equals(newParentIssueId)){ //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋媛� 議댁옱 �븷 寃쎌슦
- this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
- this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
- }
+ for (Long downId : issueDownForm.getIds()) {
+ Issue issue = this.getIssue(downId);
- if (newParentIssueId != null) { // 異붽� �븷 寃쎌슦
- parentIssue = this.getIssue(newParentIssueId); //�긽�쐞�씠�뒋(myIssue)
- issue.setParentIssue(parentIssue); //myIssue瑜� �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋濡� set
- this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = �븯�쐞�씠�뒋
- } else{
- // �궘�젣 �븷 寃쎌슦
- this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
- issue.setParentIssue(null);
+ Issue parentIssue = issue.getParentIssue(); //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋
+ if(parentIssue != null && parentIssue.getId().equals(newParentIssueId)){ //蹂�寃� �쟾 �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋媛� 議댁옱 �븷 寃쎌슦
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
+ this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
+ }
+
+ if (newParentIssueId != null) { // 異붽� �븷 寃쎌슦
+ parentIssue = this.getIssue(newParentIssueId); //�긽�쐞�씠�뒋(myIssue)
+ issue.setParentIssue(parentIssue); //myIssue瑜� �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋濡� set
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = �븯�쐞�씠�뒋
+ } else{
+ // �궘�젣 �븷 寃쎌슦
+ this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
+ issue.setParentIssue(null);
+ }
+ this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString()); //parentIssue = myIssue(湲곕줉�� �쁽�옱 �긽�꽭�럹�씠吏��뿉 �빐�빞�븯�땲源�)
+ this.issueRepository.saveAndFlush(issue);
}
- this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString()); //parentIssue = myIssue(湲곕줉�� �쁽�옱 �긽�꽭�럹�씠吏��뿉 �빐�빞�븯�땲源�)
- this.issueRepository.saveAndFlush(issue);
}
@Override
--
Gitblit v1.8.0