From c23fb74967932d628e1379a8a78a7ab5aa5c9c97 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 08 12월 2021 17:03:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 47 insertions(+), 5 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 7c58174..cc34278 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -17,6 +17,7 @@
 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;
@@ -155,6 +156,9 @@
     private IssueRelationService issueRelationService;
 
     @Autowired
+    private IssueRelationRepository issueRelationRepository;
+
+    @Autowired
     private ExcelView excelView;
 
     @Autowired
@@ -242,7 +246,7 @@
                 issueForm.setSeverityId(issueApiDefault.getSeverity().getId());
             }
 
-            // 以묐났 媛� �븯�쐞 �씠�뒋濡� 泥섎━�븯湲�
+            // 以묐났 媛� �긽�쐞 �씠�뒋�쓽 �븯�쐞 �씠�뒋濡� 泥섎━�븯湲�
             CustomFieldApiOverlapForm customFieldApiOverlapForm = new CustomFieldApiOverlapForm();
             customFieldApiOverlapForm.setUserId(user.getId());
             customFieldApiOverlapForm.setIssueTypeId(issueForm.getIssueTypeId());
@@ -311,14 +315,25 @@
         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) {
 
         List<IssueVo> resultIssueVos = new ArrayList<>();
+
         if (customFieldApiOverlaps != null && customFieldApiOverlaps.size() > 0) {
             for (CustomFieldApiOverlap customFieldApiOverlap : customFieldApiOverlaps) {
                 for (IssueCustomFieldValueForm issueCustomFieldValue : issueApiForm.getIssueCustomFieldValues()) {
                     IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
+                    issueCustomFieldValueCondition.setUseParentIssueId(true);
                     if (customFieldApiOverlap.getCustomField().getId().equals(issueCustomFieldValue.getCustomFieldId())) {
                         issueCustomFieldValueCondition.setUseValue(issueCustomFieldValue.getUseValue());
 
@@ -377,7 +392,7 @@
         //  �궇吏� �쑀�슚�꽦 泥댄겕
         this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
         //  �떞�떦 遺��꽌 �쑀�슚�꽦 泥댄겕
-        this.verifyIssueDepartment(project, issueForm);
+        //this.verifyIssueDepartment(project, issueForm);
 
         //  �씠�뒋 �긽�깭 �쑀�삎�씠 '��湲�' �씤 �씠�뒋 �긽�깭 媛��졇�삤湲�
         IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
@@ -463,7 +478,7 @@
         //  �궇吏� �쑀�슚�꽦 泥댄겕
         this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
         //  �떞�떦 遺��꽌 �쑀�슚�꽦 泥댄겕
-        this.verifyIssueDepartment(project, issueForm);
+        //this.verifyIssueDepartment(project, issueForm);
 
         //  �씠�뒋 �긽�깭 �쑀�삎�씠 '��湲�' �씤 �씠�뒋 �긽�깭 媛��졇�삤湲�
         IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
@@ -1442,12 +1457,20 @@
     @Override
     @Transactional
     public List<IssueVo> findIssue(IssueApiForm issueApiform) {
+
         List<IssueCustomFieldValueForm> issueCustomFieldValueForms = issueApiform.getIssueCustomFieldValues();
         List<IssueVo> resultIssueVos = new ArrayList<>();
 
         IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
+        issueCustomFieldValueCondition.setUseParentIssueId(false);
         if (issueCustomFieldValueForms.size() > 0) {
             for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {
+
+                CustomField customField = this.customFieldService.getCustomField(issueCustomFieldValueForm.getCustomFieldId());
+                CustomFieldType customFieldType = CustomFieldType.DATETIME;
+                if (customFieldType.equals(customField.getCustomFieldType())) {
+                    continue;
+                }
 //                issueCustomFieldValueCondition.addUseValue(issueCustomFieldValueForm.getUseValue());
                 issueCustomFieldValueCondition.setUseValue(issueCustomFieldValueForm.getUseValue());
                 List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
@@ -1457,6 +1480,8 @@
                     resultIssueVos.clear();
                     for (Map<String, Object> result : results) {
                         IssueVo issueVo = ConvertUtil.convertMapToClass(result, IssueVo.class);
+
+                        issueVo.setParentIssueVo(this.getParentIssueVo(MapUtil.getLong(result, "parentIssueId")));
 
                         if (findIssueVos.size() == 0) {
                             resultIssueVos.add(issueVo);
@@ -1495,11 +1520,17 @@
         User user = this.convertToUser(issueApiForm.getToken());
         IssueForm issueForm = this.convertToIssueForm(issueApiForm, user);
 
+
         List<IssueVo> issueVos = this.findIssue(issueApiForm);
         if (issueVos != null && issueVos.size() > 0) {
             List<Issue> issue = Lists.newArrayList();
             for (IssueVo issueVo : issueVos) {
-                issueForm.setId(issueVo.getId());
+                IssueVo parentIssueVo = issueVo.getParentIssueVo();
+                if (parentIssueVo != null) {
+                    issueForm.setId(parentIssueVo.getId());
+                } else {
+                    issueForm.setId(issueVo.getId());
+                }
                 issue.add(this.modifyIssueForApi(user, issueForm, files));
             }
             return issue;
@@ -1545,7 +1576,7 @@
         //  �떞�떦�옄 �쑀�슚�꽦 泥댄겕
         //this.verifyIssueAssignee(project, issueForm);
         //  �떞�떦遺��꽌 �쑀�슚�꽦 泥댄겕
-        this.verifyIssueDepartment(project, issueForm);
+        //this.verifyIssueDepartment(project, issueForm);
 
         CheckIssueData checkIssueData = new CheckIssueData();
         checkIssueData.setIssue(issue);
@@ -2047,6 +2078,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