이슈관리 - 담당부서 추가

이민희

2021-11-15 8e6c2879222d906759291370f86756681c5f51c4

이슈관리 - 담당부서 추가

 src/main/java/kr/wisestone/owl/domain/IssueUser.java

@@ -23,6 +23,10 @@
    @JoinColumn(name = "workspace_id")
    private Workspace workspace;

    @ManyToOne(fetch = FetchType.LAZY)
    @JoinColumn(name = "department_id")
    private Department department;

    public IssueUser() {
    }

@@ -62,4 +66,12 @@
    public void setWorkspace(Workspace workspace) {
        this.workspace = workspace;
    }

    public Department getDepartment() {
        return department;
    }

    public void setDepartment(Department department) {
        this.department = department;
    }
}

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

@@ -744,6 +744,7 @@
        issueVo.setSeverityVo(ConvertUtil.copyProperties(issue.getSeverity(), SeverityVo.class));
        this.setRegister(issue, issueVo);   //  등록자 정보 셋팅
        this.setIssueUser(issue, issueVo);  //  담당자 정보 셋팅
        this.setIssueDepartment(issue, issueVo);  //  담당부서 정보 셋팅
        this.setAttachedFiles(issue, issueVo);  //  첨부 파일 정보 셋팅
        this.setIssueCustomFields(issue, issueVo);  //  사용자 정의 필드 값 정보 셋팅
        this.setIssueComments(issue, issueVo);  //  댓글 정보 셋팅
@@ -830,6 +831,18 @@
        issueVo.setUserVos(userVos);
    }

    //  이슈 담당부서 정보를 셋팅한다.
    private void setIssueDepartment(Issue issue, IssueVo issueVo) {
        List<DepartmentVo> departmentVos = Lists.newArrayList();

        for (IssueUser issueUser : issue.getIssueUsers()) {
            DepartmentVo departmentVo = ConvertUtil.copyProperties(issueUser.getDepartment(), DepartmentVo.class);
            departmentVo.setByName(departmentVo.getByName());
            departmentVos.add(departmentVo);
        }
        issueVo.setDepartmentVos(departmentVos);
    }

    //  이슈 첨부파일 정보를 셋팅한다.
    private void setAttachedFiles(Issue issue, IssueVo issueVo) {
        List<AttachedFileVo> attachedFileVos = Lists.newArrayList();

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

@@ -237,11 +237,11 @@

        } else if(validAdmin == 1) {    // 라이센스 입력 관리자

            DepartmentForm departmentForm = new DepartmentForm();
            /*DepartmentForm departmentForm = new DepartmentForm();

            departmentForm.setDepartmentName("부서 없음");
            Department department = this.departmentService.add(departmentForm);
            this.departmentRepository.saveAndFlush(department);
            this.departmentRepository.saveAndFlush(department);*/

            Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();


 src/main/java/kr/wisestone/owl/vo/IssueVo.java

@@ -37,6 +37,7 @@
    private UserVo registerVo;  //  이슈 상세에서 사용
    private Boolean modifyPermissionCheck = Boolean.FALSE;
    private List<UserVo> userVos = Lists.newArrayList();
    private List<DepartmentVo> departmentVos = Lists.newArrayList(); //담당부서 추가
    private List<AttachedFileVo> attachedFileVos = Lists.newArrayList();
    private List<IssueCommentVo> issueCommentVos = Lists.newArrayList();
    private List<IssueHistoryVo> issueHistoryVos = Lists.newArrayList();
@@ -370,4 +371,12 @@
    public  List<IssueVo> getIssueRelationIssueVos() { return  this.issueRelationVos; }

    public void setIssueRelationIssueVos(List<IssueVo> issueRelationVos) { this.issueRelationVos = issueRelationVos; }

    public List<DepartmentVo> getDepartmentVos() {
        return departmentVos;
    }

    public void setDepartmentVos(List<DepartmentVo> departmentVos) {
        this.departmentVos = departmentVos;
    }
}

 src/main/resources/migration/V1_1__Initial_Setup.sql

@@ -303,7 +303,8 @@
-- 테이블 owl_en_1.5.issue_user 구조 내보내기
CREATE TABLE IF NOT EXISTS `issue_user` (
    `id` bigint(20) NOT NULL AUTO_INCREMENT,
    `user_id` bigint(20) NOT NULL,
    `user_id` bigint(20) NULL,
    `department_id` bigint(20) NOT NULL,
    `issue_id` bigint(20) NOT NULL,
    `workspace_id` bigint(20) NOT NULL,
    `register_id` bigint(20) NOT NULL,
@@ -314,7 +315,8 @@
    KEY `userIdAndIssueIdIndex` (`user_id`,`issue_id`),
    KEY `issueIdIndex` (`issue_id`),
    KEY `workspaceIdIndex` (`workspace_id`),
    KEY `userIdIndex` (`user_id`)
    KEY `userIdIndex` (`user_id`),
    KEY `departmentIdIndex` (`department_id`)
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- 테이블 데이터 owl_en_1.5.issue_user:~0 rows (대략적) 내보내기