#311 답글이랑 관련된 코드를 service 파일에서 event 쪽으로 옮겨 작성해줍니다.

xpressengine · Aug 18, 2021 · 90b5424 · 90b5424
1 parent f8f5dd8
commit 90b5424
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/Plugin/Intercepts/ReplyIntercepts.php b/src/Plugin/Intercepts/ReplyIntercepts.php
@@ -2,10 +2,12 @@
 
 namespace Xpressengine\Plugins\Board\Plugin\Intercepts;
 
+use Event;
 use Xpressengine\Config\ConfigEntity;
 use Xpressengine\Document\Models\Document;
 use Xpressengine\Http\Request;
 use Xpressengine\Plugins\Board\Models\Board;
+use Xpressengine\Routing\InstanceConfig;
 use Xpressengine\User\UserInterface;
 use Xpressengine\Plugins\Board\Exceptions\{
     CanNotDeleteHasReplyException,
@@ -15,6 +17,7 @@
 };
 use Xpressengine\Plugins\Board\{
     BoardPermissionHandler,
+    ConfigHandler,
     Handler as BoardHandler,
     Plugin as BoardPlugin,
     IdentifyManager,
@@ -24,6 +27,23 @@
 
 abstract class ReplyIntercepts
 {
+    /**
+     * listen reply articles
+     */
+    public static function listenReplyArticles()
+    {
+        Event::listen('xe.plugin.board.articles', function ($query) {
+            $instanceConfig = InstanceConfig::instance();
+            $instanceId = $instanceConfig->getInstanceId();
+
+            $boardConfig = app(ConfigHandler::class)->get($instanceId);
+
+            $query->when($boardConfig && $boardConfig->get('replyPost', false) === true, function($query) {
+                $query->where('parent_id', '')->with('replies');
+            });
+        });
+    }
+
     /**
      * intercept validate stored
      */

diff --git a/src/Plugin/Resources.php b/src/Plugin/Resources.php
@@ -395,6 +395,7 @@ function ($deleteCategory, $item, $force = true) {
      */
     public static function interceptReply()
     {
+        Plugin\Intercepts\ReplyIntercepts::listenReplyArticles();
         Plugin\Intercepts\ReplyIntercepts::interceptValidateStored();
         Plugin\Intercepts\ReplyIntercepts::interceptValidateUpdated();
         Plugin\Intercepts\ReplyIntercepts::interceptProtectDeleted();

diff --git a/src/Services/BoardService.php b/src/Services/BoardService.php
@@ -118,8 +118,7 @@ public function getItems(Request $request, ConfigEntity $config, $id = null)
     {
         /** @var Board $model */
         $model = Board::division($config->get('boardId'));
-        $query = $model->where('instance_id', $config->get('boardId'))
-            ->where('parent_id', '');
+        $query = $model->where('instance_id', $config->get('boardId'));
 
         if ($config->get('noticeInList') === true) {
             $query->visibleWithNotice();