Merge remote-tracking branch 'origin/jenkins_with_weblogic' into jenkins_with_weblogic

src/main/java/com/eactive/eai/rms/data/entity/onl/logger/EAILogRepositoryImpl.java

@@ -1,19 +1,5 @@
 package com.eactive.eai.rms.data.entity.onl.logger;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
-
 import com.eactive.eai.data.entity.onl.logger.EAILog;
 import com.eactive.eai.data.entity.onl.logger.EAILogId;
 import com.eactive.eai.data.entity.onl.logger.QEAILog;
@@ -25,6 +11,18 @@ import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.EntityPathBase;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Repository
 public class EAILogRepositoryImpl implements EAILogRepository {
@@ -44,12 +42,8 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 
 		QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
 
-		JPAQuery<?> query = new JPAQueryFactory(em)
+		JPAQuery<?> query = new JPAQueryFactory(em).from(entityPathBase);
-	            .from(entityPathBase)
+		appendConditions(eaiLogSearch, qeaiLog, entityPathBase, query);
-	            .leftJoin(qeaiMessageEntity)
-	            .on(qeaiLog.eaisvcname.eq(qeaiMessageEntity.eaisvcname));
-		
-		appendConditions(eaiLogSearch, qeaiLog, entityPathBase, query, qeaiMessageEntity);
 
 		long totalCount = query.select(qeaiLog.id.msgdpstyms.count()).fetchOne();
 
@@ -64,8 +58,9 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 						qeaiLog.eaisvcname, qeaiLog.extbizcd, qeaiLog.refkey, qeaiLog.clientname,
 						qeaiLog.orgname, qeaiLog.msgprcssyms, qeaiLog.companycode, qeaiLog.eaierrctnt,
 						qeaiMessageEntity.eaisvcdesc))
-	            // .from(...)  		--> 이미 위에서 선언했으므로 생략
+				.from(entityPathBase)
-	            // .leftJoin(...)  	--> 이미 위에서 선언했으므로 생략
+				.leftJoin(qeaiMessageEntity)
+				.on(qeaiLog.eaisvcname.eq(qeaiMessageEntity.eaisvcname))
 				.orderBy(qeaiLog.id.msgdpstyms.desc(), qeaiLog.id.eaisvcserno.asc(), qeaiLog.id.logprcssserno.asc())
 				.limit(1000)
 				.fetch();
@@ -77,14 +72,8 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 		QEAILog qeaiLog = QEAILog.eAILog;
 		EntityPathBase<?> entityPathBase = new EntityPathBase<>(clazz, qeaiLog.getMetadata().getName());
 
-		QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
+		JPAQuery<?> query = new JPAQueryFactory(em).from(entityPathBase);
-
+		appendConditions(eaiLogSearch, qeaiLog, entityPathBase, query);
-		JPAQuery<?> query = new JPAQueryFactory(em)
-                .from(entityPathBase)
-                .leftJoin(qeaiMessageEntity) 
-                .on(qeaiLog.eaisvcname.eq(qeaiMessageEntity.eaisvcname));
-		
-		appendConditions(eaiLogSearch, qeaiLog, entityPathBase, query, qeaiMessageEntity);
 
 		List<Tuple> results = query.select(
 					qeaiLog.id.logprcssserno,    // 로그 처리 상태
@@ -100,7 +89,7 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 		return reult;
 	}
 
-	private void appendConditions(EAILogSearch eaiLogSearch, QEAILog qeaiLog, EntityPathBase<?> entityPathBase, JPAQuery<?> query, QEAIMessageEntity qeaiMessageEntity) {
+	private void appendConditions(EAILogSearch eaiLogSearch, QEAILog qeaiLog, EntityPathBase<?> entityPathBase, JPAQuery<?> query) {
 
 		if (StringUtils.equalsIgnoreCase(eaiLogSearch.getAuthChk(), "Y")) {
 			QUserBusiness qUserBusiness = QUserBusiness.userBusiness;
@@ -119,28 +108,22 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 			return;
 		}
 
-		boolean hasSvcSerno = StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcSerno());
-		
-		if (hasSvcSerno) {
-			query.where(qeaiLog.id.eaisvcserno.contains(eaiLogSearch.getSearchEaiSvcSerno()));
-		} else {
 		if (StringUtils.isNotBlank(eaiLogSearch.getSearchStartTime())) {
 			query
 					.where(qeaiLog.id.msgdpstyms
 							.between(eaiLogSearch.getSearchStartTime(), eaiLogSearch.getSearchEndTime()));
 		}
-		}
 
 		if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiBzwkDstcd())) {
 			query.where(qeaiLog.id.eaibzwkdstcd.eq(eaiLogSearch.getSearchEaiBzwkDstcd()));
 		}
 
-		if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcName())) {
+		if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcSerno())) {
-			query.where(qeaiLog.eaisvcname.containsIgnoreCase(eaiLogSearch.getSearchEaiSvcName()));
+			query.where(qeaiLog.id.eaisvcserno.contains(eaiLogSearch.getSearchEaiSvcSerno()));
 		}
 
-		if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcDesc())) {
+		if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcName())) {
-			query.where(qeaiMessageEntity.eaisvcdesc.containsIgnoreCase(eaiLogSearch.getSearchEaiSvcDesc()));
+			query.where(qeaiLog.eaisvcname.containsIgnoreCase(eaiLogSearch.getSearchEaiSvcName()));
 		}
 
 		if (StringUtils.isNotBlank(eaiLogSearch.getSearchKeyMgtMsgCtnt())) {