From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 17 3월 2022 17:47:45 +0900 Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정 --- src/main/java/kr/wisestone/owl/service/IssueHistoryService.java | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java index 47bf34f..454e9b5 100644 --- a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java +++ b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java @@ -1,10 +1,15 @@ package kr.wisestone.owl.service; +import kr.wisestone.owl.data.CheckIssueData; import kr.wisestone.owl.domain.*; import kr.wisestone.owl.domain.enumType.IssueHistoryType; import kr.wisestone.owl.service.impl.IssueHistoryServiceImpl; import kr.wisestone.owl.vo.IssueHistoryVo; +import kr.wisestone.owl.vo.IssueVo; import kr.wisestone.owl.web.condition.IssueHistoryCondition; +import kr.wisestone.owl.web.form.CompanyFieldForm; +import kr.wisestone.owl.web.form.HostingFieldForm; +import kr.wisestone.owl.web.form.IspFieldForm; import kr.wisestone.owl.web.form.IssueForm; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.web.multipart.MultipartFile; @@ -17,13 +22,18 @@ void addIssueHistory(Issue issue, IssueHistoryType issueHistoryType, String issueChangeDescription); + void addIssueHistory(Issue issue, User user, IssueHistoryType issueHistoryType, String issueChangeDescription); + void makeDescription(StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription); + + void makeDescription(User user, StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription); void findIssueHistory(Map<String, Object> resJsonData, IssueHistoryCondition issueHistoryCondition); - List<IssueHistoryVo> findIssueHistory(Long issueId); + List<IssueHistoryVo> findIssueHistory(Issue issue); - StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files); + StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus oldIssueStatus, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files); + StringBuilder detectIssueChange(IssueForm issueForm, CheckIssueData data, List<MultipartFile> files); void detectProject(Issue issue, IssueForm issueForm, StringBuilder description, Project project); @@ -31,7 +41,7 @@ void detectIssuePriority(Issue issue, IssueForm issueForm, StringBuilder description, Priority priority); - void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus issueStatus); + void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus oldIssueStatus, IssueStatus issueStatus); void detectReservationIssueStatus(Issue issue, StringBuilder description, IssueStatus issueStatus); @@ -43,12 +53,25 @@ void detectIssueManager(Issue issue, IssueForm issueForm, StringBuilder description); + void detectIssueDepartment(Issue issue, IssueForm issueForm, StringBuilder description); + void detectAttachedFile(IssueForm issueForm, StringBuilder description, List<MultipartFile> files); void detectCustomField(Issue issue, IssueForm issueForm, StringBuilder description); void detectRelationIssue(IssueHistoryType type, IssueRelation issueRelation, StringBuilder description); + void detectDownIssues(IssueHistoryType type, Issue issue, StringBuilder description); + + void detectSendIssueMail(IssueHistoryType type, IssueForm issueForm, StringBuilder description); + void detectSendIssueMail(IssueHistoryType type, List<String> sendMails, StringBuilder description); + + void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, CompanyFieldForm companyFieldForm, IssueCompany issueCompany, StringBuilder description); + + void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IspFieldForm ispFieldForm, IssueIsp issueIsp, StringBuilder description); + + void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, HostingFieldForm hostingFieldForm, IssueHosting issueHosting, StringBuilder description); + void recodeRemoveCustomFieldOptionValue(CustomField customField, String oldValue, String newValue, StringBuilder description); void recodeChangeCustomFieldType(CustomField customField, String oldValue, StringBuilder description); -- Gitblit v1.8.0