From 39f154dea4be394be4b2b72239d14d54551ac9f3 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 03 1월 2022 14:54:17 +0900
Subject: [PATCH] - prod 설정 파일 수정 - api 이슈 수정시 사용자 정의 필드 항목 개수가 맞아도 입력한 사용자 정의 필드 값만 검색하여 수정하도록 변경
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 6 ++++++
src/main/resources/system_prod.properties | 8 ++++----
src/main/resources/mybatis/query-template/issue-template.xml | 11 ++++++++++-
3 files changed, 20 insertions(+), 5 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 25aaee7..221668d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -414,7 +414,9 @@
IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
Collections.sort(issueCustomFieldValueForms, comp);
+ List<String> userValues = Lists.newArrayList();
for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {
+ userValues.add(issueCustomFieldValueForm.getUseValue());
for(CustomFieldApiOverlap customFieldApiOverlap : customFieldApiOverlaps) {
if (customFieldApiOverlap.getCustomField().getId().equals(issueCustomFieldValueForm.getCustomFieldId())) {
if (useIdx > 0) {
@@ -428,6 +430,7 @@
IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
issueCustomFieldValueCondition.setUseValue(concatUseValue);
+ issueCustomFieldValueCondition.setUseValues(userValues);
issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
if (results != null && results.size() > 0) {
@@ -1759,6 +1762,7 @@
List<Issue> resultIssueVos = Lists.newArrayList();
String comma = ",";
+ List<String> userValues = Lists.newArrayList();
if (issueCustomFieldValueForms.size() > 0) {
IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
Collections.sort(issueCustomFieldValueForms, comp);
@@ -1766,6 +1770,7 @@
String concatUseValue = "";
for (int i = 0; i < issueCustomFieldValueForms.size(); i++) {
IssueCustomFieldValueForm issueCustomFieldValueForm = issueCustomFieldValueForms.get(i);
+ userValues.add(issueCustomFieldValueForm.getUseValue());
if (i > 0) {
concatUseValue = concatUseValue.concat(comma);
}
@@ -1774,6 +1779,7 @@
IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
issueCustomFieldValueCondition.setUseValue(concatUseValue);
+ issueCustomFieldValueCondition.setUseValues(userValues);
issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
if (results != null && results.size() > 0) {
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 11819d2..6dc1b5a 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -1105,7 +1105,16 @@
LEFT OUTER JOIN (
SELECT cf.id AS customFieldId, cf.custom_field_type AS customFieldType, issue_custom.use_value AS useValue, issue_custom.issue_id AS issueId
FROM issue_custom_field_value issue_custom
- INNER JOIN custom_field cf ON cf.id = issue_custom.custom_field_id) customFieldValue ON customFieldValue.issueId = issue.id
+ INNER JOIN custom_field cf ON cf.id = issue_custom.custom_field_id
+ <choose>
+ <when test="useValues.size != 0">
+ WHERE issue_custom.use_value IN
+ <foreach collection="useValues" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ ) customFieldValue ON customFieldValue.issueId = issue.id
WHERE issStatus.issue_status_type != 'CLOSE'
AND issue.issue_type_id = #{issueTypeId}
GROUP BY issue.id
diff --git a/src/main/resources/system_prod.properties b/src/main/resources/system_prod.properties
index 22e64d0..5412e3e 100644
--- a/src/main/resources/system_prod.properties
+++ b/src/main/resources/system_prod.properties
@@ -45,7 +45,7 @@
email.transport.protocol=smtp
email.smtp.auth=true
email.smtp.starttle.enable=true
-email.debug=true
+email.debug=false
email.sendUrl=http://maprex.iptime.org:8180
# \uD68C\uACC4 \uB2F4\uB2F9\uC790 \uACB0\uC81C \uCDE8\uC18C \uC54C\uB9BC - \uD68C\uACC4 \uB2F4\uB2F9\uC790\uB294 \uAF2D \uC2DC\uC2A4\uD15C\uC5D0 \uAC00\uC785 \uB418\uC5B4 \uC788\uC5B4\uC57C \uD55C\uB2E4.
@@ -74,8 +74,8 @@
use.scheduler=true
# upload path
-attached.file.path=/dev-upload/
-profile.file.path=/dev-profile
+attached.file.path=/upload/
+profile.file.path=/profile
# aws bucket name
aws.bucket.name=files
@@ -84,7 +84,7 @@
aws.access.password=eAQvouvSJJFl47h2dkMJji/6OtzsGBGF4h9Df3qH
# aws s3 url
# aws.s3.url=https://s3.ap-northeast-2.amazonaws.com/
-aws.s3.url=http://localhost:8081/
+aws.s3.url=../
# OAuth 2.0 \uC778\uC99D \uC815\uBCF4 \uC124\uC815
OAuth.google.clientId=545115864261-lumkhr0qhei643koiva5b130410s032e.apps.googleusercontent.com
--
Gitblit v1.8.0