MCP-218: Customer Group Limitations by Websites

- Change db schema;
- Repository return types changes;

Author: adifucan

app/code/Magento/Customer/Api/GroupExcludedWebsiteRepositoryInterface.php

@@ -9,7 +9,6 @@
 
 use Magento\Customer\Api\Data\GroupExcludedWebsiteInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Model\ResourceModel\AbstractResource;
 
 /**
  * Customer group website repository interface for websites that are excluded from customer group.
@@ -21,24 +20,24 @@ interface GroupExcludedWebsiteRepositoryInterface
      * Save customer group excluded website.
      *
      * @param GroupExcludedWebsiteInterface $groupExcludedWebsite
-     * @return AbstractResource
+     * @return GroupExcludedWebsiteInterface
      * @throws LocalizedException
      */
-    public function save(GroupExcludedWebsiteInterface $groupExcludedWebsite): AbstractResource;
+    public function save(GroupExcludedWebsiteInterface $groupExcludedWebsite): GroupExcludedWebsiteInterface;
 
     /**
      * Retrieve customer group excluded websites by customer group id.
      *
      * @param int $customerGroupId
-     * @return array
+     * @return string[]
      * @throws LocalizedException
      */
     public function getCustomerGroupExcludedWebsites(int $customerGroupId): array;
 
     /**
      * Retrieve all excluded customer group websites per customer groups.
      *
-     * @return array
+     * @return int[]
      * @throws LocalizedException
      */
     public function getAllExcludedWebsites(): array;
@@ -47,17 +46,17 @@ public function getAllExcludedWebsites(): array;
      * Delete customer group with its excluded websites.
      *
      * @param int $customerGroupId
-     * @return AbstractResource
+     * @return bool
      * @throws LocalizedException
      */
-    public function delete(int $customerGroupId): AbstractResource;
+    public function delete(int $customerGroupId): bool;
 
     /**
      * Delete customer group excluded website by id.
      *
      * @param int $websiteId
-     * @return int
+     * @return bool
      * @throws LocalizedException
      */
-    public function deleteByWebsite(int $websiteId): int;
+    public function deleteByWebsite(int $websiteId): bool;
 }

app/code/Magento/Customer/Model/Plugin/Website/DeleteCustomerGroupExcludedWebsite.php

@@ -56,7 +56,7 @@ public function afterDelete(
         $websiteId = (int)$result->getId();
         if (!empty($websiteId)) {
             $deletedRecords = $this->groupExcludedWebsiteRepository->deleteByWebsite($websiteId);
-            if ($deletedRecords > 0) {
+            if ($deletedRecords) {
                 // invalidate product price index if website was deleted from customer group exclusion
                 $priceIndexer = $this->priceIndexProcessor->getIndexer();
                 $priceIndexer->invalidate();

app/code/Magento/Customer/Model/ResourceModel/GroupExcludedWebsiteRepository.php

@@ -11,7 +11,6 @@
 use Magento\Customer\Api\GroupExcludedWebsiteRepositoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Model\ResourceModel\AbstractResource;
 
 /**
  * Customer group website repository for CRUD operations with excluded websites.
@@ -35,15 +34,17 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function save(GroupExcludedWebsiteInterface $groupExcludedWebsite): AbstractResource
+    public function save(GroupExcludedWebsiteInterface $groupExcludedWebsite): GroupExcludedWebsiteInterface
     {
         try {
-            return $this->groupExcludedWebsiteResourceModel->save($groupExcludedWebsite);
+            $this->groupExcludedWebsiteResourceModel->save($groupExcludedWebsite);
         } catch (\Exception $e) {
             throw new CouldNotSaveException(
                 __('Could not save customer group website to exclude from customer group: "%1"', $e->getMessage())
             );
         }
+
+        return $groupExcludedWebsite;
     }
 
     /**
@@ -89,24 +90,26 @@ public function getAllExcludedWebsites(): array
     /**
      * @inheritdoc
      */
-    public function delete(int $customerGroupId): AbstractResource
+    public function delete(int $customerGroupId): bool
     {
         try {
-            return $this->groupExcludedWebsiteResourceModel->delete($customerGroupId);
+            $this->groupExcludedWebsiteResourceModel->delete($customerGroupId);
         } catch (LocalizedException $e) {
             throw new LocalizedException(
                 __('Could not delete customer group with its excluded websites.')
             );
         }
+
+        return true;
     }
 
     /**
      * @inheritdoc
      */
-    public function deleteByWebsite(int $websiteId): int
+    public function deleteByWebsite(int $websiteId): bool
     {
         try {
-            return $this->groupExcludedWebsiteResourceModel->deleteByWebsite($websiteId);
+            return (bool)$this->groupExcludedWebsiteResourceModel->deleteByWebsite($websiteId);
         } catch (LocalizedException $e) {
             throw new LocalizedException(
                 __('Could not delete customer group excluded website by id.')

app/code/Magento/Customer/etc/db_schema.xml

@@ -546,8 +546,9 @@
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
         </constraint>
-        <index referenceId="CUSTOMER_GROUP_EXCLUDED_WEBSITE_CUSTOMER_GROUP_ID" indexType="btree">
+        <index referenceId="CUSTOMER_GROUP_EXCLUDED_WEBSITE_CUSTOMER_GROUP_ID_WEBSITE_ID" indexType="btree">
             <column name="customer_group_id"/>
+            <column name="website_id"/>
         </index>
     </table>
 </schema>

app/code/Magento/Customer/etc/db_schema_whitelist.json

@@ -357,7 +357,8 @@
             "website_id": true
         },
         "index": {
-            "CUSTOMER_GROUP_EXCLUDED_WEBSITE_CUSTOMER_GROUP_ID": true
+            "CUSTOMER_GROUP_EXCLUDED_WEBSITE_CUSTOMER_GROUP_ID": true,
+            "CUSTOMER_GROUP_EXCLUDED_WEBSITE_CUSTOMER_GROUP_ID_WEBSITE_ID": true
         },
         "constraint": {
             "PRIMARY": true