From 4f4fd9ee8b3315bc433b1893dbff008efdb03230 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 22 12월 2021 16:36:06 +0900
Subject: [PATCH] - API 설정 화면에서 프로젝트에서 설정된 이슈유형만 보여주도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java
index 4b3be98..5db4424 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CustomFieldApiOverlapServiceImpl.java
@@ -33,6 +33,9 @@
private IssueTypeService issueTypeService;
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private CustomFieldService customFieldService;
@Override
@@ -41,10 +44,15 @@
}
@Override
+ public List<CustomFieldApiOverlap> find(Long userId, Long issueTypeId) {
+ return this.customFieldApiOverlapRepository.findByUserIdAndIssueTypeId(userId, issueTypeId);
+ }
+
+ @Override
@Transactional
public void find(Map<String, Object> resJsonData, CustomFieldApiOverlapForm form) {
- UserVo userVo = this.webAppUtil.getLoginUser();
- List<CustomFieldApiOverlap> customFieldApiOverlaps = this.customFieldApiOverlapRepository.findByUserIdAndIssueTypeId(userVo.getId(), form.getIssueTypeId());
+ Long userId = this.webAppUtil.getLoginId();
+ List<CustomFieldApiOverlap> customFieldApiOverlaps = this.find(userId, form.getIssueTypeId());
if (customFieldApiOverlaps != null && customFieldApiOverlaps.size() > 0) {
List<CustomFieldApiOverlapVo> customFieldApiOverlapVos = Lists.newArrayList();
@@ -67,6 +75,7 @@
@Transactional
public boolean modify(Map<String, Object> resJsonData, CustomFieldApiOverlapForm form) {
User user = this.webAppUtil.getLoginUserObject();
+ Project project = this.projectService.getProject(form.getProjectId());
List<CustomFieldApiOverlap> customFieldApiOverlaps = this.customFieldApiOverlapRepository.findByUserIdAndIssueTypeId(user.getId(), form.getIssueTypeId());
if (customFieldApiOverlaps != null && customFieldApiOverlaps.size() > 0) {
this.customFieldApiOverlapRepository.deleteAll(customFieldApiOverlaps);
@@ -79,6 +88,7 @@
customFieldApiOverlap.setCustomField(customField);
customFieldApiOverlap.setUser(user);
customFieldApiOverlap.setIssueType(this.issueTypeService.getIssueType(form.getIssueTypeId()));
+ customFieldApiOverlap.setProject(project);
customFieldApiOverlapList.add(customFieldApiOverlap);
}
--
Gitblit v1.8.0