Merge remote-tracking branch 'origin/master'

jhjang

2022-01-05 ce82939b2d2ef793e446f464314c6e570c7ebad5

 src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java

@@ -4,6 +4,7 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.ElasticSearchConstants;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.data.CheckIssueData;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
import kr.wisestone.owl.domain.enumType.IssueHistoryType;
@@ -15,6 +16,7 @@
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.EmailTemplateForm;
import kr.wisestone.owl.web.form.IssueForm;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -63,13 +65,22 @@
    @Override
    @Transactional
    public void addIssueHistory(Issue issue, IssueHistoryType issueHistoryType, String issueChangeDescription) {
        User user = this.webAppUtil.getLoginUserObject();
        addIssueHistory(issue, user, issueHistoryType, issueChangeDescription);
    }

    //  이력 생성
    @Override
    @Transactional
    public void addIssueHistory(Issue issue, User user, IssueHistoryType issueHistoryType, String issueChangeDescription) {
        IssueHistory issueHistory = new IssueHistory();
        issueHistory.setIssue(issue);
        issueHistory.setProject(issue.getProject());
        issueHistory.setIssueHistoryType(issueHistoryType);
        StringBuilder description = new StringBuilder();
        //  이력 정보를 만들어 낸다.
        this.makeDescription(description, issueHistoryType, issueChangeDescription);

        this.makeDescription(user, description, issueHistoryType, issueChangeDescription);
        issueHistory.setDescription(description.toString());

        this.issueHistoryRepository.saveAndFlush(issueHistory);
@@ -81,6 +92,13 @@
    //  이력 정보를 만들어 낸다.
    @Override
    public void makeDescription(StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription) {
        User user = this.webAppUtil.getLoginUserObject();
        makeDescription(user, description, issueHistoryType, issueChangeDescription);
    }

    //  이력 정보를 만들어 낸다.
    @Override
    public void makeDescription(User user, StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription) {
        description.append("<div class=\"activity-text\">");

        //  생성, 수정, 삭제에 대해 기록을 남긴다.
@@ -90,9 +108,9 @@
                description.append("<span class='activity-timestamp'>");
                description.append(DateUtil.convertDateToStr(new Date()));
                description.append(" (");
                description.append(this.webAppUtil.getLoginUser().getName());
                description.append(user.getName());
                description.append(" - ");
                description.append(CommonUtil.decryptAES128(this.webAppUtil.getLoginUser().getAccount()));
                description.append(CommonUtil.decryptAES128(user.getAccount()));
                description.append(")");
                description.append("</span></h6>");
                break;
@@ -103,10 +121,10 @@
                description.append(DateUtil.convertDateToStr(new Date()));
                description.append(" (");

                if (this.webAppUtil.getLoginUser() != null) {
                    description.append(this.webAppUtil.getLoginUser().getName());
                if (user != null) {
                    description.append(user.getName());
                    description.append(" - ");
                    description.append(CommonUtil.decryptAES128(this.webAppUtil.getLoginUser().getAccount()));
                    description.append(CommonUtil.decryptAES128(user.getAccount()));
                }
                else {
                    description.append("OWL-ITS-SYSTEM");
@@ -124,11 +142,33 @@
                description.append("<span class=\"activity-timestamp\">");
                description.append(DateUtil.convertDateToStr(new Date()));
                description.append(" (");
                description.append(this.webAppUtil.getLoginUser().getName());
                description.append(user.getName());
                description.append(" - ");
                description.append(CommonUtil.decryptAES128(this.webAppUtil.getLoginUser().getAccount()));
                description.append(CommonUtil.decryptAES128(user.getAccount()));
                description.append(")");
                description.append("</span></h6>");
                break;

            case SEND:
                description.append("<h6 class=\"creat\"><span class=\"dot\"></span><span translate=\"common.sendMailIssue\">이슈 메일 전송</span>");
                description.append("<span class=\"activity-timestamp\">");
                description.append(DateUtil.convertDateToStr(new Date()));
                description.append(" (");

                if (user != null) {
                    description.append(user.getName());
                    description.append(" - ");
                    description.append(CommonUtil.decryptAES128(user.getAccount()));
                }
                else {
                    description.append("OWL-ITS-SYSTEM");
                    description.append(" - ");
                    description.append(this.systemEmail);
                }

                description.append(")");
                description.append("</span></h6>");
                description.append(issueChangeDescription);
                break;
        }

@@ -272,13 +312,25 @@
    //  이슈 아이디에 해당하는 기록 정보를 가져온다.
    @Override
    @Transactional(readOnly = true)
    public List<IssueHistoryVo> findIssueHistory(Long issueId) {
        return this.issueHistoryRepository.findByIssueId(issueId);
    public List<IssueHistoryVo> findIssueHistory(Issue issue) {
        List<IssueHistoryVo> issueHistoryVos = this.issueHistoryRepository.findByIssueId(issue.getId());
        if (issueHistoryVos != null && issueHistoryVos.size() > 0) {
            for (IssueHistoryVo issueHistoryVo : issueHistoryVos) {
                issueHistoryVo.setTitle(issue.getTitle());
            }
        }
        return issueHistoryVos;
    }

    //  이슈 변경 내역을 추출한다.
    @Override
    public StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files) {
    public StringBuilder detectIssueChange(IssueForm issueForm, CheckIssueData data, List<MultipartFile> files) {
        return this.detectIssueChange(data.getIssue(), issueForm, data.getProject(), data.getOldIssueStatus(), data.getNewIssueStatus(), data.getIssueType(), data.getPriority(), data.getSeverity(), files);
    }

    //  이슈 변경 내역을 추출한다.
    @Override
    public StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus oldIssueStatus, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files) {
        StringBuilder description = new StringBuilder();

        //  이슈 프로젝트 변경 정보를 기록한다.
@@ -288,7 +340,7 @@
        //  이슈 우선순위 변경 정보를 기록한다.
        this.detectIssuePriority(issue, issueForm, description, priority);
        //  이슈 상태 변경 정보를 기록한다.
        this.detectIssueStatus(issue, issueForm, description, issueStatus);
        this.detectIssueStatus(issue, issueForm, description, oldIssueStatus, issueStatus);
        //  이슈 타입 변경 정보를 기록한다.
        this.detectIssueType(issue, issueForm, description, issueType);
        //  이슈에 첨부된 파일에 대해 변경 정보를 기록한다.
@@ -297,8 +349,11 @@
        this.detectIssuePeriod(issue, issueForm, description);
        //  담당자 변경 정보를 기록한다.
        this.detectIssueManager(issue, issueForm, description);
        //  담당부서 변경 정보를 기록한다.
        this.detectIssueDepartment(issue, issueForm, description);

        if (issueForm.getIsApi().equals(Issue.IS_API_NO)) { //api로 변경 시 담당부서 변경 불가
            //  담당부서 변경 정보를 기록한다.
            this.detectIssueDepartment(issue, issueForm, description);
        }
        //  사용자 정의 필드 변경 정보를 기록한다.
        this.detectCustomField(issue, issueForm, description);

@@ -369,11 +424,12 @@

    //  이슈 상태 변경 정보를 기록한다.
    @Override
    public void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus issueStatus) {
        if (!issue.getIssueStatus().getId().equals(issueForm.getIssueStatusId())) {
    @Transactional
    public void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus oldIssueStatus, IssueStatus issueStatus) {
        if (!oldIssueStatus.getId().equals(issueForm.getIssueStatusId())) {
            String title = "<span translate=\"common.updateHasStatus\">상태가 변경되었습니다.</span>";
            //  이력 정보를 html 태그로 만들어 준다.
            this.makeIssueHistoryHtml(description, title, issue.getIssueStatus().getName(), issueStatus.getName());
            this.makeIssueHistoryHtml(description, title, oldIssueStatus.getName(), issueStatus.getName());

            //  이슈 위험 관리에 상태 변경 정보를 업데이트한다. - 담당자 변경
            this.issueRiskService.modifyIssueRisk(issue, true, false, issueForm.getIssueStatusId());
@@ -397,7 +453,7 @@
    public void recordRemoveWorkflowToIssueStatus(String oldIssueStatusName, String newIssueStatusName, StringBuilder description) {
        description.append("<ul class=\"activity-list\">");

        String title = "<span translate=\"common.upddetectReservationIssueStatusateWorkflowNotExist\">변경된 워크플로우에서 상태가 존재하지 않아 이슈의 상태가 변경되었습니다.</span>";
        String title = "<span translate=\"common.updateWorkflowNotExist\">변경된 워크플로우에서 상태가 존재하지 않아 이슈의 상태가 변경되었습니다.</span>";
        //  이력 정보를 html 태그로 만들어 준다.
        this.makeIssueHistoryHtml(description, title, oldIssueStatusName, newIssueStatusName);

@@ -480,10 +536,34 @@
        }
    }

    // 이슈 메일 전송 정보를 기록한다.
    @Override
    public void detectSendIssueMail(IssueHistoryType type, IssueForm issueForm, StringBuilder description) {
        this.detectSendIssueMail(type, issueForm.getSendEmails(), description);
    }

    // 이슈 메일 전송 정보를 기록한다.
    @Override
    public void detectSendIssueMail(IssueHistoryType type, List<String> sendMails, StringBuilder description) {
        if (type == IssueHistoryType.SEND) {
            description.append("<span translate=\"issue.sendIssueMailHistory\">이슈 메일 전송을 완료했습니다. </span>");
            if(sendMails != null && sendMails.size() > 0){
                for (String sendEmail : sendMails){
                    description.append("<span class=\"text-primary bold\">&nbsp;>&nbsp;" + CommonUtil.decryptAES128(sendEmail) + "</span>");
                }
            }
        }
    }

    // 업체 정보 변경 정보를 기록한다.
    @Override
    public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, IssueCompany issueCompany, StringBuilder description) {
        Long id = MapUtil.getLong(param, "companyId");
    public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, CompanyField companyField, IssueCompany issueCompany, StringBuilder description) {
        Long id = 0L;
        if (param != null) {
            id = MapUtil.getLong(param, "companyId");
        }else if(companyField != null) {
            id = companyField.getId();
        }
        Long companyFieldId = issueCompany.getCompanyField().getId();

        if (type == IssueHistoryType.ADD) { //추가 할 경우
@@ -518,8 +598,13 @@

    // ISP 정보 변경 정보를 기록한다.
    @Override
    public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IssueIsp issueIsp, StringBuilder description) {
        Long id = MapUtil.getLong(param, "companyId");
    public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IspField ispField, IssueIsp issueIsp, StringBuilder description) {
        Long id = 0L;
        if (param != null) {
            id = MapUtil.getLong(param, "companyId");
        } else if(ispField != null) {
            id = ispField.getId();
        }
        Long ispFieldId = issueIsp.getIspField().getId();

        if (type == IssueHistoryType.ADD) {
@@ -554,8 +639,13 @@

    // 호스팅 정보 변경 정보를 기록한다.
    @Override
    public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, IssueHosting issueHosting, StringBuilder description) {
        Long id = MapUtil.getLong(param, "companyId");
    public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, HostingField hostingField, IssueHosting issueHosting, StringBuilder description) {
        Long id = 0L;
        if (param != null) {
            id = MapUtil.getLong(param, "companyId");
        }else if(hostingField != null) {
            id = hostingField.getId();
        }
        Long hostingFieldId = issueHosting.getHostingField().getId();

        if (type == IssueHistoryType.ADD) {
@@ -672,10 +762,7 @@
            // 이슈 위험 관리에 담당부서 변경 정보를 업데이트 한다. - 담당부서 변경
            this.issueRiskService.modifyIssueRisk(issue, false, true, null);
            saveIssueRisk = true;
        }

        //  담당부서 수는 같으나 담당부서가 달라졌을 경우
        if (issue.getIssueDepartments().size() > 0 && issueForm.getDepartmentIds().size() > 0) {
        }else if (issue.getIssueDepartments().size() > 0 && issueForm.getDepartmentIds().size() > 0) {//  담당부서 수는 같으나 담당부서가 달라졌을 경우
            //  이전 담당자 표시
            for (IssueDepartment issueDepartment : issue.getIssueDepartments()) {
                boolean change = true;