Skip to content

Commit 2434187

Browse files
mslabkomslabko
authored
Merge pull request #9 from magento-troll/MDEE-40-STORY-is-deleted-and-updated-at
MDEE-57: Handle is_deleted updates, MDEE-55: Prepare get updatedAt query
2 parents 110ae7d + 1fab611 commit 2434187

File tree

6 files changed

+280
-19
lines changed

6 files changed

+280
-19
lines changed

‎InventoryDataExporter/Model/Provider/StockStatus.php

+12
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
namespace Magento\InventoryDataExporter\Model\Provider;
1010

1111
use Magento\Framework\App\ResourceConnection;
12+
use Magento\Framework\Stdlib\DateTime;
1213
use Magento\InventoryDataExporter\Model\Query\InventoryStockQuery;
1314
use Psr\Log\LoggerInterface;
1415

@@ -35,6 +36,11 @@ class StockStatus
3536
*/
3637
private $query;
3738

39+
/**
40+
* @var DateTime
41+
*/
42+
private $dateTime;
43+
3844
/**
3945
* @var LoggerInterface
4046
*/
@@ -43,16 +49,19 @@ class StockStatus
4349
/**
4450
* @param ResourceConnection $resourceConnection
4551
* @param InventoryStockQuery $query
52+
* @param DateTime $dateTime
4653
* @param LoggerInterface $logger
4754
*/
4855
public function __construct(
4956
ResourceConnection $resourceConnection,
5057
InventoryStockQuery $query,
58+
DateTime $dateTime,
5159
LoggerInterface $logger
5260
) {
5361
$this->resourceConnection = $resourceConnection;
5462
$this->query = $query;
5563
$this->logger = $logger;
64+
$this->dateTime = $dateTime;
5665
}
5766

5867
/**
@@ -103,6 +112,9 @@ private function fillWithDefaultValues(array $row): array
103112
throw new \RuntimeException("missed required field: " . \var_export($row, true));
104113
}
105114
$row['id'] = StockStatusIdBuilder::build($row);
115+
116+
// set updated at
117+
$row['updatedAt'] = $this->dateTime->formatDate(time());
106118
// set default values
107119
$row['infiniteStock'] = false;
108120
$row['qtyForSale'] = $row['qty'];

‎InventoryDataExporter/Model/Query/StockStatusDeleteQuery.php

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\InventoryDataExporter\Model\Query;
9+
10+
use Magento\DataExporter\Model\Indexer\FeedIndexMetadata;
11+
use Magento\Framework\App\ResourceConnection;
12+
13+
/**
14+
* Stock Status mark as deleted query builder
15+
*/
16+
class StockStatusDeleteQuery
17+
{
18+
/**
19+
* @var ResourceConnection
20+
*/
21+
private $resourceConnection;
22+
23+
/**
24+
* @var FeedIndexMetadata
25+
*/
26+
private $metadata;
27+
28+
/**
29+
* @param ResourceConnection $resourceConnection
30+
* @param FeedIndexMetadata $metadata
31+
*/
32+
public function __construct(
33+
ResourceConnection $resourceConnection,
34+
FeedIndexMetadata $metadata
35+
) {
36+
$this->resourceConnection = $resourceConnection;
37+
$this->metadata = $metadata;
38+
}
39+
40+
/**
41+
* Get stocks which are assigned to the list of provided SKUs
42+
*
43+
* @param array $skus
44+
* @return array
45+
*/
46+
public function getStocksAssignedToSkus(array $skus): array
47+
{
48+
$connection = $this->resourceConnection->getConnection();
49+
$select = $connection->select()
50+
->from(
51+
['source_item' => $this->resourceConnection->getTableName('inventory_source_item')],
52+
['source_item.sku', 'source_stock_link.stock_id']
53+
)->joinLeft(
54+
['source_stock_link' => $this->resourceConnection->getTableName('inventory_source_stock_link')],
55+
'source_item.source_code = source_stock_link.source_code'
56+
)->where('source_item.sku IN (?)', $skus);
57+
58+
$fetchedSourceItems = [];
59+
foreach ($connection->fetchAll($select) as $sourceItem) {
60+
$fetchedSourceItems[$sourceItem['sku']][$sourceItem['stock_id']][] = $sourceItem['source_code'];
61+
}
62+
63+
return $fetchedSourceItems;
64+
}
65+
66+
/**
67+
* Mark stock statuses as deleted
68+
*
69+
* @param array $stocksToDelete
70+
*/
71+
public function markStockStatusesAsDeleted(array $stocksToDelete): void
72+
{
73+
$connection = $this->resourceConnection->getConnection();
74+
$feedTableName = $this->resourceConnection->getTableName($this->metadata->getFeedTableName());
75+
foreach ($stocksToDelete as $stockId => $skus) {
76+
$connection->update(
77+
$feedTableName,
78+
['is_deleted' => new \Zend_Db_Expr('1')],
79+
[
80+
'sku IN (?)' => $skus,
81+
'stock_id = ?' => $stockId
82+
]
83+
);
84+
}
85+
}
86+
}

‎InventoryDataExporter/Plugin/BulkSourceUnassign.php

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\InventoryDataExporter\Plugin;
7+
8+
use Magento\InventoryDataExporter\Model\Query\StockStatusDeleteQuery;
9+
10+
/**
11+
* Mark stock statuses as deleted on bulk unassign
12+
*/
13+
class BulkSourceUnassign
14+
{
15+
/**
16+
* @var StockStatusDeleteQuery
17+
*/
18+
private $stockStatusDeleteQuery;
19+
20+
/**
21+
* @param StockStatusDeleteQuery $stockStatusDeleteQuery
22+
*/
23+
public function __construct(
24+
StockStatusDeleteQuery $stockStatusDeleteQuery
25+
) {
26+
$this->stockStatusDeleteQuery = $stockStatusDeleteQuery;
27+
}
28+
29+
/**
30+
* Check which stocks will be unassigned from products and mark them as deleted in feed table
31+
*
32+
* @param \Magento\InventoryCatalog\Model\ResourceModel\BulkSourceUnassign $subject
33+
* @param array $skus
34+
* @param array $sourceCodes
35+
* @return void
36+
*
37+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
38+
*/
39+
public function beforeExecute(
40+
\Magento\InventoryCatalog\Model\ResourceModel\BulkSourceUnassign $subject,
41+
array $skus,
42+
array $sourceCodes
43+
): void {
44+
$fetchedSourceItems = $this->stockStatusDeleteQuery->getStocksAssignedToSkus($skus);
45+
$stocksToDelete = $this->getStocksToDelete($skus, $sourceCodes, $fetchedSourceItems);
46+
47+
if (!empty($stocksToDelete)) {
48+
$this->stockStatusDeleteQuery->markStockStatusesAsDeleted($stocksToDelete);
49+
}
50+
}
51+
52+
/**
53+
* @param array $affectedSkus
54+
* @param array $deletedSources
55+
* @return array
56+
*/
57+
private function getStocksToDelete(array $affectedSkus, array $deletedSources, $fetchedSourceItems): array
58+
{
59+
$stocksToDelete = [];
60+
foreach ($affectedSkus as $deletedItemSku) {
61+
foreach ($fetchedSourceItems[$deletedItemSku] as $fetchedItemStockId => $fetchedItemSources) {
62+
if ($this->getContainsAllKeys($fetchedItemSources, $deletedSources)) {
63+
$stocksToDelete[(string)$fetchedItemStockId][] = $deletedItemSku;
64+
}
65+
}
66+
}
67+
68+
return $stocksToDelete;
69+
}
70+
71+
/**
72+
* @param array $fetchedSources
73+
* @param array $deletedSources
74+
* @return bool
75+
*/
76+
private function getContainsAllKeys(array $fetchedSources, array $deletedSources): bool
77+
{
78+
return empty(\array_diff($fetchedSources, $deletedSources));
79+
}
80+
}

‎InventoryDataExporter/Plugin/MarkItemsAsDeleted.php

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\InventoryDataExporter\Plugin;
7+
8+
use Magento\Inventory\Model\ResourceModel\SourceItem\DeleteMultiple;
9+
use Magento\InventoryApi\Api\Data\SourceItemInterface;
10+
use Magento\InventoryDataExporter\Model\Query\StockStatusDeleteQuery;
11+
12+
/**
13+
* Plugin for setting stock item statuses as deleted
14+
*/
15+
class MarkItemsAsDeleted
16+
{
17+
/**
18+
* @var StockStatusDeleteQuery
19+
*/
20+
private $stockStatusDeleteQuery;
21+
22+
/**
23+
* @param StockStatusDeleteQuery $stockStatusDeleteQuery
24+
*/
25+
public function __construct(
26+
StockStatusDeleteQuery $stockStatusDeleteQuery
27+
) {
28+
$this->stockStatusDeleteQuery = $stockStatusDeleteQuery;
29+
}
30+
31+
/**
32+
* Set is_deleted value to 1 for deleted stock statuses
33+
*
34+
* @param DeleteMultiple $subject
35+
* @param SourceItemInterface[] $sourceItems
36+
* @return void
37+
*
38+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
39+
*/
40+
public function beforeExecute(
41+
DeleteMultiple $subject,
42+
array $sourceItems
43+
): void {
44+
$deletedSourceItems = [];
45+
foreach ($sourceItems as $sourceItem) {
46+
$deletedSourceItems[$sourceItem->getSku()][] = $sourceItem->getSourceCode();
47+
}
48+
49+
$fetchedSourceItems = $this->stockStatusDeleteQuery->getStocksAssignedToSkus(array_keys($deletedSourceItems));
50+
51+
$stocksToDelete = $this->getStocksToDelete($deletedSourceItems, $fetchedSourceItems);
52+
if (!empty($stocksToDelete)) {
53+
$this->stockStatusDeleteQuery->markStockStatusesAsDeleted($stocksToDelete);
54+
}
55+
}
56+
57+
/**
58+
* @param array $deletedSourceItems
59+
* @param $fetchedSourceItems
60+
* @return array
61+
*/
62+
private function getStocksToDelete(array $deletedSourceItems, $fetchedSourceItems): array
63+
{
64+
$stocksToDelete = [];
65+
foreach ($deletedSourceItems as $deletedItemSku => $deletedItemSources) {
66+
foreach ($fetchedSourceItems[$deletedItemSku] as $fetchedItemStockId => $fetchedItemSources) {
67+
if ($this->getContainsAllKeys($fetchedItemSources, $deletedItemSources)) {
68+
$stocksToDelete[(string)$fetchedItemStockId][] = $deletedItemSku;
69+
}
70+
}
71+
}
72+
73+
return $stocksToDelete;
74+
}
75+
76+
/**
77+
* @param array $fetchedSources
78+
* @param array $deletedSources
79+
* @return bool
80+
*/
81+
private function getContainsAllKeys(array $fetchedSources, array $deletedSources): bool
82+
{
83+
return empty(\array_diff($fetchedSources, $deletedSources));
84+
}
85+
}

‎InventoryDataExporter/etc/db_schema.xml

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
/>
5252
<constraint xsi:type="primary" referenceId="PRIMARY">
5353
<column name="id"/>
54-
<column name="stock_id"/>
5554
</constraint>
5655
<index referenceId="inventory_data_exporter_stock_status_modified_at" indexType="btree">
5756
<column name="modified_at"/>

‎InventoryDataExporter/etc/di.xml

+17-18
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9-
<type name="Magento\InventoryDataExporter\Model\Query\MainProductQuery">
10-
<arguments>
11-
<argument name="mainTable" xsi:type="string">catalog_product_entity</argument>
12-
</arguments>
13-
</type>
149
<type name="Magento\InventoryDataExporter\Model\Provider\StockStatus">
1510
<arguments>
1611
<argument name="queryName" xsi:type="string">stockStatus</argument>
@@ -26,10 +21,10 @@
2621
<argument name="feedName" xsi:type="string">stock_statuses</argument>
2722
<argument name="feedIdentity" xsi:type="string">sku</argument>
2823
<!-- source table used only during full reindex -->
29-
<argument name="sourceTableName" xsi:type="string">catalog_product_entity</argument>
24+
<argument name="sourceTableName" xsi:type="string">inventory_source_item</argument>
3025
<argument name="sourceTableField" xsi:type="string">sku</argument>
3126
<argument name="feedTableName" xsi:type="string">inventory_data_exporter_stock_status</argument>
32-
<argument name="feedTableField" xsi:type="string">id</argument>
27+
<argument name="feedTableField" xsi:type="string">sku</argument>
3328
<argument name="feedTableMutableColumns" xsi:type="array">
3429
<item name="feed_data" xsi:type="string">feed_data</item>
3530
<item name="is_deleted" xsi:type="string">is_deleted</item>
@@ -45,21 +40,10 @@
4540
</argument>
4641
</arguments>
4742
</virtualType>
48-
<virtualType name="Magento\InventoryDataExporter\Model\Indexer\StockStatusFeedIndexProcessorCreateUpdateDelete" type="Magento\DataExporter\Model\Indexer\FeedIndexProcessorCreateUpdateDelete">
49-
<arguments>
50-
<argument name="markRemovedEntities" xsi:type="object">Magento\InventoryDataExporter\Model\Indexer\StockStatusMarkRemovedEntities</argument>
51-
</arguments>
52-
</virtualType>
53-
<virtualType name="Magento\InventoryDataExporter\Model\Indexer\StockStatusMarkRemovedEntities" type="Magento\DataExporter\Model\Indexer\MarkRemovedEntities">
54-
<arguments>
55-
<argument name="markRemovedEntitiesQuery" xsi:type="object">Magento\InventoryDataExporter\Model\Query\MarkRemovedEntitiesQuery</argument>
56-
</arguments>
57-
</virtualType>
5843
<virtualType name="Magento\InventoryDataExporter\Model\Indexer\StockStatusFeedIndexer" type="Magento\DataExporter\Model\Indexer\FeedIndexer">
5944
<arguments>
6045
<argument name="feedIndexMetadata" xsi:type="object">Magento\InventoryDataExporter\Model\Indexer\StockStatusFeedIndexMetadata</argument>
6146
<argument name="serializer" xsi:type="object">Magento\InventoryDataExporter\Model\Indexer\StockStatusDataSerializer</argument>
62-
<!-- <argument name="entityIdsProvider" xsi:type="object">\Magento\InventoryDataExporter\Indexer\StockStatusIdsProvider</argument>-->
6347
</arguments>
6448
</virtualType>
6549
<virtualType name="Magento\InventoryDataExporter\Model\StockStatusFeed" type="Magento\DataExporter\Model\Feed">
@@ -72,4 +56,19 @@
7256
<plugin name="create_stock_item_changelog_table" type="\Magento\InventoryDataExporter\Plugin\Mview\StockStatusChangelog"/>
7357
</type>
7458

59+
<type name="Magento\Inventory\Model\ResourceModel\SourceItem\DeleteMultiple">
60+
<plugin name="mark-stock-status-items-as-deleted"
61+
type="Magento\InventoryDataExporter\Plugin\MarkItemsAsDeleted"/>
62+
</type>
63+
<type name="Magento\InventoryCatalog\Model\ResourceModel\BulkSourceUnassign">
64+
<plugin name="mark-stock-status-items-unassigned-on-bulk-unassign"
65+
type="Magento\InventoryDataExporter\Plugin\BulkSourceUnassign"/>
66+
</type>
67+
<type name="Magento\InventoryDataExporter\Model\Query\StockStatusDeleteQuery">
68+
<arguments>
69+
<argument name="metadata" xsi:type="object">
70+
Magento\InventoryDataExporter\Model\Indexer\StockStatusFeedIndexMetadata
71+
</argument>
72+
</arguments>
73+
</type>
7574
</config>

0 commit comments

Comments
 (0)