Skip to content

Commit b4a3c44

Browse files
authored
MDEE-207: Rename SalesDataExporter module to SalesOrdersDataExporter (#156)
* MDEE-207: Rename SalesDataExporter module to SalesOrdersDataExporter to eliminate conflicts with the Payments service modules
1 parent 491cbb3 commit b4a3c44

36 files changed

+149
-154
lines changed

SalesDataExporter/Console/Command/Link.php SalesOrdersDataExporter/Console/Command/Link.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\SalesDataExporter\Console\Command;
8+
namespace Magento\SalesOrdersDataExporter\Console\Command;
99

1010
use Magento\DataExporter\Model\Logging\CommerceDataExportLoggerInterface;
1111
use Magento\DataExporter\Uuid\UuidManager;
File renamed without changes.
File renamed without changes.

SalesDataExporter/Model/Indexer/OrderStatusIdsProvider.php SalesOrdersDataExporter/Model/Indexer/OrderStatusIdsProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\SalesDataExporter\Model\Indexer;
8+
namespace Magento\SalesOrdersDataExporter\Model\Indexer;
99

1010
use Magento\Framework\App\ResourceConnection;
1111
use Magento\Framework\DB\Select;

SalesDataExporter/Model/Provider/CreditMemoBaseRowTotal.php SalesOrdersDataExporter/Model/Provider/CreditMemoBaseRowTotal.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
use Magento\Framework\Url\Encoder;
1212
use Magento\Framework\UrlInterface;

SalesDataExporter/Model/Provider/CustomAttribute.php SalesOrdersDataExporter/Model/Provider/CustomAttribute.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
use Magento\Framework\Serialize\Serializer\Json;
1212

SalesDataExporter/Model/Provider/DateConverter.php SalesOrdersDataExporter/Model/Provider/DateConverter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
use Magento\DataExporter\Exception\UnableRetrieveData;
1212
use Magento\DataExporter\Export\Request\Node;

SalesDataExporter/Model/Provider/ExternalOrderId.php SalesOrdersDataExporter/Model/Provider/ExternalOrderId.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
use Magento\DataExporter\Export\Request\Node;
1212

SalesDataExporter/Model/Provider/Items/OrderItemAdjustment.php SalesOrdersDataExporter/Model/Provider/Items/OrderItemAdjustment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider\Items;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider\Items;
1010

1111
use Magento\Framework\Serialize\Serializer\Json;
1212

SalesDataExporter/Model/Provider/Orders.php SalesOrdersDataExporter/Model/Provider/Orders.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
use Magento\DataExporter\Export\Request\Info;
1212
use Magento\DataExporter\Export\Request\Node;

SalesDataExporter/Model/Provider/Payment.php SalesOrdersDataExporter/Model/Provider/Payment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
use Magento\Framework\Serialize\Serializer\Json;
1212

SalesDataExporter/Model/Provider/Shipping.php SalesOrdersDataExporter/Model/Provider/Shipping.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
/**
1212
* Class for getting shipping information

SalesDataExporter/Model/Provider/State.php SalesOrdersDataExporter/Model/Provider/State.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
use Magento\Sales\Model\Order;
1212

SalesDataExporter/Model/Provider/TrackingUrl.php SalesOrdersDataExporter/Model/Provider/TrackingUrl.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
use Magento\Framework\Url\Encoder;
1212
use Magento\Framework\UrlInterface;

SalesDataExporter/Model/Provider/Uuid.php SalesOrdersDataExporter/Model/Provider/Uuid.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Model\Provider;
9+
namespace Magento\SalesOrdersDataExporter\Model\Provider;
1010

1111
use Magento\DataExporter\Model\Logging\CommerceDataExportLoggerInterface;
1212
use Magento\DataExporter\Uuid\UuidManager;

SalesDataExporter/Observer/ReindexOrderFeed.php SalesOrdersDataExporter/Observer/ReindexOrderFeed.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Observer;
9+
namespace Magento\SalesOrdersDataExporter\Observer;
1010

1111
use Magento\Framework\Event\Observer;
1212
use Magento\Framework\Event\ObserverInterface;
@@ -20,7 +20,7 @@ class ReindexOrderFeed implements ObserverInterface
2020
/**
2121
* Review feed indexer id
2222
*/
23-
public const ORDER_FEED_INDEXER = 'sales_order_data_exporter';
23+
public const ORDER_FEED_INDEXER = 'sales_order_data_exporter_v2';
2424

2525
/**
2626
* @var IndexerRegistry

SalesDataExporter/Observer/ReindexOrderFeedOnVoid.php SalesOrdersDataExporter/Observer/ReindexOrderFeedOnVoid.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Observer;
9+
namespace Magento\SalesOrdersDataExporter\Observer;
1010

1111
use Magento\Framework\Event\Observer;
1212
use Magento\Framework\Event\ObserverInterface;
@@ -20,7 +20,7 @@ class ReindexOrderFeedOnVoid implements ObserverInterface
2020
/**
2121
* Sales order feed indexer id
2222
*/
23-
public const ORDER_FEED_INDEXER = 'sales_order_data_exporter';
23+
public const ORDER_FEED_INDEXER = 'sales_order_data_exporter_v2';
2424

2525
/**
2626
* @var IndexerRegistry

SalesDataExporter/Plugin/AssignUuidForCreditMemo.php SalesOrdersDataExporter/Plugin/AssignUuidForCreditMemo.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
declare(strict_types=1);
8-
namespace Magento\SalesDataExporter\Plugin;
8+
namespace Magento\SalesOrdersDataExporter\Plugin;
99

1010
use Magento\DataExporter\Model\Logging\CommerceDataExportLoggerInterface;
1111
use Magento\DataExporter\Uuid\UuidSaveException;

SalesDataExporter/Plugin/AssignUuidForOrder.php SalesOrdersDataExporter/Plugin/AssignUuidForOrder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
declare(strict_types=1);
8-
namespace Magento\SalesDataExporter\Plugin;
8+
namespace Magento\SalesOrdersDataExporter\Plugin;
99

1010
use Magento\DataExporter\Model\Logging\CommerceDataExportLoggerInterface;
1111
use Magento\DataExporter\Uuid\UuidSaveException;

SalesDataExporter/Plugin/AssignUuidForShipment.php SalesOrdersDataExporter/Plugin/AssignUuidForShipment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
declare(strict_types=1);
8-
namespace Magento\SalesDataExporter\Plugin;
8+
namespace Magento\SalesOrdersDataExporter\Plugin;
99

1010
use Magento\DataExporter\Model\Logging\CommerceDataExportLoggerInterface;
1111
use Magento\DataExporter\Uuid\UuidSaveException;

SalesDataExporter/README.md SalesOrdersDataExporter/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Overview
2-
SalesDataExporter module allows to collect Orders entities and sales related entities (order items, shipments, invoices, credit memos, payment transactions) for further export to external services.
2+
SalesOrdersDataExporter module allows to collect Orders entities and sales related entities (order items, shipments, invoices, credit memos, payment transactions) for further export to external services.
33
Sales Orders Export works properly only with “Updated On Schedule” indexer mode.
44
### Entities UUID
5-
Each exported item should have it's own UUID, so only items with UUID assigned will be able to be exported. For example if customer has some orders and then installs SalesDataExporter module - only orders which would be created after installation will be exported.
5+
Each exported item should have it's own UUID, so only items with UUID assigned will be able to be exported. For example if customer has some orders and then installs SalesOrdersDataExporter module - only orders which would be created after installation will be exported.
66
There is also ability to assign UUIDs to already assigned orders and order entities: "commerce-data-export:orders:link" command:
77

88
```shell
@@ -32,5 +32,5 @@ Current time will be used by default
3232
### Reindexing
3333
To export full orders data simply run reindex command:
3434
```shell
35-
bin/magento indexer:reindex sales_order_data_exporter
35+
bin/magento indexer:reindex sales_order_data_exporter_v2
3636
```

SalesDataExporter/Tests/Integration/AbstractOrderFeedTest.php SalesOrdersDataExporter/Tests/Integration/AbstractOrderFeedTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
declare(strict_types=1);
88

9-
namespace Magento\SalesDataExporter\Tests\Integration;
9+
namespace Magento\SalesOrdersDataExporter\Tests\Integration;
1010

1111
use Magento\Catalog\Api\ProductRepositoryInterface;
1212
use Magento\DataExporter\Model\FeedInterface;
@@ -34,7 +34,7 @@ abstract class AbstractOrderFeedTest extends TestCase
3434
/**
3535
* Order feed indexer
3636
*/
37-
private const ORDER_FEED_INDEXER = 'sales_order_data_exporter';
37+
private const ORDER_FEED_INDEXER = 'sales_order_data_exporter_v2';
3838

3939
/**
4040
* @var ResourceConnection
@@ -98,7 +98,7 @@ protected function setUp() : void
9898
$this->jsonSerializer = Bootstrap::getObjectManager()->create(Json::class);
9999
$this->orderRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
100100
$this->storeManager = Bootstrap::getObjectManager()->create(StoreManagerInterface::class);
101-
$this->ordersFeed = Bootstrap::getObjectManager()->get(FeedPool::class)->getFeed('salesOrders');
101+
$this->ordersFeed = Bootstrap::getObjectManager()->get(FeedPool::class)->getFeed('salesOrdersV2');
102102
$this->attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepository::class);
103103
$this->arrayUtils = $objectManager->create(ArrayUtils::class);
104104
$this->registry = Bootstrap::getObjectManager()->get(Registry::class);

SalesDataExporter/Tests/Integration/CreateOrderTest.php SalesOrdersDataExporter/Tests/Integration/CreateOrderTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\SalesDataExporter\Tests\Integration;
8+
namespace Magento\SalesOrdersDataExporter\Tests\Integration;
99

1010
use Magento\Sales\Api\Data\OrderInterface;
1111
use Magento\Sales\Api\Data\OrderInterfaceFactory;
@@ -87,7 +87,7 @@ public function testOrderWithTwoProductsInformation(string $orderNumber, array $
8787
* @param string[] $dataToVerify
8888
*
8989
* @dataProvider orderFullWorkflowDataProvider
90-
* @magentoDataFixture Magento/SalesDataExporter/_files/order_full_work_flow.php
90+
* @magentoDataFixture Magento/SalesOrdersDataExporter/_files/order_full_work_flow.php
9191
*
9292
* @return void
9393
* @throws \Zend_Db_Statement_Exception
@@ -153,7 +153,7 @@ public function testOrderWithInvoiceAndCustomStatus(string $orderNumber, array $
153153
* @param string[] $dataToVerify
154154
*
155155
* @dataProvider orderWithCreditMemoDataProvider
156-
* @magentoDataFixture Magento/SalesDataExporter/_files/order_with_invoice_shipment_creditmemo.php
156+
* @magentoDataFixture Magento/SalesOrdersDataExporter/_files/order_with_invoice_shipment_creditmemo.php
157157
*
158158
* @return void
159159
* @throws \Zend_Db_Statement_Exception
@@ -175,7 +175,7 @@ public function testOrderWithCreditMemo(string $orderNumber, array $dataToVerify
175175
* @param string[] $dataToVerify
176176
*
177177
* @dataProvider orderWithConfigurableProductDataProvider
178-
* @magentoDataFixture Magento/SalesDataExporter/_files/order_configurable_product.php
178+
* @magentoDataFixture Magento/SalesOrdersDataExporter/_files/order_configurable_product.php
179179
*
180180
* @return void
181181
* @throws \Zend_Db_Statement_Exception
@@ -197,7 +197,7 @@ public function testOrderWithConfigurableProduct(string $orderNumber, array $dat
197197
* @param string[] $dataToVerify
198198
*
199199
* @dataProvider orderWithTransactionsDataProvider
200-
* @magentoDataFixture Magento/SalesDataExporter/_files/transactions_detailed.php
200+
* @magentoDataFixture Magento/SalesOrdersDataExporter/_files/transactions_detailed.php
201201
*
202202
* @return void
203203
* @throws \Zend_Db_Statement_Exception
@@ -219,7 +219,7 @@ public function testOrderWithTransactions(string $orderNumber, array $dataToVeri
219219
* @param string[] $dataToVerify
220220
*
221221
* @dataProvider orderWithAdditionalInformationDataProvider
222-
* @magentoDataFixture Magento/SalesDataExporter/_files/order_with_additional_information.php
222+
* @magentoDataFixture Magento/SalesOrdersDataExporter/_files/order_with_additional_information.php
223223
*
224224
* @return void
225225
* @throws \Zend_Db_Statement_Exception

SalesDataExporter/composer.json SalesOrdersDataExporter/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "magento/module-sales-data-exporter",
2+
"name": "magento/module-sales-orders-data-exporter",
33
"description": "Sales data exporter",
44
"config": {
55
"sort-packages": true
@@ -14,7 +14,7 @@
1414
"registration.php"
1515
],
1616
"psr-4": {
17-
"Magento\\SalesDataExporter\\": ""
17+
"Magento\\SalesOrdersDataExporter\\": ""
1818
}
1919
},
2020
"require": {

SalesDataExporter/etc/db_schema.xml SalesOrdersDataExporter/etc/db_schema.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
10-
<table name="sales_data_exporter_orders" resource="default" engine="innodb" comment="Sales Orders Feed Storage">
10+
<table name="sales_data_exporter_orders_v2" resource="default" engine="innodb" comment="Sales Orders Feed Storage">
1111
<column xsi:type="int"
1212
name="id"
1313
padding="10"

SalesDataExporter/etc/db_schema_whitelist.json SalesOrdersDataExporter/etc/db_schema_whitelist.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"sales_data_exporter_orders": {
2+
"sales_data_exporter_orders_v2": {
33
"index": {
4-
"SALES_DATA_EXPORTER_ORDERS_MODIFIED_AT": true
4+
"SALES_DATA_EXPORTER_ORDERS_V2_MODIFIED_AT": true
55
},
66
"constraint": {
77
"PRIMARY": true

0 commit comments

Comments
 (0)