사용자정의필드 useFlag 조건 추가

이민희

2021-12-03 5c686b4f8f380ff6aacb805bdf03d5b6a8d91b52

사용자정의필드 useFlag 조건 추가

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

@@ -19,6 +19,7 @@
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    private Long id;
    private String name;
    private String useFlag;

    @Enumerated(EnumType.STRING)
    private CustomFieldType customFieldType;
@@ -38,7 +39,6 @@
    @OneToMany(mappedBy = "customField", cascade = {CascadeType.ALL}, orphanRemoval = true)
    private Set<IssueCustomFieldValue> issueCustomFieldValues = new HashSet<>();

    private String useFlag;

    public CustomField() {
    }
@@ -110,4 +110,12 @@
    public void setIssueCustomFieldValues(Set<IssueCustomFieldValue> issueCustomFieldValues) {
        this.issueCustomFieldValues = issueCustomFieldValues;
    }

    public String getUseFlag() {
        return useFlag;
    }

    public void setUseFlag(String useFlag) {
        this.useFlag = useFlag;
    }
}

 src/main/java/kr/wisestone/owl/repository/CustomFieldRepository.java

@@ -7,10 +7,11 @@

public interface CustomFieldRepository extends JpaRepository<CustomField, Long> {

    CustomField findByNameAndWorkspaceId(@Param("name") String name, @Param("workspaceId") Long workspaceId);
    CustomField findByNameAndWorkspaceIdAndUseFlag(@Param("name") String name, @Param("workspaceId") Long workspaceId, @Param("useFlag") String useFlag);

    CustomField findByNameAndWorkspaceIdAndIdNot(@Param("name") String name, @Param("workspaceId") Long workspaceId, @Param("id") Long id);
    CustomField findByNameAndWorkspaceIdAndIdNotAndUseFlag(@Param("name") String name, @Param("workspaceId") Long workspaceId, @Param("id") Long id, @Param("useFlag") String useFlag);

    List<CustomField> findByWorkspaceId(@Param("workspaceId") Long workspaceId);
    


}

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

@@ -110,12 +110,12 @@

        CustomField customField;
        Long workspaceId = this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId();

        String useFlag = "Y";
        if (id == null) {
            customField = this.customFieldRepository.findByNameAndWorkspaceId(name, workspaceId);
            customField = this.customFieldRepository.findByNameAndWorkspaceIdAndUseFlag(name, workspaceId, useFlag);
        }
        else {
            customField = this.customFieldRepository.findByNameAndWorkspaceIdAndIdNot(name, workspaceId, id);
            customField = this.customFieldRepository.findByNameAndWorkspaceIdAndIdNotAndUseFlag(name, workspaceId, id, useFlag);
        }

        if (customField != null) {
@@ -342,7 +342,8 @@
    @Override
    @Transactional(readOnly = true)
    public CustomField findByName(String name) {
        return this.customFieldRepository.findByNameAndWorkspaceId(name, this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
        String useFlag = "Y";
        return this.customFieldRepository.findByNameAndWorkspaceIdAndUseFlag(name, this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId(), useFlag);
    }

    //  사용자 정의 필드 목록을 엑셀로 다운로드 한다.