- 이슈 담당부서 수정시 프로젝트 내의 부서로 검색 가능하도록 수정 - 이슈 유형의 '사용 프로젝트'의 담당부서를 '워크플로우'의 담당...

이민희

2022-02-10 1ff84ea2402eed9d97b4a57837a93edd61f557c0

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

@@ -51,7 +51,13 @@
    private WorkflowService workflowService;

    @Autowired
    private WorkflowDepartmentService workflowDepartmentService;

    @Autowired
    private ProjectService projectService;

    @Autowired
    private ProjectRoleService projectRoleService;

    @Autowired
    private WorkspaceService workspaceService;
@@ -144,9 +150,31 @@
        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        //  워크플로우의 담당부서와 동일하게 세팅
        this.setDepartmentOfProject(project, workflow);

        issueType.setUsePartner(issueTypeForm.getUsePartner());

        return this.issueTypeRepository.saveAndFlush(issueType);
    }

    /**
     * 워크플로우의 담당부서와 동일하게 세팅
     * @param project Project
     * @param workflow Workflow
     */
    private void setDepartmentOfProject(Project project, Workflow workflow) {
        List<WorkflowDepartment> workflowDepartments = this.workflowDepartmentService.find(workflow.getId());

        //  해당 워크플로우의 담당부서가 존재 할 경우 해당 프로젝트의 담당부서에도 추가
        if (workflowDepartments != null && workflowDepartments.size() > 0) {
            ProjectRole projectRole = this.projectRoleService.findByProjectIdAndRoleType(project.getId(), ProjectRole.TYPE_DEFAULT);

            for (WorkflowDepartment workflowDepartment : workflowDepartments) {
                //  프로젝트 담당부서로 추가
                projectRole.addDepartment(workflowDepartment.getDepartment());
            }
        }
    }

    //  이름 유효성 체크
@@ -402,6 +430,9 @@
        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        //  워크플로우의 담당부서와 동일하게 세팅
        this.setDepartmentOfProject(project, workflow);

        issueType.setUsePartner(issueTypeForm.getUsePartner());

        /*if(issueTypeForm.getCompanyId() != null){
@@ -485,6 +516,13 @@
        return this.issueTypeRepository.findByWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
    }

    //  워크플로우 ID로 이슈 유형 조회
    @Override
    @Transactional(readOnly = true)
    public List<IssueType> findByWorkflowId(Long id) {
        return this.issueTypeRepository.findByWorkflowId(id);
    }

    //  이슈 타입 필드 목록을 엑셀로 다운로드 한다.
    @Override
    @Transactional