From c53dab4805b84fee3fb0f02613abafff488fe5d1 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 23 Mar 2024 13:27:24 +0900
Subject: [PATCH] Fix new scraps not going to default folder

---
 modules/member/member.controller.php               | 14 ++++++++++++--
 modules/member/member.view.php                     |  9 +++++++++
 .../member/queries/updateScrapFolderFromNull.xml   |  7 +++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 1d939f5eb..1c31eaa18 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -207,7 +207,15 @@ class MemberController extends Member
 		}
 		else
 		{
-			$default_folder_srl = null;
+			$output = $this->migrateMemberScrappedDocuments($logged_info->member_srl);
+			if ($output instanceof BaseObject)
+			{
+				return $output;
+			}
+			else
+			{
+				$default_folder_srl = $output;
+			}
 		}
 
 		// Variables
@@ -468,7 +476,7 @@ class MemberController extends Member
 	 * Migrate a member's scrapped documents to the new folder system.
 	 *
 	 * @param int $member_srl
-	 * @return void|Object (void : success, Object : fail)
+	 * @return int|BaseObject
 	 */
 	function migrateMemberScrappedDocuments($member_srl)
 	{
@@ -487,6 +495,8 @@ class MemberController extends Member
 		{
 			return $output;
 		}
+
+		return $args->folder_srl;
 	}
 
 	/**
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 882f786ac..fe394a866 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -671,6 +671,15 @@ class MemberView extends Member
 			}
 		}
 
+		// If viewing default folder, check for additional scraps to migrate.
+		if (isset($folder_info->folder_srl) && $folder_info->name === '/DEFAULT/')
+		{
+			$output = executeQuery('member.updateScrapFolderFromNull', [
+				'folder_srl' => $folder_info->folder_srl,
+				'member_srl' => $logged_info->member_srl,
+			]);
+		}
+
 		// Get scrapped documents in selected folder
 		$args = new stdClass();
 		$args->member_srl = $logged_info->member_srl;
diff --git a/modules/member/queries/updateScrapFolderFromNull.xml b/modules/member/queries/updateScrapFolderFromNull.xml
index 2048d4e10..3f808ec30 100644
--- a/modules/member/queries/updateScrapFolderFromNull.xml
+++ b/modules/member/queries/updateScrapFolderFromNull.xml
@@ -7,6 +7,9 @@
     </columns>
     <conditions>
         <condition operation="equal" column="member_srl" var="member_srl" filter="number" notnull="notnull" />
-		<condition operation="null" column="folder_srl" pipe="and" />
+		<group>
+			<condition operation="equal" column="folder_srl" default="0" />
+			<condition operation="null" column="folder_srl" pipe="or" />
+		</group>
     </conditions>
-</query>
\ No newline at end of file
+</query>