From c88104169bc4fe457f98f33a91574c4dd33da573 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 03 12월 2021 20:08:01 +0900
Subject: [PATCH] - api 입력 오류 수정 - api 기본값 및 중복 설정 적용 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 153 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 125 insertions(+), 28 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 934520a..8bfe576 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -20,10 +20,7 @@
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.util.DateUtil;
import kr.wisestone.owl.vo.*;
-import kr.wisestone.owl.web.condition.IssueCondition;
-import kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition;
-import kr.wisestone.owl.web.condition.IssueTypeCustomFieldCondition;
-import kr.wisestone.owl.web.condition.ProjectCondition;
+import kr.wisestone.owl.web.condition.*;
import kr.wisestone.owl.web.form.*;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.lang3.StringUtils;
@@ -191,11 +188,7 @@
}
-
- // API 瑜� �넻�빐 �씠�뒋 異붽�.
- @Override
- @Transactional
- public Issue addApiIssue(IssueApiForm issueApiForm) {
+ private IssueForm convertToIssueForm(IssueApiForm issueApiForm, User user) {
if (issueApiForm.getIssueTypeId() == null) {
throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ISSUE_TYPE_ERROR));
}
@@ -214,14 +207,7 @@
}
issueForm.setProjectId(project.getId());
- // �넗�겙�쑝濡� �쑀�� �젙蹂� 媛��졇�삤湲�
- String token = issueApiForm.getToken();
- UserVo userVo = this.apiTokenService.certification(token);
-
- // �빐�떦 �쑀�� �젙蹂닿� �쁽�옱 db�뿉 �엳�뒗吏� �솗�씤
- User user = this.userService.getUser(userVo.getId());
if (user != null) {
-
// 湲곕낯媛� �엯�젰�븯湲�
IssueApiDefaultForm issueApiDefaultForm = new IssueApiDefaultForm();
issueApiDefaultForm.setUserId(user.getId());
@@ -229,6 +215,7 @@
IssueApiDefault issueApiDefault = this.issueApiDefaultService.find(issueApiDefaultForm);
if (issueApiDefault != null) {
ConvertUtil.copyProperties(issueApiDefault, issueForm);
+ issueForm.setId(null);
issueForm.setPriorityId(issueApiDefault.getPriority().getId());
issueForm.setSeverityId(issueApiDefault.getSeverity().getId());
}
@@ -251,11 +238,33 @@
// api �엯�젰媛� �쟻�슜
ConvertUtil.copyProperties(issueApiForm, issueForm);
- return addIssue(user, issueForm, issueApiForm.getMultipartFiles());
+ return issueForm;
+
} else {
throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_USER_ERROR));
}
}
+
+ private User convertToUser(String token) {
+ // �넗�겙�쑝濡� �쑀�� �젙蹂� 媛��졇�삤湲�
+ UserVo userVo = this.apiTokenService.certification(token);
+
+ // �빐�떦 �쑀�� �젙蹂닿� �쁽�옱 db�뿉 �엳�뒗吏� �솗�씤
+ return this.userService.getUser(userVo.getId());
+ }
+
+
+ // API 瑜� �넻�빐 �씠�뒋 異붽�.
+ @Override
+ @Transactional
+ public Issue addApiIssue(IssueApiForm issueApiForm) {
+ User user = convertToUser(issueApiForm.getToken());
+ IssueForm issueForm = this.convertToIssueForm(issueApiForm, user);
+
+ return addIssue(user, issueForm, issueApiForm.getMultipartFiles());
+ }
+
+
// 以묐났�맂 �긽�쐞 �씠�뒋 寃��깋
private IssueVo findIssue(IssueApiForm issueApiForm, Long userId) {
@@ -319,6 +328,10 @@
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)); // 媛� �봽濡쒖젥�듃�쓽 怨좎쑀 �씠�뒋 踰덊샇 �깮�꽦
@@ -373,7 +386,6 @@
projectRoleUserMap.put("statuses", Lists.newArrayList("02")); // 愿�由ъ옄 議고쉶
// 愿�由ъ옄 �젙蹂� �뀑�똿
List<Map<String, Object>> projectRoleUsers = this.projectRoleUserService.findProjectRoleUser(projectRoleUserMap);
-
if (projectRoleUsers != null && !projectRoleUsers.isEmpty()) {
for (Map<String, Object> projectRoleUser : projectRoleUsers) {
UserVo userVo = ConvertUtil.convertMapToClass(projectRoleUser, UserVo.class);
@@ -407,7 +419,7 @@
departsBuilder.append(issueDepartment.getDepartment().getDepartmentName());
departsBuilder.append("\n");
}
- issueMap.put("departsBuilder", departsBuilder.toString());
+ issueMap.put("departments", departsBuilder.toString());
// 湲곌컙
if (!StringUtils.isEmpty(issue.getStartDate())) {
@@ -558,6 +570,8 @@
// Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
this.setMapToIssueVo(results, issueVos, issueCondition);
+ this.setCountDownIssues(results, issueVos);
+
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVos);
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
@@ -566,6 +580,76 @@
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_FIND));
return issueVos;
}
+
+ private 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){ //�긽�쐞�씠�뒋 媛�吏�怨� �엳�뒗 �븷�뱾�씠 �엳�쑝硫�
+ for(Issue downIssue : downIssues){
+ Long parentIssueId = downIssue.getParentIssue().getId();
+ int downIssueCount = 1;
+ Issue parentIssue = this.getIssue(parentIssueId);
+ IssueVo parentIssueVo = ConvertUtil.copyProperties(parentIssue, IssueVo.class);
+ parentIssueVo.setDownIssueCount(downIssueCount);
+
+ for(IssueVo issueVo : issueVos){
+ if(issueVo.getId().equals(parentIssueVo.getId())){
+ issueVo.setDownIssueCount(parentIssueVo.getDownIssueCount());
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ // �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎(李⑦듃�슜 - �뿰愿��씪媛먰룷�븿)
+ @Override
+ @Transactional(readOnly = true)
+ public void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData) {
+
+ IssueTypeCondition issueTypeCondition = new IssueTypeCondition();
+ List<IssueTypeVo> issueTypes = this.issueTypeService.findIssueType(issueTypeCondition);
+
+ // 媛믪씠 �뾾�쓣 寃쎌슦 珥덇린媛� �엯�젰
+ if (StringUtils.isEmpty(apiMonitorCondition.getSearchPeriod())) {
+ apiMonitorCondition.setSearchPeriod(DateUtil.LAST_SEVEN_DAYS);
+ }
+
+ // 寃��깋 �씪�옄瑜� 援ы븳�떎.
+ List<Date> searchDates = CommonUtil.findSearchPeriod(apiMonitorCondition.getSearchPeriod());
+
+ // �궇吏쒓� 寃��깋�릺吏� �븡�븯�쑝硫� �삤瑜�
+ if (searchDates.size() < 1) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.WIDGET_SEARCH_DATE_NOT_FOUND));
+ }
+
+ Long index = 1L;
+ List<ApiMonitorVo> apiMonitorVos = Lists.newArrayList();
+ for (Date date : searchDates) {
+
+ String onlyDate = DateUtil.convertDateToYYYYMMDD(date);
+ issueTypeCondition.setStartDate(onlyDate + " 00:00:00");
+ issueTypeCondition.setEndDate(onlyDate + " 23:59:59");
+
+ ApiMonitorVo apiMonitorVo = new ApiMonitorVo();
+ apiMonitorVo.setId(index);
+ for (IssueTypeVo issueTypeVo : issueTypes) {
+ issueTypeCondition.setId(issueTypeVo.getId());
+ apiMonitorVo.addIssueTypeCount(this.issueMapper.countByIssueTypeIdAndDate(issueTypeCondition));
+ apiMonitorVo.setIsApi(Issue.IS_API_YES);
+
+ apiMonitorVos.add(apiMonitorVo);
+ }
+ index++;
+ }
+ Map<String, Object> data = new HashMap<>();
+ data.put("issueTypeVos", issueTypes);
+ data.put("apiMonitorVos", apiMonitorVos);
+ resJsonData.put(Constants.RES_KEY_CONTENTS, data);
+ }
+
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎(李⑦듃�슜 - �뿰愿��씪媛먰룷�븿)
@Override
@@ -1141,12 +1225,29 @@
issueVo.setIssueHistoryVos(this.issueHistoryService.findIssueHistory(issue.getId()));
}
+ // �씠�뒋瑜� �닔�젙�븳�떎
+ @Override
+ public Issue modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files) {
+ User user = this.convertToUser(issueApiForm.getToken());
+ IssueForm issueForm = this.convertToIssueForm(issueApiForm, user);
+
+ return this.modifyIssue(user, issueForm, files);
+ }
+
// �씠�뒋瑜� �닔�젙�븳�떎.
@Override
@Transactional
public Issue modifyIssue(IssueForm issueForm, List<MultipartFile> multipartFiles) {
+ User user = this.webAppUtil.getLoginUserObject();
+ return modifyIssue(user, issueForm, multipartFiles);
+ }
+
+ // �씠�뒋瑜� �닔�젙�븳�떎.
+ @Override
+ @Transactional
+ public Issue modifyIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
- this.workspaceService.checkUseWorkspace();
+ this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
this.verifyIssueModifyPermission(issueForm.getId());
// �봽濡쒖젥�듃 �쑀�슚�꽦 泥댄겕
@@ -1198,14 +1299,14 @@
//this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
// �떞�떦遺��꽌 吏��젙
if(issueForm.getDepartmentIds().size()>0){
- this.issueDepartmentService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
}
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
// 泥⑤� �뙆�씪 ���옣 - 鍮꾨룞湲곕줈 �옉�룞
- this.attachedFileService.addAttachedFile(convertFileMaps, issue, this.webAppUtil.getLoginUser().getAccount());
+ this.attachedFileService.addAttachedFile(convertFileMaps, issue, user.getAccount());
// �궘�젣�맂 泥⑤��뙆�씪 泥섎━
this.attachedFileService.removeAttachedFiles(issueForm.getRemoveFiles());
// �뀓�뒪�듃 �뿉�뵒�꽣�뿉 泥⑤��븳 �뙆�씪�쓣 �씠�뒋�� �뿰寃�
@@ -1214,7 +1315,7 @@
this.issueCustomFieldValueService.modifyIssueCustomFieldValue(issue, issueForm.getIssueCustomFields());
// �씠�뒋 �씠�젰 �벑濡�
if (!StringUtils.isEmpty(detectIssueChange.toString())) {
- this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, detectIssueChange.toString());
+ this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
}
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_MODIFY));
@@ -1897,15 +1998,11 @@
result.put("customField_" + issueCustomFieldValueVo.getCustomFieldVo().getId().toString(), useValue + ", " + issueCustomFieldValueVo.getUseValue());
}
}
-
- //�뾽泥�, ISP, �샇�뒪�똿 異붽�
-
results.add(result);
} catch (Exception e) {
log.error("�뿊�� �떎�슫濡쒕뱶 �삤瑜� 諛쒖깮");
}
}
-
return results;
}
@@ -2879,4 +2976,4 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0