From a9277be576a7b76de9bfbaf5e83cd6d6407dbd98 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 17 11월 2021 11:14:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
index 7b14f1d..2b81ab9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -43,6 +43,9 @@
private WorkflowService workflowService;
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private WorkspaceService workspaceService;
@Autowired
@@ -75,16 +78,16 @@
switch (projectType) {
case BTS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, this.messageAccessor.message("common.bug"), "", "#ff5f99")); // 踰꾧렇
- issueTypes.add(new IssueType(workspace, workflow, this.messageAccessor.message("common.improvement"), "", "#3598fe")); // 媛쒖꽑
+ issueTypes.add(new IssueType(workspace, workflow, "�븙�꽦 �룄硫붿씤", "", "#ff5f99")); // 踰꾧렇
+ issueTypes.add(new IssueType(workspace, workflow, "寃쎌쑀吏� ���쓳", "", "#3598fe")); // 媛쒖꽑
break;
case RMS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, this.messageAccessor.message("common.requirement"), "", "#3bcde2")); // �슂援� �궗�빆
+ issueTypes.add(new IssueType(workspace, workflow, "�쑀�룷吏� ���쓳", "", "#3bcde2")); // �슂援� �궗�빆
break;
case TCM_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, this.messageAccessor.message("common.testcase"), "", "#008ca7")); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
+ issueTypes.add(new IssueType(workspace, workflow, "遺꾩꽍寃곌낵 ���쓳", "", "#008ca7")); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
break;
}
@@ -108,6 +111,8 @@
issueType.setWorkspace(workspace);
Workflow workflow = this.workflowService.getWorkflow(issueTypeForm.getWorkflowId());
issueType.setWorkflow(workflow);
+ Project project = this.projectService.getProject(issueTypeForm.getProjectId());
+ issueType.setProject(project);
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -166,6 +171,8 @@
this.setUseIssueTypeByWorkflow(issueTypeVos);
}
+ this.setUseIssueTypeByProject(issueTypeVos);
+
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
@@ -179,6 +186,18 @@
for (IssueTypeVo issueTypeVo : issueTypeVos) {
IssueType issueType = this.getIssueType(issueTypeVo.getId());
issueTypeVo.setWorkflowVo(ConvertUtil.copyProperties(issueType.getWorkflow(), WorkflowVo.class));
+ }
+ }
+
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �봽濡쒖젥�듃 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setUseIssueTypeByProject(List<IssueTypeVo> issueTypeVos) {
+ for (IssueTypeVo issueTypeVo : issueTypeVos) {
+ IssueType issueType = this.getIssueType(issueTypeVo.getId());
+
+ Project project = issueType.getProject();
+ if (project != null) {
+ issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
+ }
}
}
@@ -196,6 +215,11 @@
case "01": // �썙�겕�뵆濡쒖슦 �젙蹂대�� 媛��졇�삩�떎.
issueTypeVo.setWorkflowVo(ConvertUtil.copyProperties(issueType.getWorkflow(), WorkflowVo.class));
break;
+ }
+
+ Project project = issueType.getProject();
+ if (project != null) {
+ issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
}
}
@@ -222,6 +246,9 @@
ConvertUtil.copyProperties(issueTypeForm, issueType, "id", "issueTypeType");
issueType.setWorkflow(workflow);
+ Project project = this.projectService.getProject(issueTypeForm.getProjectId());
+ issueType.setProject(project);
+
this.issueTypeRepository.saveAndFlush(issueType);
return issueType;
--
Gitblit v1.8.0