From b2b8a75a8f5a35717bb89a07c2fe35ea16b6a99c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 09:55:16 +0900
Subject: [PATCH] 이슈 히스토리 - 중복되어서 나오는 문제 해결 및 업체에 추가된 항목들도 변경 시 이력 남기도록 수정

---
 src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
index 40ec470..932da15 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -52,8 +52,7 @@
      * @param issueForm IssueForm
      * @param issue Issue
      */
-    private void CreateHostingField(IssueForm issueForm, Issue issue) {
-        StringBuilder sb = new StringBuilder();
+    private void CreateHostingField(IssueForm issueForm, Issue issue, StringBuilder sb) {
         // issueHosting �븘�뱶 �뤌 留뚮뱾湲�
         HostingFieldForm hostingFieldForm = new HostingFieldForm();
         hostingFieldForm.setName(issueForm.getHostingName());
@@ -80,8 +79,6 @@
                 issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingFieldForm, newIssueHosting, sb);
             }
         }
-        // 異붽� �씠�젰
-        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
         this.issueHostingRepository.saveAndFlush(newIssueHosting);
     }
 
@@ -117,10 +114,9 @@
     //  �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
     @Override
     @Transactional
-    public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
+    public void modifyIssueHostingField(Issue issue, IssueForm issueForm, StringBuilder sb) {
         if (issue != null) {
             IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
-            StringBuilder sb = new StringBuilder();
             List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
             if (issueHostingFields != null && issueHostingFields.size() > 0) {
                 Map<String, Object> param = issueHostingFields.get(0);
@@ -128,7 +124,6 @@
                 if (issueHosting != null) { //�닔�젙 �떆
                     // 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set �빐二쇨린
                     issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
-                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
 
                     issueHosting.setName(MapUtil.getString(param, "name"));
                     issueHosting.setEmail(MapUtil.getString(param, "email"));
@@ -144,21 +139,21 @@
                     IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
                     // 異붽� �씠�젰
                     issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
-                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                     this.issueHostingRepository.saveAndFlush(newIssueHosting);
                 }
+
             }else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
                 // �샇�뒪�똿 �젙蹂� 吏곸젒 異붽�
-                CreateHostingField(issueForm, issue);
+                CreateHostingField(issueForm, issue, sb);
             } else {
                 this.issueHostingRepository.deleteByIssueId(issue.getId());
                 this.issueHostingRepository.flush();
 
                 if (issueHosting != null) {
                     issueHistoryService.detectIssueHosting(IssueHistoryType.DELETE, null, null, issueHosting, sb);
-                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                 }
             }
+            //issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
         }
     }
 

--
Gitblit v1.8.0