MC-29929: cmsBlocks that has scope limited to specific Store View can be seen on other Store Views in case there are Blocks with identical identifiers on both Store Views

- Fix case when block is assigned to all stores
- stabilize builds

Author: danielrenaud

app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php

@@ -11,6 +11,7 @@
 use Magento\Cms\Api\Data\BlockInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\Store;
 use Magento\Widget\Model\Template\FilterEmulate;
 
 /**
@@ -91,7 +92,7 @@ private function fetchBlockData($identifier, string $field, int $storeId): array
     {
         $searchCriteria = $this->searchCriteriaBuilder
             ->addFilter($field, $identifier)
-            ->addFilter('store_id', $storeId)
+            ->addFilter(Store::STORE_ID, [$storeId, Store::DEFAULT_STORE_ID], 'in')
             ->addFilter(BlockInterface::IS_ACTIVE, true)->create();
 
         $blockResults = $this->blockRepository->getList($searchCriteria)->getItems();

app/code/Magento/CmsGraphQl/composer.json

@@ -6,7 +6,8 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-cms": "*",
-        "magento/module-widget": "*"
+        "magento/module-widget": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*",

dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsBlockTest.php

@@ -216,29 +216,29 @@ public function testGetEnabledAndDisabledCmsBlockInOneRequest()
      */
     public function testGetCmsBlockPerSpecificStore(): void
     {
-        $blockIdentitifier1 = 'test-block';
-        $blockIdentitifier2 = 'test-block-2';
+        $blockIdentifier1 = 'test-block';
+        $blockIdentifier2 = 'test-block-2';
         $secondStoreCode = 'second_store_view';
         $thirdStoreCode = 'third_store_view';
 
         //Verify the correct block information for second store is returned
-        $cmsBlockResponseSecondStore = $this->getCmsBlockQuery($blockIdentitifier1, $secondStoreCode);
+        $cmsBlockResponseSecondStore = $this->getCmsBlockQuery($blockIdentifier1, $secondStoreCode);
         self::assertArrayHasKey('cmsBlocks', $cmsBlockResponseSecondStore);
         self::assertArrayHasKey('items', $cmsBlockResponseSecondStore['cmsBlocks']);
         self::assertEquals('test-block', $cmsBlockResponseSecondStore['cmsBlocks']['items'][0]['identifier']);
         self::assertEquals('Second store block', $cmsBlockResponseSecondStore['cmsBlocks']['items'][0]['title']);
         self::assertEquals('second_store_view', $cmsBlockResponseSecondStore['storeConfig']['code']);
 
         //Verify the correct block information for third store is returned
-        $cmsBlockResponseThirdStore = $this->getCmsBlockQuery($blockIdentitifier1, $thirdStoreCode);
+        $cmsBlockResponseThirdStore = $this->getCmsBlockQuery($blockIdentifier1, $thirdStoreCode);
         self::assertArrayHasKey('cmsBlocks', $cmsBlockResponseThirdStore);
         self::assertArrayHasKey('items', $cmsBlockResponseThirdStore['cmsBlocks']);
         self::assertEquals('test-block', $cmsBlockResponseThirdStore['cmsBlocks']['items'][0]['identifier']);
         self::assertEquals('Third store block', $cmsBlockResponseThirdStore['cmsBlocks']['items'][0]['title']);
         self::assertEquals('third_store_view', $cmsBlockResponseThirdStore['storeConfig']['code']);
 
         //Verify the correct block information for second block for second store is returned
-        $cmsBlockResponseSecondStore = $this->getCmsBlockQuery($blockIdentitifier2, $secondStoreCode);
+        $cmsBlockResponseSecondStore = $this->getCmsBlockQuery($blockIdentifier2, $secondStoreCode);
         self::assertArrayHasKey('cmsBlocks', $cmsBlockResponseSecondStore);
         self::assertArrayHasKey('items', $cmsBlockResponseSecondStore['cmsBlocks']);
         self::assertEquals('test-block-2', $cmsBlockResponseSecondStore['cmsBlocks']['items'][0]['identifier']);
@@ -252,7 +252,7 @@ public function testGetCmsBlockPerSpecificStore(): void
         $query =
             <<<QUERY
 {
-  cmsBlocks(identifiers: "$blockIdentitifier2") {
+  cmsBlocks(identifiers: "$blockIdentifier2") {
     items {
       identifier
       title
@@ -271,31 +271,55 @@ public function testGetCmsBlockPerSpecificStore(): void
      * @magentoApiDataFixture Magento/Store/_files/multiple_websites_with_store_groups_stores.php
      * @magentoApiDataFixture Magento/Cms/_files/blocks_for_different_stores.php
      */
-    public function testGetCmsBlockforDisabledStore(): void
+    public function testGetCmsBlockForDisabledStore(): void
     {
-        $blockIdentitifier1 = 'test-block';
+        $blockIdentifier = 'test-block';
         $thirdStoreCode = 'third_store_view';
         $store = Bootstrap::getObjectManager()->get(Store::class);
         $store->load('third_store_view', 'code')->setIsActive(0)->save();
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Requested store is not found');
-        $this->getCmsBlockQuery($blockIdentitifier1, $thirdStoreCode);
+        $this->getCmsBlockQuery($blockIdentifier, $thirdStoreCode);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Cms/_files/block_default_store.php
+     */
+    public function testGetCmsBlockAssignedToDefaultStore(): void
+    {
+        $blockIdentifier = 'default_store_block';
+        $query = <<<QUERY
+{
+  cmsBlocks(identifiers: "$blockIdentifier") {
+    items {
+      identifier
+      title
+      content
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertArrayHasKey('cmsBlocks', $response);
+        $this->assertCount(1, $response['cmsBlocks']['items']);
+        $this->assertEquals($blockIdentifier, $response['cmsBlocks']['items'][0]['identifier']);
     }
 
     /**
      * Get cmsBlockQuery per store
      *
-     * @param string $blockIdentitifier
+     * @param string $blockIdentifier
      * @param string $storeCode
      * @return array
      * @throws \Exception
      */
-    private function getCmsBlockQuery($blockIdentitifier, $storeCode): array
+    private function getCmsBlockQuery($blockIdentifier, $storeCode): array
     {
         $query =
             <<<QUERY
 {
-  cmsBlocks(identifiers: "$blockIdentitifier") {
+  cmsBlocks(identifiers: "$blockIdentifier") {
     items {
       identifier
       title

dev/tests/integration/testsuite/Magento/Cms/_files/block_default_store.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Cms\Model\Block;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var $block Block */
+$block = Bootstrap::getObjectManager()->create(Block::class);
+$block->setTitle(
+    'CMS Block Title'
+)->setIdentifier(
+    'default_store_block'
+)->setContent(
+    '<h1>Fixture Block Title</h1>
+<a href="{{store url=""}}">store url</a>
+<p>Config value: "{{config path="web/unsecure/base_url"}}".</p>
+<p>Custom variable: "{{customvar code="variable_code"}}".</p>'
+)->setIsActive(
+    1
+)->setStores(
+    [Store::DEFAULT_STORE_ID]
+)->save();

dev/tests/integration/testsuite/Magento/Cms/_files/block_default_store_rollback.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var BlockRepositoryInterface $blockRepository */
+$blockRepository = $objectManager->get(BlockRepositoryInterface::class);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter(BlockInterface::IDENTIFIER, 'default_store_block')
+    ->create();
+$result = $blockRepository->getList($searchCriteria);
+
+/**
+ * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+ * In that case there is "if" which checks that "fixture_block" still exists in database.
+ */
+foreach ($result->getItems() as $item) {
+    $blockRepository->delete($item);
+}

dev/tests/integration/testsuite/Magento/Cms/_files/blocks_for_different_stores_rollback.php

@@ -17,7 +17,7 @@
 
 /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
 $searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-$searchCriteria = $searchCriteriaBuilder->addFilter(BlockInterface::IDENTIFIER, '%test-block%' ,'like')
+$searchCriteria = $searchCriteriaBuilder->addFilter(BlockInterface::IDENTIFIER, '%test-block%', 'like')
     ->create();
 $result = $blockRepository->getList($searchCriteria);