이슈 히스토리 - 중복되어서 나오는 문제 해결 및 업체에 추가된 항목들도 변경 시 이력 남기도록 수정

이민희

2022-01-19 b2b8a75a8f5a35717bb89a07c2fe35ea16b6a99c

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

@@ -486,6 +486,8 @@
    @Override
    @Transactional
    public Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
        StringBuilder detectIssueChange = new StringBuilder();

        //  사용하고 있는 업무 공간이 활성 상태인지 확인한다. 사용 공간에서 로그인한 사용자가 비활성인지 확인한다.
        Workspace workspace = this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
        //  프로젝트 유효성 체크
@@ -528,11 +530,11 @@
        //  담당부서 지정
        this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
        //  업체 정보 저장
        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);
        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm, detectIssueChange);
        //  ISP 정보 저장
        this.issueIspService.modifyIssueIspField(issue, issueForm);
        this.issueIspService.modifyIssueIspField(issue, issueForm, detectIssueChange);
        //  HOSTING 정보 저장
        this.issueHostingService.modifyIssueHostingField(issue, issueForm);
        this.issueHostingService.modifyIssueHostingField(issue, issueForm, detectIssueChange);

        //  첨부 파일 저장
        //  multipartFile 을 file Map List 객체로 변경한다.
@@ -579,6 +581,8 @@
    @Override
    @Transactional
    public Issue addDownIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
        StringBuilder detectIssueChange = new StringBuilder();

        //  사용하고 있는 업무 공간이 활성 상태인지 확인한다. 사용 공간에서 로그인한 사용자가 비활성인지 확인한다.
        Workspace workspace = this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
        //  프로젝트 유효성 체크
@@ -621,11 +625,11 @@
        //  담당부서 지정
        this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
        //  업체 정보 저장
        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);
        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm, detectIssueChange);
        //  ISP 정보 저장
        this.issueIspService.modifyIssueIspField(issue, issueForm);
        this.issueIspService.modifyIssueIspField(issue, issueForm, detectIssueChange);
        //  HOSTING 정보 저장
        this.issueHostingService.modifyIssueHostingField(issue, issueForm);
        this.issueHostingService.modifyIssueHostingField(issue, issueForm, detectIssueChange);

        //  첨부 파일 저장
        //  multipartFile 을 file Map List 객체로 변경한다.
@@ -656,6 +660,7 @@
    @Override
    @Transactional
    public Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
        StringBuilder detectIssueChange = new StringBuilder();
        //  사용하고 있는 업무 공간이 활성 상태인지 확인한다. 사용 공간에서 로그인한 사용자가 비활성인지 확인한다.
        Workspace workspace = this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
        //  프로젝트 유효성 체크
@@ -698,11 +703,11 @@
        //  담당부서 지정
        this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
        //  업체 정보 저장
        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);
        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm, detectIssueChange);
        //  ISP 정보 저장
        this.issueIspService.modifyIssueIspField(issue, issueForm);
        this.issueIspService.modifyIssueIspField(issue, issueForm, detectIssueChange);
        //  HOSTING 정보 저장
        this.issueHostingService.modifyIssueHostingField(issue, issueForm);
        this.issueHostingService.modifyIssueHostingField(issue, issueForm, detectIssueChange);

        //  첨부 파일 저장
        //  multipartFile 을 file Map List 객체로 변경한다.
@@ -2087,20 +2092,21 @@
        this.checkNotHaveIssueIdAttachedFile(issue, issueForm);
        //  사용자 정의 필드 저장
        this.issueCustomFieldValueService.modifyIssueCustomFieldValue(issue, issueForm.getIssueCustomFields());
        //  이슈 이력 등록
        if (!StringUtils.isEmpty(detectIssueChange.toString())) {
            this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
        }
        //  사용자 시스템 기능 사용 정보 수집
        UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
        log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));

        //  업체 정보 저장
        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);
        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm, detectIssueChange);
        //  ISP 정보 저장
        this.issueIspService.modifyIssueIspField(issue, issueForm);
        this.issueIspService.modifyIssueIspField(issue, issueForm, detectIssueChange);
        //  HOSTING 정보 저장
        this.issueHostingService.modifyIssueHostingField(issue, issueForm);
        this.issueHostingService.modifyIssueHostingField(issue, issueForm, detectIssueChange);

        //  이슈 이력 등록
        if (!StringUtils.isEmpty(detectIssueChange.toString())) {
            this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
        }

        return issue;
    }