From a3ffe41935c3859e88f91b525dbd591c9b1fa1cb Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 일, 05 12월 2021 17:43:14 +0900
Subject: [PATCH] - api 수정시 이슈 상태만 수정 가능하도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 242 +++++++++++++++++++++--------
src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 7
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 12
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 40 ++--
src/main/java/kr/wisestone/owl/data/CheckIssueData.java | 93 +++++++++++
src/main/java/kr/wisestone/owl/service/IssueHistoryService.java | 6
src/main/java/kr/wisestone/owl/service/UserWorkspaceService.java | 2
src/main/java/kr/wisestone/owl/service/IssueService.java | 6
src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java | 2
src/main/java/kr/wisestone/owl/domain/IssueUser.java | 2
src/main/java/kr/wisestone/owl/service/impl/ProjectRoleUserServiceImpl.java | 4
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 18 +
12 files changed, 323 insertions(+), 111 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/data/CheckIssueData.java b/src/main/java/kr/wisestone/owl/data/CheckIssueData.java
new file mode 100644
index 0000000..8933cf0
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/data/CheckIssueData.java
@@ -0,0 +1,93 @@
+package kr.wisestone.owl.data;
+
+import kr.wisestone.owl.config.CommonConfiguration;
+import kr.wisestone.owl.domain.*;
+import kr.wisestone.owl.service.*;
+import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.web.form.IssueForm;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+// issue �쑀�슚�꽦 泥댄겕�슜 �겢�옒�뒪
+public class CheckIssueData {
+ Issue issue;
+ IssueStatus oldIssueStatus;
+ IssueStatus newIssueStatus;
+ Project project;
+ IssueType issueType;
+ Priority priority;
+ Severity severity;
+
+ public CheckIssueData() {}
+
+ public Issue getIssue() {
+ return issue;
+ }
+
+ public void setIssue(Issue issue) {
+ this.issue = issue;
+ }
+
+ public IssueStatus getOldIssueStatus() {
+ return oldIssueStatus;
+ }
+
+ public void setOldIssueStatus(IssueStatus oldIssueStatus) {
+ this.oldIssueStatus = oldIssueStatus;
+ }
+
+ public IssueStatus getNewIssueStatus() {
+ return newIssueStatus;
+ }
+
+ public void setNewIssueStatus(IssueStatus newIssueStatus) {
+ this.newIssueStatus = newIssueStatus;
+ }
+
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ public IssueType getIssueType() {
+ return issueType;
+ }
+
+ public void setIssueType(IssueType issueType) {
+ this.issueType = issueType;
+ }
+
+ public Priority getPriority() {
+ return priority;
+ }
+
+ public void setPriority(Priority priority) {
+ this.priority = priority;
+ }
+
+ public Severity getSeverity() {
+ return severity;
+ }
+
+ public void setSeverity(Severity severity) {
+ this.severity = severity;
+ }
+
+ // 蹂�寃쎈맂 媛� �꽕�젙
+ public Issue SetIssue(IssueForm issueForm) {
+ Issue issue = this.getIssue();
+ ConvertUtil.copyProperties(issueForm, issue, "id");
+ issue.setProject(getProject());
+ issue.setIssueStatus(getNewIssueStatus());
+ issue.setIssueType(getIssueType());
+ issue.setPriority(getPriority());
+ issue.setSeverity(getSeverity());
+ issue.setStartDate(issueForm.getStartDate());
+ issue.setCompleteDate(issueForm.getCompleteDate());
+
+ return issue;
+ }
+}
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueUser.java b/src/main/java/kr/wisestone/owl/domain/IssueUser.java
index 3815310..3a8bcdf 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueUser.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueUser.java
@@ -15,7 +15,7 @@
@JoinColumn(name = "user_id")
private User user;
- @ManyToOne(fetch = FetchType.LAZY)
+ @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "issue_id")
private Issue issue;
diff --git a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java
index 8f1e445..5813844 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java
@@ -1,5 +1,6 @@
package kr.wisestone.owl.service;
+import kr.wisestone.owl.data.CheckIssueData;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.IssueHistoryType;
import kr.wisestone.owl.service.impl.IssueHistoryServiceImpl;
@@ -28,7 +29,8 @@
List<IssueHistoryVo> findIssueHistory(Long issueId);
- StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files);
+ StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus oldIssueStatus, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files);
+ StringBuilder detectIssueChange(IssueForm issueForm, CheckIssueData data, List<MultipartFile> files);
void detectProject(Issue issue, IssueForm issueForm, StringBuilder description, Project project);
@@ -36,7 +38,7 @@
void detectIssuePriority(Issue issue, IssueForm issueForm, StringBuilder description, Priority priority);
- void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus issueStatus);
+ void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus oldIssueStatus, IssueStatus issueStatus);
void detectReservationIssueStatus(Issue issue, StringBuilder description, IssueStatus issueStatus);
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index ab36a30..c6f4e66 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -28,7 +28,9 @@
Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
Issue addApiIssue(IssueApiForm issueApiForm);
- Issue modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files);
+ List<Issue> modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files);
+
+ List<IssueVo> findIssue(IssueApiForm issueApiform);
List<IssueVo> findIssue(Map<String, Object> resJsonData,
IssueCondition condition, Pageable pageable);
@@ -47,7 +49,7 @@
void removeIssues(IssueForm issueForm);
- void modifyIssueStatus(IssueForm issueForm);
+ void modifyIssueStatus(IssueForm issueForm, User user);
Issue getIssue(Long taskId);
diff --git a/src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java b/src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java
index 8a31799..314344c 100644
--- a/src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java
+++ b/src/main/java/kr/wisestone/owl/service/ProjectRoleUserService.java
@@ -20,5 +20,5 @@
Map<String, Object> findProjectManager(Long userId);
- boolean checkProjectManager(Project project);
+ boolean checkProjectManager(Project project, User user);
}
diff --git a/src/main/java/kr/wisestone/owl/service/UserWorkspaceService.java b/src/main/java/kr/wisestone/owl/service/UserWorkspaceService.java
index dbe05f2..ce9d3c7 100644
--- a/src/main/java/kr/wisestone/owl/service/UserWorkspaceService.java
+++ b/src/main/java/kr/wisestone/owl/service/UserWorkspaceService.java
@@ -35,7 +35,7 @@
UserWorkspace getUserWorkspace(Long id);
- boolean checkWorkspaceManager();
+ boolean checkWorkspaceManager(User user);
List<UserWorkspace> findByWorkspaceId(Long workspaceId);
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
index b6b4725..ecf6b95 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -4,6 +4,7 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.ElasticSearchConstants;
import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.data.CheckIssueData;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
import kr.wisestone.owl.domain.enumType.IssueHistoryType;
@@ -316,7 +317,13 @@
// �씠�뒋 蹂�寃� �궡�뿭�쓣 異붿텧�븳�떎.
@Override
- public StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files) {
+ public StringBuilder detectIssueChange(IssueForm issueForm, CheckIssueData data, List<MultipartFile> files) {
+ return this.detectIssueChange(data.getIssue(), issueForm, data.getProject(), data.getOldIssueStatus(), data.getNewIssueStatus(), data.getIssueType(), data.getPriority(), data.getSeverity(), files);
+ }
+
+ // �씠�뒋 蹂�寃� �궡�뿭�쓣 異붿텧�븳�떎.
+ @Override
+ public StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus oldIssueStatus, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files) {
StringBuilder description = new StringBuilder();
// �씠�뒋 �봽濡쒖젥�듃 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@@ -326,7 +333,7 @@
// �씠�뒋 �슦�꽑�닚�쐞 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
this.detectIssuePriority(issue, issueForm, description, priority);
// �씠�뒋 �긽�깭 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
- this.detectIssueStatus(issue, issueForm, description, issueStatus);
+ this.detectIssueStatus(issue, issueForm, description, oldIssueStatus, issueStatus);
// �씠�뒋 ���엯 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
this.detectIssueType(issue, issueForm, description, issueType);
// �씠�뒋�뿉 泥⑤��맂 �뙆�씪�뿉 ���빐 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@@ -407,11 +414,12 @@
// �씠�뒋 �긽�깭 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus issueStatus) {
- if (!issue.getIssueStatus().getId().equals(issueForm.getIssueStatusId())) {
+ @Transactional
+ public void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus oldIssueStatus, IssueStatus issueStatus) {
+ if (!oldIssueStatus.getId().equals(issueForm.getIssueStatusId())) {
String title = "<span translate=\"common.updateHasStatus\">�긽�깭媛� 蹂�寃쎈릺�뿀�뒿�땲�떎.</span>";
// �씠�젰 �젙蹂대�� html �깭洹몃줈 留뚮뱾�뼱 以��떎.
- this.makeIssueHistoryHtml(description, title, issue.getIssueStatus().getName(), issueStatus.getName());
+ this.makeIssueHistoryHtml(description, title, oldIssueStatus.getName(), issueStatus.getName());
// �씠�뒋 �쐞�뿕 愿�由ъ뿉 �긽�깭 蹂�寃� �젙蹂대�� �뾽�뜲�씠�듃�븳�떎. - �떞�떦�옄 蹂�寃�
this.issueRiskService.modifyIssueRisk(issue, true, false, issueForm.getIssueStatusId());
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index b8b83f9..eb5524e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -7,6 +7,7 @@
import kr.wisestone.owl.constant.ElasticSearchConstants;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.constant.UsePartner;
+import kr.wisestone.owl.data.CheckIssueData;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
import kr.wisestone.owl.domain.enumType.EmailType;
@@ -52,9 +53,6 @@
private IssueRepository issueRepository;
@Autowired
- private IssueTableConfigService issueTableConfigService;
-
- @Autowired
private ProjectService projectService;
@Autowired
@@ -77,15 +75,6 @@
@Autowired
private ApiTokenService apiTokenService;
-
- @Autowired
- private CompanyFieldService companyFieldService;
-
- @Autowired
- private IspFieldService ispFieldService;
-
- @Autowired
- private HostingFieldService hostingFieldService;
@Autowired
private CommonConfiguration configuration;
@@ -593,7 +582,8 @@
// �씠�뒋 �븘�씠�뵒 珥덇린�솕
issueCondition.setIssueIds(Lists.newArrayList());
// Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
- this.setMapToIssueVo(results, issueVos, issueCondition);
+ User user = this.webAppUtil.getLoginUserObject();
+ this.setMapToIssueVo(results, issueVos, issueCondition, user);
this.setCountDownIssues(results, issueVos);
@@ -732,7 +722,9 @@
IssueCondition issueCondition = new IssueCondition();
// 寃��깋 議곌굔�쓣 留뚮뱺�떎
- if (!this.makeIssueSearchCondition(issueCondition, projectCondition, pageable)) {
+
+ User user = this.webAppUtil.getLoginUserObject();
+ if (!this.makeIssueSearchCondition(user, issueCondition, projectCondition, pageable)) {
// �씠�뒋 紐⑸줉�쓣 李얠� 紐삵븷 寃쎌슦 湲곕낯 �젙蹂대줈 由ы꽩�븳�떎.
this.notFoundIssueList(resJsonData, pageable);
return Lists.newArrayList();
@@ -776,7 +768,7 @@
}
// Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
- private void setMapToIssueVo(List<Map<String, Object>> results, List<IssueVo> issueVos, IssueCondition issueCondition) {
+ private void setMapToIssueVo(List<Map<String, Object>> results, List<IssueVo> issueVos, IssueCondition issueCondition, User user) {
for (Map<String, Object> result : results) {
IssueVo issueVo = ConvertUtil.convertMapToClass(result, IssueVo.class);
issueVos.add(issueVo);
@@ -785,7 +777,7 @@
// �씠�뒋 �궗�슜�옄 �젙蹂� 異붽�
//this.setIssueUserList(issueVos, issueCondition);
- this.setIssueDepartmentList(issueVos, issueCondition);
+ this.setIssueDepartmentList(issueVos, issueCondition, user);
// �벑濡앹옄 �젙蹂� 異붽�
this.setRegister(issueVos); // �떞�떦�옄 �젙蹂� �뀑�똿
@@ -832,7 +824,7 @@
}
// 寃��깋 議곌굔�쓣 留뚮뱺�떎
- private boolean makeIssueSearchCondition(IssueCondition condition, ProjectCondition projectCondition, Pageable pageable) {
+ private boolean makeIssueSearchCondition(User user, IssueCondition condition, ProjectCondition projectCondition, Pageable pageable) {
if (pageable != null) {
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
@@ -850,7 +842,7 @@
// �봽濡쒖젥�듃瑜� �꽑�깮�븯吏� �븡�븯�쑝硫� �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 李몄뿬�븯怨� �엳�뒗 �봽濡쒖젥�듃瑜� 李얜뒗�떎.
if (condition.getProjectIds().size() < 1) {
List<Map<String, Object>> projects = null;
- if (this.userWorkspaceService.checkWorkspaceManager()) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
projects = this.projectMapper.findByWorkspaceManagerAll(projectCondition);
} else {
projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectCondition);
@@ -928,7 +920,7 @@
}
// �씠�뒋 �떞�떦�옄 �젙蹂대�� �뀑�똿�븳�떎.
- private void setIssueUserList(List<IssueVo> issueVos, IssueCondition issueCondition) {
+ private void setIssueUserList(List<IssueVo> issueVos, IssueCondition issueCondition, User user) {
if (issueVos.size() < 1) {
return;
}
@@ -959,14 +951,14 @@
}
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- if (this.checkHasPermission(issueVo, issueVo.getUserVos())) {
+ if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user)) {
issueVo.setModifyPermissionCheck(Boolean.TRUE);
}
}
}
// �씠�뒋 �떞�떦遺��꽌 �젙蹂대�� �뀑�똿�븳�떎.
- private void setIssueDepartmentList(List<IssueVo> issueVos, IssueCondition issueCondition) {
+ private void setIssueDepartmentList(List<IssueVo> issueVos, IssueCondition issueCondition, User user) {
if (issueVos.size() < 1) {
return;
}
@@ -996,7 +988,7 @@
}
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- if (this.checkHasPermission(issueVo, issueVo.getUserVos())) {
+ if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user)) {
issueVo.setModifyPermissionCheck(Boolean.TRUE);
}
}
@@ -1264,13 +1256,42 @@
issueVo.setIssueHistoryVos(this.issueHistoryService.findIssueHistory(issue.getId()));
}
- // �씠�뒋瑜� �닔�젙�븳�떎
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 媛숈� �씠�뒋 李얘린
@Override
- public Issue modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files) {
+ @Transactional
+ public List<IssueVo> findIssue(IssueApiForm issueApiform) {
+ List<IssueCustomFieldValueForm> issueCustomFieldValueForms = issueApiform.getIssueCustomFieldValues();
+ IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
+ if (issueCustomFieldValueForms != null && issueCustomFieldValueForms.size() > 0) {
+ for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {
+ issueCustomFieldValueCondition.addUseValues(issueCustomFieldValueForm.getUseValue());
+ }
+ }
+ List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
+ List<IssueVo> issueVos = Lists.newArrayList();
+ if (results != null && results.size() > 0) {
+ issueVos.add(ConvertUtil.convertMapToClass(results.get(0), IssueVo.class));
+ }
+
+ return issueVos;
+ }
+
+
+ // �씠�뒋瑜� �닔�젙�븳�떎(api�슜)
+ @Override
+ @Transactional
+ public List<Issue> modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files) {
User user = this.convertToUser(issueApiForm.getToken());
IssueForm issueForm = this.convertToIssueForm(issueApiForm, user);
- return this.modifyIssue(user, issueForm, files);
+ List<IssueVo> issueVos = this.findIssue(issueApiForm);
+ List<Issue> issue = Lists.newArrayList();
+ for (IssueVo issueVo : issueVos) {
+ issueForm.setId(issueVo.getId());
+ issue.add(this.modifyIssueForApi(user, issueForm, files));
+ }
+
+ return issue;
}
// �씠�뒋瑜� �닔�젙�븳�떎.
@@ -1281,14 +1302,16 @@
return modifyIssue(user, issueForm, multipartFiles);
}
- // �씠�뒋瑜� �닔�젙�븳�떎.
- @Override
- @Transactional
- public Issue modifyIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
+ // �닔�젙 �뜲�씠�꽣媛� �쑀�슚�븳吏� �솗�씤
+ private CheckIssueData checkIssue(User user, IssueForm issueForm) {
+
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
+
+ Issue issue = this.getIssue(issueForm.getId());
+ IssueStatus oldIssueStatus = issue.getIssueStatus();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- this.verifyIssueModifyPermission(issueForm.getId());
+ this.verifyIssueModifyPermission(issue, user);
// �봽濡쒖젥�듃 �쑀�슚�꽦 泥댄겕
Project project = this.projectService.getProject(issueForm.getProjectId());
// �씠�뒋 �긽�깭 �쑀�슚�꽦 泥댄겕
@@ -1309,10 +1332,83 @@
// �떞�떦遺��꽌 �쑀�슚�꽦 泥댄겕
this.verifyIssueDepartment(project, issueForm);
- Issue issue = this.getIssue(issueForm.getId());
+ CheckIssueData checkIssueData = new CheckIssueData();
+ checkIssueData.setIssue(issue);
+ checkIssueData.setProject(project);
+ checkIssueData.setOldIssueStatus(oldIssueStatus);
+ checkIssueData.setNewIssueStatus(issueStatus);
+ checkIssueData.setIssueType(issueType);
+ checkIssueData.setPriority(priority);
+ checkIssueData.setSeverity(severity);
+
+ return checkIssueData;
+ }
+
+ // �씠�뒋 �닔�젙(API�슜)
+ private Issue modifyIssueForApi(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
+ CheckIssueData checkIssueData = this.checkIssue(user, issueForm);
+
+ Issue issue = checkIssueData.getIssue();
+ Project project = checkIssueData.getProject();
+ IssueType issueType = checkIssueData.getIssueType();
+ IssueStatus oldIssueStatus = checkIssueData.getOldIssueStatus();
+ IssueStatus issueStatus = checkIssueData.getNewIssueStatus();
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
- StringBuilder detectIssueChange = this.issueHistoryService.detectIssueChange(issue, issueForm, project, issueStatus, issueType, priority, severity, multipartFiles);
+ StringBuilder detectIssueChange = this.issueHistoryService.detectIssueChange(issueForm, checkIssueData, multipartFiles);
+
+ // �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �씠�뒋 �꽆踰꾨�� �깉濡� �뵲�빞 �븳�떎.
+ this.checkChangeProject(checkIssueData.getProject(), issue);
+
+ // �씠�뒋 �쑀�삎�씠 蹂�寃쎈릺�뿀�뒗吏� �솗�씤�븯怨� 蹂�寃쎈릺�뿀�떎硫� �씠�뒋 �긽�깭 �냽�꽦�씠 '��湲�' �씤 �씠�뒋 �긽�깭濡� 援먯껜�븳�떎.
+ if (this.checkChangeIssueType(issueType, issueStatus, issue)) {
+ issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
+ // �씠�뒋 �긽�깭 蹂�寃� �씠�젰 �궓湲곌린 - �씠�젰�쓣 �궓湲곌린 �쐞�빐 issueForm �뿉 issueStatus Id 媛믪쓣 ���옣.
+ issueForm.setIssueStatusId(issueStatus.getId());
+ this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
+ }
+
+ issue = this.saveIssue(issueForm, checkIssueData);
+
+ // �씠�뒋 �씠�젰 �벑濡�
+ if (!StringUtils.isEmpty(detectIssueChange.toString())) {
+ this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
+ }
+ // �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));
+
+ return issue;
+ }
+
+ private Issue saveIssue(IssueForm issueForm, CheckIssueData checkIssueData) {
+ Issue issue = checkIssueData.getIssue();
+ ConvertUtil.copyProperties(issueForm, issue, "id");
+ issue.setProject(checkIssueData.getProject());
+ issue.setIssueStatus(checkIssueData.getNewIssueStatus());
+ issue.setIssueType(checkIssueData.getIssueType());
+ issue.setPriority(checkIssueData.getPriority());
+ issue.setSeverity(checkIssueData.getSeverity());
+ issue.setStartDate(issueForm.getStartDate());
+ issue.setCompleteDate(issueForm.getCompleteDate());
+
+ return this.issueRepository.saveAndFlush(issue);
+ }
+
+ // �씠�뒋瑜� �닔�젙�븳�떎.
+ @Override
+ @Transactional
+ public Issue modifyIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
+ CheckIssueData checkIssueData = this.checkIssue(user, issueForm);
+
+ Issue issue = checkIssueData.getIssue();
+ IssueStatus oldIssueStatus = checkIssueData.getOldIssueStatus();
+ Project project = checkIssueData.getProject();
+ IssueStatus issueStatus = checkIssueData.getNewIssueStatus();
+ IssueType issueType = checkIssueData.getIssueType();
+
+ // 蹂�寃� �씠�젰 �젙蹂� 異붿텧
+ StringBuilder detectIssueChange = this.issueHistoryService.detectIssueChange(issueForm, checkIssueData, multipartFiles);
// �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �씠�뒋 �꽆踰꾨�� �깉濡� �뵲�빞 �븳�떎.
this.checkChangeProject(project, issue);
@@ -1322,19 +1418,10 @@
issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
// �씠�뒋 �긽�깭 蹂�寃� �씠�젰 �궓湲곌린 - �씠�젰�쓣 �궓湲곌린 �쐞�빐 issueForm �뿉 issueStatus Id 媛믪쓣 ���옣.
issueForm.setIssueStatusId(issueStatus.getId());
- this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, issueStatus);
+ this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
}
- ConvertUtil.copyProperties(issueForm, issue, "id");
- issue.setProject(project);
- issue.setIssueStatus(issueStatus);
- issue.setIssueType(issueType);
- issue.setPriority(priority);
- issue.setSeverity(severity);
- issue.setStartDate(issueForm.getStartDate());
- issue.setCompleteDate(issueForm.getCompleteDate());
-
- this.issueRepository.saveAndFlush(issue);
+ issue = this.saveIssue(issueForm, checkIssueData);
//this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
// �떞�떦遺��꽌 吏��젙
if(issueForm.getDepartmentIds().size()>0){
@@ -1357,7 +1444,8 @@
this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
}
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
- log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_MODIFY));
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));
// �뾽泥� �젙蹂� ���옣
this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
@@ -1479,11 +1567,9 @@
}
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- private void verifyIssueModifyPermission(Long issueId) {
- Issue issue = this.getIssue(issueId);
-
+ private void verifyIssueModifyPermission(Issue issue, User user) {
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- if (!this.checkHasPermission(ConvertUtil.copyProperties(issue, IssueVo.class), this.getIssueUserVos(issue))) {
+ if (!this.checkHasPermission(ConvertUtil.copyProperties(issue, IssueVo.class), this.getIssueUserVos(issue), user)) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_MODIFY_PERMISSION));
}
@@ -1493,24 +1579,31 @@
private List<UserVo> getIssueUserVos(Issue issue) {
List<UserVo> userVos = Lists.newArrayList();
- for (IssueUser issueUser : issue.getIssueUsers()) {
- UserVo userVo = ConvertUtil.copyProperties(issueUser.getUser(), UserVo.class, "password");
- userVos.add(userVo);
+ Set<IssueUser> issueUsers = issue.getIssueUsers();
+
+ try {
+ for (IssueUser issueUser : issueUsers) {
+ User user = issueUser.getUser();
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password");
+ userVos.add(userVo);
+ }
+ } catch (Exception ex) {
+
}
return userVos;
}
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- private boolean checkHasPermission(IssueVo issueVo, List<UserVo> issueUserVos) {
+ private boolean checkHasPermission(IssueVo issueVo, List<UserVo> issueUserVos, User user) {
boolean hasPermission = false;
// �뾽臾� 怨듦컙 愿�由ъ옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
- hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null, null);
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null, null, user);
// �봽濡쒖젥�듃 愿�由ъ옄�씪 寃쎌슦 �빐�떦 �봽濡쒖젥�듃�뿉 �벑濡앸맂 �씠�뒋�뒗 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
- hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null, null);
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null, null, user);
// �씠�뒋 �벑濡앹옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
- hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null, null);
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null, null, user);
// �씠�뒋 �떞�떦�옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎. => �떞�떦遺��꽌濡� �닔�젙 - 泥댄겕
//hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ASSIGNEE, issueVo, issueUserVos);
// �떞�떦�옄媛� �뾾�쑝硫� 紐⑤뱺 �궗�슜�옄媛� �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
@@ -1519,22 +1612,22 @@
}
// �씠�뒋 �닔�젙 沅뚰븳�쓣 �솗�씤�븳�떎.
- private boolean checkIssueModifyPermission(Boolean hasPermission, String checkType, IssueVo issueVo, List<UserVo> issueUserVos, List<DepartmentVo> issueDepartmentVos) {
+ private boolean checkIssueModifyPermission(Boolean hasPermission, String checkType, IssueVo issueVo, List<UserVo> issueUserVos, List<DepartmentVo> issueDepartmentVos, User user) {
if (!hasPermission) {
switch (checkType) {
case Issue.WORKSPACE_MANAGER: // �뾽臾� 怨듦컙 愿�由ъ옄
// �뾽臾� 怨듦컙 愿�由ъ옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
- hasPermission = this.userWorkspaceService.checkWorkspaceManager();
+ hasPermission = this.userWorkspaceService.checkWorkspaceManager(user);
break;
case Issue.PROJECT_MANAGER: // �봽濡쒖젥�듃 愿�由ъ옄
Issue issue = this.getIssue(issueVo.getId());
// �봽濡쒖젥�듃 愿�由ъ옄�씪 寃쎌슦 �빐�떦 �봽濡쒖젥�듃�뿉 �벑濡앸맂 �씠�뒋�뒗 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
- hasPermission = this.projectRoleUserService.checkProjectManager(issue.getProject());
+ hasPermission = this.projectRoleUserService.checkProjectManager(issue.getProject(), user);
break;
case Issue.REGISTER: // �씠�뒋 �벑濡앹옄
- hasPermission = issueVo.getRegisterId().equals(this.webAppUtil.getLoginId());
+ hasPermission = issueVo.getRegisterId().equals(user.getId());
break;
case Issue.ASSIGNEE:
@@ -1545,7 +1638,7 @@
}
// �씠�뒋 �떞�떦�옄 �뿬遺� �솗�씤
for (UserVo issueUserVo : issueUserVos) {
- if (issueUserVo.getId().equals(this.webAppUtil.getLoginId())) {
+ if (issueUserVo.getId().equals(user.getId())) {
hasPermission = true;
break;
}
@@ -1575,20 +1668,22 @@
// �씠�뒋 �긽�깭 蹂�寃�
@Override
@Transactional
- public void modifyIssueStatus(IssueForm issueForm) {
+ public void modifyIssueStatus(IssueForm issueForm, User user) {
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
this.workspaceService.checkUseWorkspace();
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
StringBuilder detectIssueChange = new StringBuilder();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- this.verifyIssueModifyPermission(issueForm.getId());
Issue issue = this.getIssue(issueForm.getId());
+ IssueStatus oldIssueStatus = issue.getIssueStatus();
+
+ this.verifyIssueModifyPermission(issue, user);
IssueStatus issueStatus = this.issueStatusService.getIssueStatus(issueForm.getIssueStatusId());
// �씠�뒋 �긽�깭瑜� 蹂�寃쏀븷 �븣 �꽑�깮�븳 �씠�뒋 �긽�깭濡� 蹂�寃쏀븷 �닔 �엳�뒗吏� �솗�씤�븳�떎.
this.issueStatusService.checkNextIssueStatus(issue, issueStatus);
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
- this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, issueStatus);
+ this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
issue.setIssueStatus(issueStatus);
this.issueRepository.saveAndFlush(issue);
@@ -1622,13 +1717,15 @@
@Override
@Transactional
public void modifyIssueUser(IssueForm issueForm) {
+ User user = this.webAppUtil.getLoginUserObject();
+
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
this.workspaceService.checkUseWorkspace();
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
StringBuilder detectIssueChange = new StringBuilder();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- this.verifyIssueModifyPermission(issueForm.getId());
Issue issue = this.getIssue(issueForm.getId());
+ this.verifyIssueModifyPermission(issue, user);
issue.setProject(this.projectService.getProject(issueForm.getProjectId()));
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
@@ -1657,13 +1754,14 @@
@Override
@Transactional
public void modifyIssueDepartment(IssueForm issueForm) {
+ User user = this.webAppUtil.getLoginUserObject();
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
this.workspaceService.checkUseWorkspace();
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
StringBuilder detectIssueChange = new StringBuilder();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- this.verifyIssueModifyPermission(issueForm.getId());
Issue issue = this.getIssue(issueForm.getId());
+ this.verifyIssueModifyPermission(issue, user);
issue.setProject(this.projectService.getProject(issueForm.getProjectId()));
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
@@ -1695,6 +1793,7 @@
@Transactional
public void removeIssues(IssueForm issueForm) {
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
+ User user = this.webAppUtil.getLoginUserObject();
this.workspaceService.checkUseWorkspace();
if (issueForm.getRemoveIds().size() < 1) {
@@ -1705,7 +1804,7 @@
List<Issue> removeIssues = Lists.newArrayList();
for (Long issueId : issueForm.getRemoveIds()) {
- Issue issue = this.issueRemoves(issueId);
+ Issue issue = this.issueRemoves(issueId, user);
removeIssues.add(issue);
}
@@ -1717,10 +1816,10 @@
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_REMOVE));
}
- private Issue issueRemoves(Long issueId) {
+ private Issue issueRemoves(Long issueId, User user) {
Issue issue = this.getIssue(issueId);
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- this.verifyIssueModifyPermission(issueId);
+ this.verifyIssueModifyPermission(issue, user);
// �씠�뒋 泥⑤� �뙆�씪�쓣 �궘�젣�븳�떎.
if (issue.getAttachedFiles().size() > 0) {
@@ -1884,7 +1983,8 @@
issueCondition.setIssueIds(Lists.newArrayList());
// Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
- this.setMapToIssueVo(results, issueVos, issueCondition);
+ User user = this.webAppUtil.getLoginUserObject();
+ this.setMapToIssueVo(results, issueVos, issueCondition, user);
// IssueVos �뜲�씠�꽣瑜� �뿊���뿉�꽌 �몴�떆�븷 �닔 �엳�뒗 �뜲�씠�꽣濡� 蹂�寃쏀븳�떎.
List<Map<String, String>> convertExcelViewToIssueMaps = this.convertExcelViewToIssueVos(issueVos);
@@ -2052,10 +2152,12 @@
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
this.workspaceService.checkUseWorkspace();
+ User user = this.webAppUtil.getLoginUserObject();
+
for (Long issueId : issueForm.getIds()) {
issueForm.setId(issueId);
// �씠�뒋 �긽�깭 蹂�寃�
- this.modifyIssueStatus(issueForm);
+ this.modifyIssueStatus(issueForm, user);
}
// �떞�떦 遺��꽌 �닔�젙
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ProjectRoleUserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ProjectRoleUserServiceImpl.java
index 963602f..02533b3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectRoleUserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectRoleUserServiceImpl.java
@@ -137,10 +137,10 @@
// �봽濡쒖젥�듃 愿�由ъ옄 �뿬遺�瑜� �솗�씤�븳�떎.
@Override
@Transactional(readOnly = true)
- public boolean checkProjectManager(Project project) {
+ public boolean checkProjectManager(Project project, User user) {
ProjectRole projectManagerRole = this.projectRoleService.findByProjectIdAndRoleType(project.getId(), ProjectRole.TYPE_MANAGER);
// �빐�떦 �궗�슜�옄媛� �듅�젙 �뿭�븷�뿉 �냼�냽�릺�뼱 �엳�뒗吏� �솗�씤�븳�떎.
- ProjectRoleUser projectRoleUser = this.findByProjectRoleIdAndUserId(projectManagerRole.getId(), this.webAppUtil.getLoginId());
+ ProjectRoleUser projectRoleUser = this.findByProjectRoleIdAndUserId(projectManagerRole.getId(), user.getId());
return projectRoleUser != null;
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
index 255db28..303dc8a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -342,10 +342,12 @@
List<Map<String, Object>> results;
Long totalCount;
+ User user = this.webAppUtil.getLoginUserObject();
+
if (condition.getWorkspaceManager()) {
// �뾽臾닿났媛� 愿�由ъ옄�씪 寃쎌슦 紐⑤뱺 �봽濡쒖젥�듃媛� �몴�떆�릺�뼱�빞 �븳�떎.
// 愿�由ъ옄�씪 �븣
- if (this.userWorkspaceService.checkWorkspaceManager()) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
results = this.projectMapper.findByWorkspaceManager(condition);
totalCount = this.projectMapper.countByWorkspaceManager(condition);
}
@@ -361,8 +363,8 @@
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
// �봽濡쒖젥�듃 議고쉶 寃곌낵瑜� ProjectVos 濡� 蹂��솚�븳�떎. - 愿�由ъ옄, �씪諛� �궗�슜�옄 �젙蹂� 異붽�
- List<ProjectVo> projectVos = this.makeProjectVos(results);
- this.setChildrenProject(projectVos);
+ List<ProjectVo> projectVos = this.makeProjectVos(results, user);
+ this.setChildrenProject(projectVos, user);
resJsonData.put(Constants.RES_KEY_CONTENTS, projectVos);
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
@@ -371,16 +373,16 @@
return projectVos;
}
- void setChildrenProject(List<ProjectVo> projectVos) {
+ void setChildrenProject(List<ProjectVo> projectVos, User user) {
int projectCount = projectVos.size();
for (int i=0; i< projectCount; i++) {
ProjectVo projectVo = projectVos.get(i);
List<Map<String, Object>> children = this.projectMapper.findChildrenProject(projectVo.getId());
if (children != null && children.size() > 0) {
- List<ProjectVo> childrenVo = this.makeProjectVos(children);
+ List<ProjectVo> childrenVo = this.makeProjectVos(children, user);
projectVo.setChildProjects(childrenVo);
- setChildrenProject(childrenVo);
+ setChildrenProject(childrenVo, user);
}
}
}
@@ -400,7 +402,7 @@
// �봽濡쒖젥�듃 議고쉶 寃곌낵瑜� ProjectVos 濡� 蹂��솚�븳�떎. - 愿�由ъ옄, �씪諛� �궗�슜�옄 �젙蹂� 異붽�
- private List<ProjectVo> makeProjectVos(List<Map<String, Object>> results) {
+ private List<ProjectVo> makeProjectVos(List<Map<String, Object>> results, User user) {
List<ProjectVo> projectVos = Lists.newArrayList();
for (Map<String, Object> result : results) {
@@ -413,7 +415,7 @@
this.setProjectDepartment(projectVo);
// �뾽臾닿났媛� �떞�떦�옄�뒗 紐⑤뱺 �봽濡쒖젥�듃瑜� �닔�젙/�궘�젣�븷 �닔 �엳�뼱�빞 �븳�떎.
- if (this.userWorkspaceService.checkWorkspaceManager()) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
projectVo.setModifyPermissionCheck(true);
}
projectVos.add(projectVo);
@@ -532,10 +534,12 @@
// �봽濡쒖젥�듃 李몄뿬 遺��꽌
List<Long> existDepartmentIds = this.getIncludeProjectDepartment(project);
+ User user = this.webAppUtil.getLoginUserObject();
+
// �썙�겕�뒪�럹�씠�뒪�뿉�꽌 湲곕낯�쑝濡� �젣怨듬릺�뒗 �봽濡쒖젥�듃�뿉 ���븳 泥댄겕
this.checkDefaultProject(project, projectForm);
// �닔�젙 沅뚰븳 泥댄겕
- this.checkModifyPermission(project.getId());
+ this.checkModifyPermission(project.getId(), user);
// 愿�由ъ옄 蹂�寃�
Map<String, Object> changeProjectManagerNotifications = this.modifyProjectManagers(project, projectForm, ProjectRole.TYPE_MANAGER);
// �씪諛� �궗�슜�옄 蹂�寃�
@@ -659,11 +663,11 @@
}
// 濡쒓렇�씤�븳 �궗�슜�옄媛� 愿�由ъ옄 �뿭�븷�뿉 �냼�냽�릺�뼱 �엳�뒗吏� �솗�씤�븳�떎.
- private void checkModifyPermission(Long projectId) {
+ private void checkModifyPermission(Long projectId, User user) {
Boolean hasPermission = Boolean.FALSE;
// �빐�떦 �뾽臾� 怨듦컙�쓽 愿�由ъ옄�씪 寃쎌슦 沅뚰븳 泥댄겕瑜� �븯吏� �븡�뒗�떎.
- if (this.userWorkspaceService.checkWorkspaceManager()) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
return;
}
@@ -1000,7 +1004,7 @@
}
// 濡쒓렇�씤�븳 �궗�슜�옄媛� 愿�由ъ옄 �뿭�븷�뿉 �냼�냽�릺�뼱 �엳�뒗吏� �솗�씤�븳�떎.
- this.checkModifyPermission(project.getId());
+ this.checkModifyPermission(project.getId(), this.webAppUtil.getLoginUserObject());
List<String> sendEmails = Lists.newArrayList();
Map<String, Object> params = new HashMap<>();
@@ -1094,21 +1098,23 @@
@Override
@Transactional(readOnly = true)
public List<ProjectVo> findByIncludeProject(List<String> statuses, String projectType) {
+ User user = this.webAppUtil.getLoginUserObject();
+
ProjectCondition projectCondition = new ProjectCondition();
- projectCondition.setLoginUserId(this.webAppUtil.getLoginId());
- projectCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ projectCondition.setLoginUserId(user.getId());
+ projectCondition.setWorkspaceId(user.getLastWorkspaceId());
projectCondition.setProjectType(projectType);
projectCondition.setStatuses(statuses);
List<Map<String, Object>> results;
- if (this.userWorkspaceService.checkWorkspaceManager()) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
results = this.projectMapper.findByWorkspaceManager(projectCondition);
} else {
results = this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);
}
List<ProjectVo> projectVos = this.makeProjectByVos(results);
- this.setChildrenProject(projectVos);
+ this.setChildrenProject(projectVos, user);
return projectVos;
}
@@ -1135,7 +1141,7 @@
projectCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
List<Map<String, Object>> results = this.projectMapper.find(projectCondition);
// �봽濡쒖젥�듃 議고쉶 寃곌낵瑜� ProjectVos 濡� 蹂��솚�븳�떎. - 愿�由ъ옄, �씪諛� �궗�슜�옄 �젙蹂� 異붽�
- List<ProjectVo> projectVos = this.makeProjectVos(results);
+ List<ProjectVo> projectVos = this.makeProjectVos(results, this.webAppUtil.getLoginUserObject());
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("common.projectList")); // �봽濡쒖젥�듃 紐⑸줉
excelInfo.addAttrInfos(new ExportExcelAttrVo("statusName", this.messageAccessor.message("common.status"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �긽�깭
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
index 04a5e39..f8657be 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java
@@ -238,15 +238,14 @@
// �뾽臾� 怨듦컙 �떞�떦�옄 �뿬遺�瑜� �솗�씤�븳�떎.
@Override
@Transactional(readOnly = true)
- public boolean checkWorkspaceManager() {
+ public boolean checkWorkspaceManager(User user) {
boolean bIsManager = false;
- User loginUser = this.userService.getUser(this.webAppUtil.getLoginId());
try
{
- Workspace workspace = this.workspaceService.getWorkspace(loginUser.getLastWorkspaceId()); // �쁽�옱 �젒�냽�븳 �뾽臾� 怨듦컙
+ Workspace workspace = this.workspaceService.getWorkspace(user.getLastWorkspaceId()); // �쁽�옱 �젒�냽�븳 �뾽臾� 怨듦컙
// 濡쒓렇�씤�븳 �궗�슜�옄媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙�쓣 李얜뒗�떎.
- UserWorkspace userWorkspace = this.findMyWorkspace(this.webAppUtil.getLoginId());
+ UserWorkspace userWorkspace = this.findMyWorkspace(user.getId());
bIsManager = workspace.getId().equals(userWorkspace.getWorkspace().getId());
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
index df9aac1..418273c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
@@ -5,10 +5,7 @@
import kr.wisestone.owl.common.MessageAccessor;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.domain.IssueStatus;
-import kr.wisestone.owl.domain.Project;
-import kr.wisestone.owl.domain.ProjectClosure;
-import kr.wisestone.owl.domain.UserDepartment;
+import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.IssueMapper;
@@ -166,9 +163,10 @@
@Override
@Transactional(readOnly = true)
public WidgetCondition makeWidgetCondition() {
+ User user = this.webAppUtil.getLoginUserObject();
// �빐�떦 �썙�겕�뒪�럹�씠�뒪�뿉�꽌 李몄뿬�븯怨� �엳�뒗 �봽濡쒖젥�듃 以� �긽�깭媛� �삤�뵂�씤 �봽濡쒖젥�듃
List<Map<String, Object>> projects = null;
- if (this.userWorkspaceService.checkWorkspaceManager()) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
projects = this.projectService.findByWorkspaceManagerAll();
} else {
projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(Lists.newArrayList("02"), ProjectType.BTS_PROJECT.toString());
@@ -277,9 +275,11 @@
public void findProjectProgress(Map<String, Object> resJsonData, WidgetCondition widgetCondition) {
List<Map<String, Object>> progressingProjectDetails = Lists.newArrayList();
+ User user = this.webAppUtil.getLoginUserObject();
+
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
- if (this.userWorkspaceService.checkWorkspaceManager()) {
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
progressingProjectDetails = this.widgetMapper.findProjectProgressAll(widgetCondition);
} else {
progressingProjectDetails = this.widgetMapper.findProjectProgress(widgetCondition);
--
Gitblit v1.8.0