Merge pull request #15 from magefan/4536-add-store-id-to-blog-gql

4536 add store id to blog gql

Author: magefan

Model/Resolver/Categories.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder as SearchCriteriaBuilder;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -43,26 +44,34 @@ class Categories implements ResolverInterface
      */
     protected $filterGroupBuilder;
 
+    /**
+     * @var ScopeResolverInterface
+     */
+    private $scopeResolver;
+
     /**
      * Categories constructor.
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param CategoryRepositoryInterface $categoryRepositoryInterface
      * @param DataProvider\Category $categoryDataProvider
      * @param FilterBuilder $filterBuilder
      * @param FilterGroupBuilder $filterGroupBuilder
+     * @param ScopeResolverInterface $scopeResolver
      */
     public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         CategoryRepositoryInterface $categoryRepositoryInterface,
         DataProvider\Category $categoryDataProvider,
         FilterBuilder $filterBuilder,
-        FilterGroupBuilder $filterGroupBuilder
+        FilterGroupBuilder $filterGroupBuilder,
+        ScopeResolverInterface $scopeResolver
     ) {
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->categoryRepositoryInterface = $categoryRepositoryInterface;
         $this->categoryDataProvider = $categoryDataProvider;
         $this->filterBuilder = $filterBuilder;
         $this->filterGroupBuilder = $filterGroupBuilder;
+        $this->scopeResolver = $scopeResolver;
     }
     /**
      * @inheritdoc
@@ -83,6 +92,16 @@ public function resolve(
 
         $filterGroups = $searchCriteria->getFilterGroups();
         $filterGroups[] = $this->filterGroupBuilder->addFilter($statusFilter)->create();
+
+        $scope = $this->scopeResolver->getScope()->getId();
+
+        $scopeFilter = $this->filterBuilder
+            ->setField('store_id')
+            ->setValue($scope)
+            ->setConditionType('eq')
+            ->create();
+        $filterGroups[] = $this->filterGroupBuilder->addFilter($scopeFilter)->create();
+
         $searchCriteria->setFilterGroups($filterGroups);
 
         $searchResult = $this->categoryRepositoryInterface->getList($searchCriteria);

Model/Resolver/Posts.php

@@ -16,6 +16,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magefan\Blog\Api\PostRepositoryInterface;
 use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Framework\App\ScopeResolverInterface;
 
 /**
  * Class Posts
@@ -50,6 +51,11 @@ class Posts implements ResolverInterface
      */
     protected $filterGroupBuilder;
 
+    /**
+     * @var ScopeResolverInterface
+     */
+    private $scopeResolver;
+
     /**
      * Posts constructor.
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
@@ -58,21 +64,24 @@ class Posts implements ResolverInterface
      * @param DataProvider\Post $postDataProvider
      * @param FilterBuilder $filterBuilder
      * @param FilterGroupBuilder $filterGroupBuilder
+     * @param ScopeResolverInterface $scopeResolver
      */
     public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         PostRepositoryInterface $postRepository,
         SortOrderBuilder $sortOrderBuilder,
         DataProvider\Post $postDataProvider,
         FilterBuilder $filterBuilder,
-        FilterGroupBuilder $filterGroupBuilder
+        FilterGroupBuilder $filterGroupBuilder,
+        ScopeResolverInterface $scopeResolver
     ) {
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->postRepository = $postRepository;
         $this->sortOrderBuilder = $sortOrderBuilder;
         $this->postDataProvider = $postDataProvider;
         $this->filterBuilder = $filterBuilder;
         $this->filterGroupBuilder = $filterGroupBuilder;
+        $this->scopeResolver = $scopeResolver;
     }
     /**
      * @inheritdoc
@@ -94,6 +103,15 @@ public function resolve(
         $filterGroups = $searchCriteria->getFilterGroups();
         $filterGroups[] = $this->filterGroupBuilder->addFilter($statusFilter)->create();
 
+        $scope = $this->scopeResolver->getScope()->getId();
+
+        $scopeFilter = $this->filterBuilder
+            ->setField('store_id')
+            ->setValue($scope)
+            ->setConditionType('eq')
+            ->create();
+        $filterGroups[] = $this->filterGroupBuilder->addFilter($scopeFilter)->create();
+
         if (isset($args['filter']['post_id']['in'])) {
             $postIdFilter = $this->filterBuilder
                 ->setField('post_id')

Model/Resolver/Tags.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder as SearchCriteriaBuilder;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -43,26 +44,34 @@ class Tags implements ResolverInterface
      */
     private $filterGroupBuilder;
 
+    /**
+     * @var ScopeResolverInterface
+     */
+    private $scopeResolver;
+
     /**
      * Comments constructor.
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param TagRepositoryInterface $tagRepository
      * @param DataProvider\Tag $tagDataProvider
      * @param FilterBuilder $filterBuilder
      * @param FilterGroupBuilder $filterGroupBuilder
+     * @param ScopeResolverInterface $scopeResolver
      */
     public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         TagRepositoryInterface $tagRepository,
         DataProvider\Tag $tagDataProvider,
         FilterBuilder $filterBuilder,
-        FilterGroupBuilder $filterGroupBuilder
+        FilterGroupBuilder $filterGroupBuilder,
+        ScopeResolverInterface $scopeResolver
     ) {
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->tagRepository = $tagRepository;
         $this->tagDataProvider = $tagDataProvider;
         $this->filterBuilder = $filterBuilder;
         $this->filterGroupBuilder = $filterGroupBuilder;
+        $this->scopeResolver = $scopeResolver;
     }
     /**
      * @inheritdoc
@@ -83,6 +92,16 @@ public function resolve(
 
         $filterGroups = $searchCriteria->getFilterGroups();
         $filterGroups[] = $this->filterGroupBuilder->addFilter($statusFilter)->create();
+
+        $scope = $this->scopeResolver->getScope()->getId();
+
+        $scopeFilter = $this->filterBuilder
+            ->setField('store_id')
+            ->setValue($scope)
+            ->setConditionType('eq')
+            ->create();
+        $filterGroups[] = $this->filterGroupBuilder->addFilter($scopeFilter)->create();
+
         $searchCriteria->setFilterGroups($filterGroups);
 
         $searchResult = $this->tagRepository->getList($searchCriteria);