From 25e69beeac0e3939ba1873806710a18a5ec3091e Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 목, 03 3월 2022 17:49:56 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 176 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 94 insertions(+), 82 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 0e8375e..e5c057b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -545,6 +545,15 @@
// HOSTING �젙蹂� ���옣
this.issueHostingService.modifyIssueHostingField(issue, issueForm, detectIssueChange);
+ if (issueForm.getParentIssueId() != null){
+ Issue parentIssue = this.getIssue(issueForm.getParentIssueId());
+ if (issueForm.getIsApi().equals(Issue.IS_API_YES)
+ || (issueForm.getInheritYn() != null && issueForm.getInheritYn())) {
+ // �븯�쐞�씠�뒋�뿉 �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂� �쟻�슜
+ this.inheritPartners(issue, parentIssue);
+ }
+ }
+
// 泥⑤� �뙆�씪 ���옣
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
@@ -581,15 +590,15 @@
// �븯�쐞�씠�뒋瑜� �깮�꽦�븳�떎.
@Override
@Transactional
- public Issue addDownIssue(IssueForm issueForm, List<MultipartFile> multipartFiles) {
+ public Issue addDownIssue(Map<String, Object> resJsonData, IssueForm issueForm, List<MultipartFile> multipartFiles) {
User user = this.webAppUtil.getLoginUserObject();
- return addDownIssue(user, issueForm, multipartFiles);
+ return addDownIssue(resJsonData, user, issueForm, multipartFiles);
}
// �븯�쐞�씠�뒋瑜� �깮�꽦�븳�떎.
@Override
@Transactional
- public Issue addDownIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
+ public Issue addDownIssue(Map<String, Object> resJsonData, User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
StringBuilder detectIssueChange = new StringBuilder();
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
@@ -653,6 +662,7 @@
this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.ADD, null);
// �씠�뒋 �쐞�뿕 愿�由� �깮�꽦
this.issueRiskService.addIssueRisk(issue, project.getWorkspace());
+
// �쁺�냽�꽦 而⑦뀓�뒪�듃 鍮꾩슦湲�
this.clear();
// �씠�뒋 �깮�꽦, �궘�젣�떆 �삁�빟 �씠硫붿씪�뿉 �벑濡앺빐�넃�뒗�떎.
@@ -662,7 +672,22 @@
UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_ADD));
+ IssueVo issueVo = this.convertToIssueVo(issue);
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issueVo);
+
return issue;
+ }
+
+ /**
+ * Issue瑜� IssueVo濡� 蹂��솚(�븯�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂� �긽�냽 �떆 �븘�슂)
+ * @param issue Issue
+ * @return IssueVo
+ */
+ private IssueVo convertToIssueVo(Issue issue) {
+ IssueVo issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
+ issueVo.setInheritPartners(issue.getIssueType().getInheritPartners());
+ issueVo.setUsePartner(issue.getIssueType().getUsePartner());
+ return issueVo;
}
// �뿰愿��씠�뒋瑜� �깮�꽦�븳�떎.
@@ -3109,6 +3134,9 @@
Workbook workbook;
+ IssueType issueType = new IssueType();
+ Workflow workflow = new Workflow();
+
workbook = WorkbookFactory.create(multipartFile.getInputStream());
Sheet sheet = workbook.getSheetAt(0);
int lastRowNum = sheet.getLastRowNum() + 1;
@@ -3148,6 +3176,15 @@
companyFieldMaps, ispFieldMaps, hostingFieldMaps, headers);
ConvertUtil.copyProperties(issueForm, newIssueForm);
+ Project project = this.projectService.getProject(newIssueForm.getProjectId());
+ Long issueNumber = this.issueNumberGeneratorService.generateIssueNumber(project);
+ newIssueForm.setIssueNumber(issueNumber);
+
+ issueType = this.issueTypeService.getIssueType(newIssueForm.getIssueTypeId());
+ workflow = issueType.getWorkflow();
+ IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(workflow);
+
+ newIssueForm.setIssueStatusId(issueStatus.getId());
issueForms.add(newIssueForm);
}
}
@@ -3157,58 +3194,28 @@
}
// 1.176
-
// �씠�뒋 �벑濡�
-// this.issueMapper.insertBatch(issueForms);
+ this.issueMapper.insertBatch(issueForms);
for (IssueForm saveIssueForm : issueForms) {
Issue issue = new Issue();
ConvertUtil.copyProperties(saveIssueForm, issue);
- IssueType issueType = this.issueTypeService.getIssueType(saveIssueForm.getIssueTypeId());
- Workflow workflow = issueType.getWorkflow();
-
- Project project = this.projectService.getProject(saveIssueForm.getProjectId());
- Long issueNumber = this.issueNumberGeneratorService.generateIssueNumber(project);
-
- IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(workflow);
-
- issue.setPriority(this.priorityService.getPriority(saveIssueForm.getPriorityId()));
- issue.setSeverity(this.severityService.getSeverity(saveIssueForm.getSeverityId()));
- issue.setIssueStatus(issueStatus);
- issue.setIssueType(issueType);
- issue.setProject(project);
- issue.setIssueNumber(issueNumber);
- if (saveIssueForm.getParentIssueId() != null && saveIssueForm.getParentIssueId() > -1) {
- issue.setParentIssue(this.getIssue(saveIssueForm.getParentIssueId()));
- }
-
- issue = this.issueRepository.saveAndFlush(issue);
-
- if (issueForm.getInheritYn() != null && issueForm.getInheritYn() && issue.getParentIssue() != null) {
+ if (issueForm.getInheritYn() != null && issueForm.getInheritYn() && issueForm.getParentIssueId() != null) {
+ Issue parentIssue = this.getIssue(issueForm.getParentIssueId());
// �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂� �긽�냽
- this.inheritPartners(issue, issue.getParentIssue());
+ this.inheritPartners(issue, parentIssue);
}
saveIssueForm.setId(issue.getId());
-
- IssueDepartment issueDepartment = new IssueDepartment();
- issueDepartment.setIssue(issue);
- issueDepartment.setWorkspace(workspace);
-
+
+ // �썙�겕�뵆濡쒖슦 ��湲� �긽�깭�쓽 遺��꽌 異붽�
List<Long> departmentsIds = this.workflowDepartmentService.findFirstDepartmentIds(workflow);
if (departmentsIds != null && departmentsIds.size() > 0) {
- for (Long departmentId : departmentsIds) {
- issueDepartment.setDepartment(this.departmentService.getDepartment(departmentId));
- }
- issue.addIssueDepartment(issueDepartment);
+ this.issueDepartmentService.add(departmentsIds, workspace, issue);
}
-
- saveIssueForm.setIssueStatusId(issueStatus.getId());
-
this.setIssuePartners(saveIssueForm, issue);
}
-
// 0.416 - 0.439
@@ -3247,24 +3254,21 @@
* @param issueForm IssueForm
*/
private void setIssuePartners(IssueForm issueForm, Issue issue) {
- IssueCompany issueCompany = new IssueCompany();
- IssueIsp issueIsp = new IssueIsp();
- IssueHosting issueHosting = new IssueHosting();
//issueCompany �벑濡�
if (issueForm.getIssueCompanyFields() != null && issueForm.getIssueCompanyFields().size() > 0) {
for (Map<String, Object> issueCompanyMap : issueForm.getIssueCompanyFields()) {
CompanyField companyField = ConvertUtil.convertMapToClass(issueCompanyMap, CompanyField.class);
- issueCompany = ConvertUtil.convertMapToClass(issueCompanyMap, IssueCompany.class, "id");
+ IssueCompany issueCompany = ConvertUtil.convertMapToClass(issueCompanyMap, IssueCompany.class, "id", "registerDate", "modifyDate");
issueCompany.setCompanyField(companyField);
issueCompany.setIssue(issue);
this.issueCompanyRepository.saveAndFlush(issueCompany);
- // �궗�슜�옄媛� ISP瑜� 吏곸젒 �엯�젰�븯吏� �븡�븯�쓣 寃쎌슦 �뾽泥댁뿉 �벑濡앸릺�뼱�엳�뒗 ISP �꽕�젙
+ // �궗�슜�옄媛� ISP瑜� 吏곸젒 �엯�젰�븯吏� �븡�븯�쓣 寃쎌슦 �뾽泥댁뿉 �벑濡앸릺�뼱�엳�뒗 ISP �꽕�젙
if (issueForm.getIssueIspFields() == null || issueForm.getIssueIspFields().size() < 1) {
// �뾽泥댁쓽 ISP媛� �엳�뒗 寃쎌슦 issueISP �벑濡�
if (companyField.getIspId() != null && companyField.getIspId() != -1) {
IspField ispField = this.ispFieldService.getIsp(companyField.getIspId());
- issueIsp = ConvertUtil.copyProperties(ispField, IssueIsp.class, "id");
+ IssueIsp issueIsp = ConvertUtil.copyProperties(ispField, IssueIsp.class, "id", "registerDate", "modifyDate");
issueIsp.setIspField(ispField);
issueIsp.setIssue(issue);
this.issueIspRepository.saveAndFlush(issueIsp);
@@ -3275,7 +3279,7 @@
// �뾽泥댁쓽 �샇�뒪�똿�씠 �엳�뒗 寃쎌슦 issueHosting �벑濡�
if (companyField.getHostingId() != null && companyField.getHostingId() != -1) {
HostingField hostingField = this.hostingFieldService.getHosting(companyField.getHostingId());
- issueHosting = ConvertUtil.copyProperties(hostingField, IssueHosting.class, "id");
+ IssueHosting issueHosting = ConvertUtil.copyProperties(hostingField, IssueHosting.class, "id", "registerDate", "modifyDate");
issueHosting.setHostingField(hostingField);
issueHosting.setIssue(issue);
this.issueHostingRepository.saveAndFlush(issueHosting);
@@ -3286,7 +3290,7 @@
//issueIsp �벑濡�
if (issueForm.getIssueIspFields() != null && issueForm.getIssueIspFields().size() > 0) {
for (Map<String, Object> issueIspMap : issueForm.getIssueIspFields()) {
- issueIsp = ConvertUtil.convertMapToClass(issueIspMap, IssueIsp.class, "id");
+ IssueIsp issueIsp = ConvertUtil.convertMapToClass(issueIspMap, IssueIsp.class, "id", "registerDate", "modifyDate");
IspField ispField = ConvertUtil.convertMapToClass(issueIspMap, IspField.class);
issueIsp.setIspField(ispField);
issueIsp.setIssue(issue);
@@ -3296,7 +3300,7 @@
//issueHosting �벑濡�
if (issueForm.getIssueHostingFields() != null && issueForm.getIssueHostingFields().size() > 0) {
for (Map<String, Object> issueHostingMap : issueForm.getIssueHostingFields()) {
- issueHosting = ConvertUtil.convertMapToClass(issueHostingMap, IssueHosting.class, "id");
+ IssueHosting issueHosting = ConvertUtil.convertMapToClass(issueHostingMap, IssueHosting.class, "id", "registerDate", "modifyDate");
HostingField hostingField = ConvertUtil.convertMapToClass(issueHostingMap, HostingField.class);
issueHosting.setHostingField(hostingField);
issueHosting.setIssue(issue);
@@ -3404,39 +3408,7 @@
}
// �뿊���뿉 �뾽泥대챸�쓣 �엯�젰�븯吏� �븡�븯�쓣 寃쎌슦 媛숈� �룄硫붿씤 �뾽泥� 李얘린
- if (issueForm.getIssueCompanyFields() == null || issueForm.getIssueCompanyFields().size() < 1) {
- // 媛숈� �룄硫붿씤 �뾽泥� 李얘린
- IssueForm partners = this.findCompanyField(issueForm);
- Issue issue = this.findOne(issueForm.getId());
- if (partners.getIssueCompanyFields() != null && partners.getIssueCompanyFields().size() > 0) {
- for (Map<String, Object> company : partners.getIssueCompanyFields()) {
- IssueCompany issueCompany = ConvertUtil.convertMapToClass(company, IssueCompany.class);
- CompanyField companyField = ConvertUtil.convertMapToClass(company, CompanyField.class);
- issueCompany.setCompanyField(companyField);
- issueCompany.setIssue(issue);
-
- this.issueCompanyRepository.saveAndFlush(issueCompany);
- }
- }
- if (partners.getIssueIspFields() != null && partners.getIssueIspFields().size() > 0) {
- for (Map<String, Object> isp : partners.getIssueIspFields()) {
- IssueIsp issueIsp = ConvertUtil.convertMapToClass(isp, IssueIsp.class);
- IspField ispField = ConvertUtil.convertMapToClass(isp, IspField.class);
- issueIsp.setIspField(ispField);
- issueIsp.setIssue(issue);
- this.issueIspRepository.saveAndFlush(issueIsp);
- }
- }
- if (partners.getIssueHostingFields() != null && partners.getIssueHostingFields().size() > 0) {
- for (Map<String, Object> hosting : partners.getIssueHostingFields()) {
- IssueHosting issueHosting = ConvertUtil.convertMapToClass(hosting, IssueHosting.class);
- HostingField hostingField = ConvertUtil.convertMapToClass(hosting, HostingField.class);
- issueHosting.setHostingField(hostingField);
- issueHosting.setIssue(issue);
- this.issueHostingRepository.saveAndFlush(issueHosting);
- }
- }
- }
+ this.findPartnerByDomain(issueForm);
}
if (issueCustomFieldValueMaps.size() > 0) {
@@ -3444,6 +3416,46 @@
}
}
+ /**
+ * �뿊���뿉 �뾽泥대챸�쓣 �엯�젰�븯吏� �븡�븯�쓣 寃쎌슦 媛숈� �룄硫붿씤 �뾽泥� 李얘린
+ * @param issueForm IssueForm
+ */
+ private void findPartnerByDomain(IssueForm issueForm) {
+ if (issueForm.getIssueCompanyFields() == null || issueForm.getIssueCompanyFields().size() < 1) {
+ // 媛숈� �룄硫붿씤 �뾽泥� 李얘린
+ IssueForm partners = this.findCompanyField(issueForm);
+ Issue issue = this.findOne(issueForm.getId());
+ if (partners.getIssueCompanyFields() != null && partners.getIssueCompanyFields().size() > 0) {
+ for (Map<String, Object> company : partners.getIssueCompanyFields()) {
+ IssueCompany issueCompany = ConvertUtil.convertMapToClass(company, IssueCompany.class);
+ CompanyField companyField = ConvertUtil.convertMapToClass(company, CompanyField.class);
+ issueCompany.setCompanyField(companyField);
+ issueCompany.setIssue(issue);
+
+ this.issueCompanyRepository.saveAndFlush(issueCompany);
+ }
+ }
+ if (partners.getIssueIspFields() != null && partners.getIssueIspFields().size() > 0) {
+ for (Map<String, Object> isp : partners.getIssueIspFields()) {
+ IssueIsp issueIsp = ConvertUtil.convertMapToClass(isp, IssueIsp.class);
+ IspField ispField = ConvertUtil.convertMapToClass(isp, IspField.class);
+ issueIsp.setIspField(ispField);
+ issueIsp.setIssue(issue);
+ this.issueIspRepository.saveAndFlush(issueIsp);
+ }
+ }
+ if (partners.getIssueHostingFields() != null && partners.getIssueHostingFields().size() > 0) {
+ for (Map<String, Object> hosting : partners.getIssueHostingFields()) {
+ IssueHosting issueHosting = ConvertUtil.convertMapToClass(hosting, IssueHosting.class);
+ HostingField hostingField = ConvertUtil.convertMapToClass(hosting, HostingField.class);
+ issueHosting.setHostingField(hostingField);
+ issueHosting.setIssue(issue);
+ this.issueHostingRepository.saveAndFlush(issueHosting);
+ }
+ }
+ }
+ }
+
// �씠�뒋�쓽 二쇱슂 �냽�꽦�쓣 map �뿉 ���옣�븯�뿬 �뿊�� import �뿉�꽌 吏��젙�븳 ���긽(�씠�뒋 �냽�꽦)�쓣 鍮좊Ⅴ寃� 李얠쓣 �닔 �엳寃� �븳�떎.
private void IssueAttributeMapToList(IssueForm issueForm, Map<String, Priority> priorityMaps, Map<String, Severity> severityMaps,
Map<String, DepartmentVo> departmentMaps, Map<String, CustomField> customFieldMaps,Map<String, Long> issueTypeCustomFieldMaps,
--
Gitblit v1.8.0