From 4bd49c29bb2c45cd9f2413cd541bebfa8f0a3b8b Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 18 Dec 2022 00:28:45 +0900
Subject: [PATCH] Fix #2035 add statusList argument to most comment select
 queries

---
 modules/comment/queries/getAllComments.xml    | 21 ++++++++++---------
 .../comment/queries/getChildCommentCount.xml  |  1 +
 modules/comment/queries/getChildComments.xml  |  1 +
 modules/comment/queries/getCommentCount.xml   | 11 +++++-----
 .../queries/getCommentCountByMemberSrl.xml    |  3 ++-
 modules/comment/queries/getCommentList.xml    |  1 +
 .../queries/getCommentListByMemberSrl.xml     |  1 +
 .../comment/queries/getCommentListItem.xml    |  1 +
 modules/comment/queries/getCommentPage.xml    |  3 ++-
 .../comment/queries/getCommentPageList.xml    |  3 ++-
 .../queries/getCommentsByDocumentSrls.xml     |  1 +
 .../comment/queries/getNewestCommentList.xml  |  5 +++--
 .../getTotalCommentCountByGroupStatus.xml     |  7 ++++---
 ...lCommentCountWithinMemberByGroupStatus.xml |  7 ++++---
 14 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/modules/comment/queries/getAllComments.xml b/modules/comment/queries/getAllComments.xml
index b220598a3..77e7df255 100644
--- a/modules/comment/queries/getAllComments.xml
+++ b/modules/comment/queries/getAllComments.xml
@@ -1,14 +1,15 @@
 <query id="getAllComments" action="select">
-    <tables>
-        <table name="comments" />
-    </tables>
-    <columns>
-        <column name="comment_srl" />
-        <column name="module_srl" />
+	<tables>
+		<table name="comments" />
+	</tables>
+	<columns>
+		<column name="comment_srl" />
+		<column name="module_srl" />
 		<column name="member_srl" />
 		<column name="document_srl" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="document_srl" var="document_srl" notnull="notnull" />
-    </conditions>
+	</columns>
+	<conditions>
+		<condition operation="in" column="document_srl" var="document_srl" notnull="notnull" />
+		<condition operation="in" column="status" var="statusList" pipe="and" />
+	</conditions>
 </query>
diff --git a/modules/comment/queries/getChildCommentCount.xml b/modules/comment/queries/getChildCommentCount.xml
index 7ea9ce02e..ce16af34b 100644
--- a/modules/comment/queries/getChildCommentCount.xml
+++ b/modules/comment/queries/getChildCommentCount.xml
@@ -7,5 +7,6 @@
     </columns>
     <conditions>
         <condition operation="equal" column="parent_srl" var="comment_srl" filter="number" notnull="notnull" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/comment/queries/getChildComments.xml b/modules/comment/queries/getChildComments.xml
index 6a8ec8b89..d9fb5dc00 100644
--- a/modules/comment/queries/getChildComments.xml
+++ b/modules/comment/queries/getChildComments.xml
@@ -8,5 +8,6 @@
     </columns>
     <conditions>
         <condition operation="equal" column="parent_srl" var="comment_srl" filter="number" notnull="notnull" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/comment/queries/getCommentCount.xml b/modules/comment/queries/getCommentCount.xml
index b426c47c6..812fd02bc 100644
--- a/modules/comment/queries/getCommentCount.xml
+++ b/modules/comment/queries/getCommentCount.xml
@@ -5,11 +5,10 @@
     <columns>
         <column name="count(*)" alias="count" />
     </columns>
-    <conditions>
-		<condition operation="equal" column="status" var="status" />        
-		<condition operation="equal" column="document_srl" var="document_srl" filter="number" pipe="and" />        
-		<condition operation="in" column="module_srl" var="module_srl" filter="number" pipe="and" />
-		<condition operation="like_prefix" column="regdate" var="regDate" pipe="and" />
-		<condition operation="equal" column="status" var="status" pipe="and" />
+    <conditions>       
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" pipe="and" />        
+        <condition operation="in" column="module_srl" var="module_srl" filter="number" pipe="and" />
+        <condition operation="like_prefix" column="regdate" var="regDate" pipe="and" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/comment/queries/getCommentCountByMemberSrl.xml b/modules/comment/queries/getCommentCountByMemberSrl.xml
index f81db4647..1e774a9cf 100644
--- a/modules/comment/queries/getCommentCountByMemberSrl.xml
+++ b/modules/comment/queries/getCommentCountByMemberSrl.xml
@@ -6,6 +6,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-		<condition operation="equal" column="member_srl" var="member_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="member_srl" var="member_srl" filter="number" notnull="notnull" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/comment/queries/getCommentList.xml b/modules/comment/queries/getCommentList.xml
index 490d40f0a..53590a402 100644
--- a/modules/comment/queries/getCommentList.xml
+++ b/modules/comment/queries/getCommentList.xml
@@ -9,6 +9,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
     </conditions>
     <navigation>
         <index var="list_order" default="list_order" order="asc" />
diff --git a/modules/comment/queries/getCommentListByMemberSrl.xml b/modules/comment/queries/getCommentListByMemberSrl.xml
index 057c46732..125e52c76 100644
--- a/modules/comment/queries/getCommentListByMemberSrl.xml
+++ b/modules/comment/queries/getCommentListByMemberSrl.xml
@@ -12,6 +12,7 @@
 	</columns>
 	<conditions>
 		<condition operation="equal" column="member_srl" var="member_srl" filter="number" notnull="notnull" />
+		<condition operation="in" column="status" var="statusList" pipe="and" />
 	</conditions>
 	<navigation>
 		<index var="list_order" default="list_order" order="order_type" />
diff --git a/modules/comment/queries/getCommentListItem.xml b/modules/comment/queries/getCommentListItem.xml
index c46b514cc..ba0374863 100644
--- a/modules/comment/queries/getCommentListItem.xml
+++ b/modules/comment/queries/getCommentListItem.xml
@@ -10,5 +10,6 @@
     <conditions>
         <condition operation="equal" column="comments.comment_srl" var="comment_srl" notnull="notnull" />
         <condition operation="equal" column="comments.comment_srl" default="comments_list.comment_srl" notnull="notnull" pipe="and" />
+        <condition operation="in" column="comments.status" var="statusList" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/comment/queries/getCommentPage.xml b/modules/comment/queries/getCommentPage.xml
index ab51416ae..7a042801a 100644
--- a/modules/comment/queries/getCommentPage.xml
+++ b/modules/comment/queries/getCommentPage.xml
@@ -7,7 +7,8 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="more" column="comments.status" var="status" pipe="and" />
+        <condition operation="more" column="comments.status" var="status" />
+		<condition operation="in" column="status" var="statusList" pipe="and" />
 		<condition operation="equal" column="comments_list.document_srl" var="document_srl" notnull="notnull" pipe="and" />
 		<condition operation="equal" column="comments_list.comment_srl" var="comments.comment_srl" filter="number" pipe="and" />
 		<group pipe="and">
diff --git a/modules/comment/queries/getCommentPageList.xml b/modules/comment/queries/getCommentPageList.xml
index e7b650b7a..68065ef8b 100644
--- a/modules/comment/queries/getCommentPageList.xml
+++ b/modules/comment/queries/getCommentPageList.xml
@@ -9,7 +9,8 @@
     </columns>
     <conditions>
         <condition operation="more" column="comments.status" var="status" pipe="and" />
-		<condition operation="equal" column="comments_list.document_srl" var="document_srl" notnull="notnull" pipe="and" />
+        <condition operation="in" column="comments.status" var="statusList" pipe="and" />
+        <condition operation="equal" column="comments_list.document_srl" var="document_srl" notnull="notnull" pipe="and" />
         <condition operation="equal" column="comments_list.comment_srl" var="comments.comment_srl" filter="number" pipe="and" />
         <condition operation="more" column="comments_list.head" default="0" pipe="and" />
         <condition operation="more" column="comments_list.arrange" default="0" pipe="and" />
diff --git a/modules/comment/queries/getCommentsByDocumentSrls.xml b/modules/comment/queries/getCommentsByDocumentSrls.xml
index b7e2c0d68..fd9d92495 100644
--- a/modules/comment/queries/getCommentsByDocumentSrls.xml
+++ b/modules/comment/queries/getCommentsByDocumentSrls.xml
@@ -7,6 +7,7 @@
 	</columns>
 	<conditions>
 		<condition operation="in" column="document_srl" var="document_srls" filter="number" notnull="notnull" />
+		<condition operation="in" column="status" var="statusList" pipe="and" />
 	</conditions>
 	<navigation>
 		<index var="sort_index" default="comment_srl" order="asc" />
diff --git a/modules/comment/queries/getNewestCommentList.xml b/modules/comment/queries/getNewestCommentList.xml
index 90f74da8f..30ef0f076 100644
--- a/modules/comment/queries/getNewestCommentList.xml
+++ b/modules/comment/queries/getNewestCommentList.xml
@@ -6,10 +6,11 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="status" var="status" pipe="and" />
-		<condition operation="equal" column="is_secret" var="is_secret" pipe="and" />
+        <condition operation="equal" column="is_secret" var="is_secret" pipe="and" />
         <condition operation="in" column="module_srl" var="module_srl" filter="number" pipe="and" />
         <condition operation="equal" column="document_srl" var="document_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="status" var="status" pipe="and" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="list_order" order="asc" />
diff --git a/modules/comment/queries/getTotalCommentCountByGroupStatus.xml b/modules/comment/queries/getTotalCommentCountByGroupStatus.xml
index 7805a5654..0e6c1d0e0 100644
--- a/modules/comment/queries/getTotalCommentCountByGroupStatus.xml
+++ b/modules/comment/queries/getTotalCommentCountByGroupStatus.xml
@@ -10,6 +10,7 @@
         <condition operation="in" column="module_srl" var="s_module_srl" />
         <condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" />
         <condition operation="equal" column="is_secret" var="s_is_secret" pipe="and" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="search" column="content" var="s_content" pipe="or" />
             <condition operation="like_prefix" column="user_name" var="s_user_name" pipe="or" />
@@ -22,7 +23,7 @@
             <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
         </group>
     </conditions>
-	<groups>
-		<group column="is_secret" />
-	</groups>
+    <groups>
+        <group column="is_secret" />
+    </groups>
 </query>
diff --git a/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml b/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml
index 9d72bc06b..c508b6ce3 100644
--- a/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml
+++ b/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml
@@ -11,6 +11,7 @@
         <condition operation="equal" column="member.user_id" var="s_user_id" notnull="notnull" />
         <condition operation="equal" column="member.member_srl" var="comments.member_srl" notnull="notnull" pipe="and" />
         <condition operation="equal" column="comments.is_secret" var="s_is_secret" pipe="and" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="search" column="comments.content" var="s_content" />
             <condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" />
@@ -22,7 +23,7 @@
             <condition operation="like_prefix" column="comments.ipaddress" var="s_ipaddress" pipe="or" />
         </group>
     </conditions>
-	<groups>
-		<group column="comments.is_secret" />
-	</groups>
+    <groups>
+        <group column="comments.is_secret" />
+    </groups>
 </query>