ブログ記事と固定ページの非認証APIで草稿を非公開に変更

baserproject · Apr 16, 2023 · eca9141 · eca9141
1 parent ac10b4a
commit eca9141
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 17 deletions.
diff --git a/plugins/baser-core/src/Controller/Api/PagesController.php b/plugins/baser-core/src/Controller/Api/PagesController.php
@@ -36,13 +36,14 @@ public function index(PagesServiceInterface $service)
     {
         $this->request->allowMethod('get');
         $queryParams = $this->getRequest()->getQueryParams();
-        if (isset($queryParams['status']) || isset($queryParams['contain'])) {
+        if (isset($queryParams['status']) || isset($queryParams['contain']) || isset($queryParams['draft'])) {
             throw new ForbiddenException();
         }
 
         $queryParams = array_merge([
             'status' => 'publish',
-            'contain' => null
+            'contain' => null,
+            'draft' => false
         ], $queryParams);
 
         $this->set([
@@ -69,12 +70,13 @@ public function view(PagesServiceInterface $service, $id)
     {
         $this->request->allowMethod('get');
         $queryParams = $this->getRequest()->getQueryParams();
-        if (isset($queryParams['status']) || isset($queryParams['contain'])) {
+        if (isset($queryParams['status']) || isset($queryParams['contain']) || isset($queryParams['draft'])) {
             throw new ForbiddenException();
         }
 
         $queryParams = array_merge([
-            'status' => 'publish'
+            'status' => 'publish',
+            'draft' => false
         ], $queryParams);
 
         $page = $message = null;

diff --git a/plugins/baser-core/src/Service/PagesService.php b/plugins/baser-core/src/Service/PagesService.php
@@ -131,16 +131,21 @@ public function get($id, array $options = []): EntityInterface
     {
         $options = array_merge([
             'status' => '',
-            'contain' => ['Contents' => ['Sites']]
+            'contain' => ['Contents' => ['Sites']],
+            'draft' => false
         ], $options);
         $conditions = [];
         if ($options['status'] === 'publish') {
             $conditions = $this->Pages->Contents->getConditionAllowPublish();
         }
-        return $this->Pages->get($id, [
+        $entity = $this->Pages->get($id, [
             'contain' => $options['contain'],
-            'conditions' => $conditions
+            'conditions' => $conditions,
         ]);
+        if($options['draft'] === false) {
+            unset($entity->draft);
+        }
+        return $entity;
     }
 
     /**
@@ -178,11 +183,15 @@ public function getIndex(array $queryParams = []): Query
     {
         $options = array_merge([
             'status' => '',
-            'contain' => ['Contents']
+            'contain' => ['Contents'],
+            'draft' => null
         ], $queryParams);
 
         $fields = $this->Pages->getSchema()->columns();
-        if (is_null($options['contain'])) {
+        if (is_null($options['contain']) || $options['draft'] === false) {
+            if($options['draft'] === false) {
+                unset($fields[array_search('draft', $fields)]);
+            }
             $query = $this->Pages->find()->contain('Contents')->select($fields);
         } else {
             $query = $this->Pages->find()->contain($options['contain']);

diff --git a/plugins/bc-blog/src/Controller/Api/BlogPostsController.php b/plugins/bc-blog/src/Controller/Api/BlogPostsController.php
@@ -37,13 +37,14 @@ public function index(BlogPostsServiceInterface $service)
         $this->request->allowMethod('get');
 
         $queryParams = $this->getRequest()->getQueryParams();
-        if (isset($queryParams['status']) || isset($queryParams['contain'])) {
+        if (isset($queryParams['status']) || isset($queryParams['contain']) || isset($queryParams['draft'])) {
             throw new ForbiddenException();
         }
 
         $queryParams = array_merge([
             'contain' => null,
-            'status' => 'publish'
+            'status' => 'publish',
+            'draft' => false
         ], $queryParams);
         $this->set([
             'blogPosts' => $this->paginate($service->getIndex($queryParams))
@@ -70,12 +71,13 @@ public function view(BlogPostsServiceInterface $service, $id)
     {
         $this->request->allowMethod('get');
         $queryParams = $this->getRequest()->getQueryParams();
-        if (isset($queryParams['status']) || isset($queryParams['contain'])) {
+        if (isset($queryParams['status']) || isset($queryParams['contain']) || isset($queryParams['draft'])) {
             throw new ForbiddenException();
         }
 
         $queryParams = array_merge([
-            'status' => 'publish'
+            'status' => 'publish',
+            'draft' => false
         ], $queryParams);
 
         $blogPost = $message = null;

diff --git a/plugins/bc-blog/src/Service/BlogPostsService.php b/plugins/bc-blog/src/Service/BlogPostsService.php
@@ -90,16 +90,22 @@ public function get(int $id, array $options = [])
                 'BlogContents' => ['Contents' => ['Sites']],
                 'BlogCategories',
                 'BlogTags'
-            ]
+            ],
+            'draft' => null
         ], $options);
         $conditions = [];
         if ($options['status'] === 'publish') {
             $conditions = $this->BlogPosts->getConditionAllowPublish();
             $conditions = array_merge($conditions, $this->BlogPosts->BlogContents->Contents->getConditionAllowPublish());
         }
-        return $this->BlogPosts->get($id, [
+        $entity = $this->BlogPosts->get($id, [
             'conditions' => $conditions,
             'contain' => $options['contain']]);
+        if($options['draft'] === false) {
+            unset($entity->content_draft);
+            unset($entity->detail_draft);
+        }
+        return $entity;
     }
 
     /**
@@ -129,7 +135,8 @@ public function getIndex(array $queryParams = []): Query
                 'BlogContents',
                 'BlogComments',
                 'BlogTags',
-            ]
+            ],
+            'draft' => null
         ], $queryParams);
 
         if (!empty($options['num'])) $options['limit'] = $options['num'];
@@ -242,8 +249,12 @@ protected function createIndexConditions(Query $query, array $params)
         // ステータス
         if (($params['status'] === 'publish' || (string)$params['status'] === '1') && !$params['preview']) {
             $conditions = $this->BlogPosts->getConditionAllowPublish();
-            if(empty($params['contain'])) {
+            if(empty($params['contain']) || $params['draft'] === false) {
                 $fields = $this->BlogPosts->getSchema()->columns();
+                if($params['draft'] === false) {
+                    unset($fields[array_search('content_draft', $fields)]);
+                    unset($fields[array_search('detail_draft', $fields)]);
+                }
                 $query = $this->BlogPosts->find()->contain(['BlogContents' => ['Contents']])->select($fields);
             } elseif(!isset($params['contain']['BlogContents']['Contents'])) {
                 $query = $this->BlogPosts->find()->contain(array_merge_recursive($query->getContain(), ['BlogContents' => ['Contents']]));