이슈 테이블 표시 설정 추가 완료(백엔드)

이민희

2021-11-22 4e91e7a3901605e73ae9fabc987ad4a594f6a14b

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

@@ -32,9 +32,6 @@
    @Autowired
    private UserService userService;

    @Autowired
    private IssueTableConfigService issueTableConfigService;

    @Override
    protected JpaRepository<IssueTableConfig, Long> getRepository() {
        return this.issueTableConfigRepository;
@@ -46,8 +43,8 @@
    //  add 중복코드 제거
    public IssueTableConfig addMultipleCode(Map<String, Object> params, Long issueId, int issueTableType) {
        String issueTableConfigs = MapUtil.getString(params, "issueTableConfigs");
        IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
        IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(issueId, issueTableType);
        //IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);

        //  아직 테이블 컬럼 설정을 하지 않았을 경우
        if (issueTableConfig == null) {
@@ -56,12 +53,19 @@
            User user = this.userService.getUser(this.webAppUtil.getLoginId());
            issueTableConfig.setWorkspace(workspace);
            issueTableConfig.setUser(user);
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);
        }else if(saveIssueTableType == null){
            issueTableConfig.setIssueId(issueId);
            issueTableConfig.setIssueTableType(issueTableType);
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);
        }else{
        /*}else if(saveIssueTableType == null){
            issueTableConfig = new IssueTableConfig();
            Workspace workspace = this.workspaceService.getWorkspace(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
            User user = this.userService.getUser(this.webAppUtil.getLoginId());
            issueTableConfig.setWorkspace(workspace);
            issueTableConfig.setUser(user);
            issueTableConfig.setIssueId(issueId);
            issueTableConfig.setIssueTableType(issueTableType);
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);*/
        }else {
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);
        }
        return this.issueTableConfigRepository.saveAndFlush(issueTableConfig);
@@ -93,9 +97,9 @@
    //  해당 업무 공간에서 사용자의 이슈 테이블 설정을 조회한다.
    @Override
    @Transactional(readOnly = true)
    public IssueTableConfig findByUserIdAndWorkspaceId() {
        return this.issueTableConfigRepository.findByUserIdAndWorkspaceId(this.webAppUtil.getLoginId(),
                this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
    public IssueTableConfig findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(Long issueId, int issueTableType) {
        return this.issueTableConfigRepository.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(this.webAppUtil.getLoginId(),
                this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), issueId, issueTableType);
    }

    //이슈 Id와 IssueTableType 조회
@@ -108,11 +112,11 @@
    // detail 중복 코드 제거
    private void detailMultipleCode(Map<String, Object> resJsonData, Long issueId, int issueTableType) {
        //  해당 업무 공간에서 사용자의 이슈 검색 조건을 조회한다.
        IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(issueId, issueTableType);
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);

        if (issueTableConfig != null && saveIssueTableType != null) {
            resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
        if (issueTableConfig != null) {
            resJsonData.put(Constants.RES_KEY_CONTENTS, saveIssueTableType.getIssueTableConfigs());
        }
        else {
            resJsonData.put(Constants.RES_KEY_CONTENTS, "");