From 1fac1465cdef9f3b4573edf1869af120c5cbee79 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 15:27:07 +0900
Subject: [PATCH] api 이슈 추가시 업체/isp/호스팅에 해당 도메인이 포함되면 해당 업체 자동 입력
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 11 deletions(-)
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 324bb9e..d259bbe 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -82,6 +82,15 @@
private ApiTokenService apiTokenService;
@Autowired
+ private CompanyFieldService companyFieldService;
+
+ @Autowired
+ private IspFieldService ispFieldService;
+
+ @Autowired
+ private HostingFieldService hostingFieldService;
+
+ @Autowired
private CommonConfiguration configuration;
@Autowired
@@ -282,6 +291,8 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶 �꽕�젙
issueForm.setIssueCustomFields(issueApiForm.getCustomFieldValues());
+ // 媛숈� �룄硫붿씤 �뾽泥� 李얘린
+ this.findCompanyField(issueForm);
// api �엯�젰媛� �쟻�슜
ConvertUtil.copyProperties(issueApiForm, issueForm);
@@ -290,6 +301,51 @@
} else {
throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_USER_ERROR));
+ }
+ }
+
+ private void findCompanyField(IssueForm issueForm) {
+ if(issueForm.getIssueCustomFields() != null && issueForm.getIssueCustomFields().size() > 0) {
+ CompanyFieldCondition condition = new CompanyFieldCondition();
+ List<Map<String, Object>> companyFields = this.companyFieldService.find(condition);
+ List<Map<String, Object>> issueCompanyFields = Lists.newArrayList();
+ List<Map<String, Object>> issueIspFields = Lists.newArrayList();
+ List<Map<String, Object>> issueHostingFields = Lists.newArrayList();
+
+ for (Map<String, Object> issueCustomField : issueForm.getIssueCustomFields()) {
+ int customFieldId = (Integer) issueCustomField.get("customFieldId");
+ Long customId = (long) customFieldId;
+ CustomField customField = this.customFieldService.getCustomField(customId);
+ if(customField != null && customField.getCustomFieldType().toString().equals("SITE") && customField.getName().equals("�룄硫붿씤")) {
+ String useValue = issueCustomField.get("useValue").toString();
+ if(companyFields != null && companyFields.size() > 0) {
+ for (Map<String, Object> companyField : companyFields) {
+ CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(companyField, CompanyFieldVo.class);
+ if(useValue.equals(companyFieldVo.getUrl())) {
+ companyField.put("companyId", companyField.get("id"));
+ issueCompanyFields.add(companyField);
+ if(companyFieldVo.getIspId() != null) {
+ Map<String, Object> ispField = this.ispFieldService.find(companyFieldVo.getIspId());
+ if (ispField != null) {
+ ispField.put("ispId", ispField.get("id"));
+ issueIspFields.add(ispField);
+ }
+ }
+ if(companyFieldVo.getHostingId() != null) {
+ Map<String, Object> hostingField = this.hostingFieldService.find(companyFieldVo.getHostingId());
+ if (hostingField != null) {
+ hostingField.put("hostingId", hostingField.get("id"));
+ issueHostingFields.add(hostingField);
+ }
+ }
+ }
+ }
+ }
+ }
+ issueForm.setIssueCompanyFields(issueCompanyFields);
+ issueForm.setIssueIspFields(issueIspFields);
+ issueForm.setIssueHostingFields(issueHostingFields);
+ }
}
}
@@ -776,7 +832,7 @@
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
this.SetAllDepartmentId(issueCondition);
} else{
this.SetMyDepartmentId(issueCondition);
@@ -915,15 +971,19 @@
public void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData) {
IssueTypeCondition issueTypeCondition = new IssueTypeCondition();
+ issueTypeCondition.setIsApi(Issue.IS_API_YES);
List<IssueTypeVo> issueTypes = this.issueTypeService.findIssueType(issueTypeCondition);
- // 媛믪씠 �뾾�쓣 寃쎌슦 珥덇린媛� �엯�젰
- if (StringUtils.isEmpty(apiMonitorCondition.getSearchPeriod())) {
- apiMonitorCondition.setSearchPeriod(DateUtil.LAST_SEVEN_DAYS);
- }
-
// 寃��깋 �씪�옄瑜� 援ы븳�떎.
- List<Date> searchDates = CommonUtil.findSearchPeriod(apiMonitorCondition.getSearchPeriod());
+ List<Date> searchDates = Lists.newArrayList();
+ if (apiMonitorCondition.getSearchPeriod().equals(DateUtil.CUSTOM_INPUT)) {
+ Date startDate = DateUtil.convertStrToDate(apiMonitorCondition.getSearchStartDate(), "yyyy-MM-dd");
+ Date endDate = DateUtil.addDays(DateUtil.convertStrToDate(apiMonitorCondition.getSearchEndDate(), "yyyy-MM-dd"), 1);
+
+ searchDates = CommonUtil.findSearchPeriod(startDate, endDate);
+ } else {
+ searchDates = CommonUtil.findSearchPeriod(apiMonitorCondition.getSearchPeriod());
+ }
// �궇吏쒓� 寃��깋�릺吏� �븡�븯�쑝硫� �삤瑜�
if (searchDates.size() < 1) {
@@ -1132,7 +1192,9 @@
// �봽濡쒖젥�듃瑜� �꽑�깮�븯吏� �븡�븯�쑝硫� �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 李몄뿬�븯怨� �엳�뒗 �봽濡쒖젥�듃瑜� 李얜뒗�떎.
if (condition.getProjectIds().size() < 1) {
List<Map<String, Object>> projects = null;
- if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+ UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
+ if (this.userWorkspaceService.checkWorkspaceManager(user)
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
projects = this.projectMapper.findByWorkspaceManagerAll(projectCondition);
} else {
projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectCondition);
@@ -1293,6 +1355,7 @@
if (issueCondition.getId() != null) {
Issue issue = this.getIssue(issueCondition.getId());
issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
+ User user = this.webAppUtil.getLoginUserObject();
switch (issueCondition.getDeep()) {
case "01": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦遺��꽌, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� �뀑�똿�븳�떎.
@@ -1313,7 +1376,7 @@
break;
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
- this.setIssueDetail(issueVo, issue); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
+ this.setIssueDetail(issueVo, issue, user); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
this.setIssueTableConfigs(issue, issueVo);
issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
break;
@@ -1374,7 +1437,7 @@
// �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
@Override
@Transactional(readOnly = true)
- public void setIssueDetail(IssueVo issueVo, Issue issue) {
+ public void setIssueDetail(IssueVo issueVo, Issue issue, User user) {
issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
issueVo.setIssueTypeVo(ConvertUtil.copyProperties(issue.getIssueType(), IssueTypeVo.class));
IssueStatusVo issueStatusVo = ConvertUtil.copyProperties(issue.getIssueStatus(), IssueStatusVo.class, "issueStatusType");
@@ -1409,8 +1472,12 @@
this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
this.setIssueIspField(issue, issueVo); //ISP �젙蹂� �꽭�똿
this.setIssueHostingField(issue, issueVo); //HOSTING �젙蹂� �꽭�똿
-
this.setParentIssue(issue,issueVo); //�긽�쐞 �씠�뒋 �젙蹂� �꽭�똿
+
+ // �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
+ if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user, issueVo.getDepartmentVos())) {
+ issueVo.setModifyPermissionCheck(Boolean.TRUE);
+ }
}
// �긽�쐞�씪媛� �젙蹂� 異붽�
@@ -1985,6 +2052,8 @@
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null, null, user);
// �봽濡쒖젥�듃 愿�由ъ옄�씪 寃쎌슦 �빐�떦 �봽濡쒖젥�듃�뿉 �벑濡앸맂 �씠�뒋�뒗 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null, null, user);
+ // �씠�뒋 愿�由ъ옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ISSUE_MANAGER, issueVo, null, null, user);
// �씠�뒋 �벑濡앹옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null, null, user);
// �씠�뒋 �떞�떦�옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
@@ -2014,6 +2083,11 @@
hasPermission = this.projectRoleUserService.checkProjectManager(issue.getProject(), user);
break;
+ case Issue.ISSUE_MANAGER: // �씠�뒋 愿�由ъ옄
+ UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
+ hasPermission = MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE);
+ break;
+
case Issue.REGISTER: // �씠�뒋 �벑濡앹옄
hasPermission = issueVo.getRegisterId().equals(user.getId());
break;
--
Gitblit v1.8.0