Skip to content

Commit f19a569

Browse files
RuslanKostiv1RuslanKostiv1
authored
Merge pull request #12 from RuslanKostiv1/SFAPP-154-web-api-tests-fail
Sfapp 154 web api tests fail
2 parents 47a365a + e5c83d7 commit f19a569

File tree

6 files changed

+40
-57
lines changed

6 files changed

+40
-57
lines changed

Diff for: ‎app/code/Magento/CatalogDataExporter/composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"magento/module-data-exporter": "*",
2828
"magento/module-customer": "*",
2929
"magento/module-downloadable": "*",
30-
"magento/module-indexer": "*"
30+
"magento/module-indexer": "*",
31+
"magento/module-catalog-export": "*"
3132
}
3233
}

Diff for: ‎app/code/Magento/CatalogDataExporter/etc/di.xml

+24-10
Original file line numberDiff line numberDiff line change
@@ -267,15 +267,22 @@
267267
</argument>
268268
</arguments>
269269
</virtualType>
270-
<virtualType name="Magento\CatalogDataExporter\Model\Indexer\ProductIndexerCallbackInterface"
271-
type="Magento\DataExporter\Model\Indexer\FeedIndexerCallbackInterface"/>
272-
<preference for="Magento\CatalogDataExporter\Model\Indexer\ProductIndexerCallbackInterface"
273-
type="Magento\DataExporter\Model\Indexer\EmptyIndexerCallback"/>
270+
271+
<virtualType name="Magento\CatalogExport\Model\Indexer\ProductIndexerCallback"
272+
type="Magento\CatalogExport\Model\Indexer\EntityIndexerCallback">
273+
<arguments>
274+
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\ProductFeedIndexMetadata</argument>
275+
<argument name="topicName" xsi:type="string">catalog.export.product.data</argument>
276+
<argument name="updatedEventType" xsi:type="string">products_updated</argument>
277+
<argument name="deletedEventType" xsi:type="string">products_deleted</argument>
278+
</arguments>
279+
</virtualType>
280+
274281
<virtualType name="Magento\CatalogDataExporter\Model\Indexer\ProductFeedIndexer" type="Magento\DataExporter\Model\Indexer\FeedIndexer">
275282
<arguments>
276283
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\ProductFeedIndexMetadata</argument>
277284
<argument name="serializer" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\ProductDataSerializer</argument>
278-
<argument name="feedIndexerCallback" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\ProductIndexerCallbackInterface</argument>
285+
<argument name="feedIndexerCallback" xsi:type="object">Magento\CatalogExport\Model\Indexer\ProductIndexerCallback</argument>
279286
<argument name="callbackSkipAttributes" xsi:type="array">
280287
<item name="store_view_code" xsi:type="string">storeViewCode</item>
281288
<item name="store_code" xsi:type="string">storeCode</item>
@@ -412,15 +419,22 @@
412419
</argument>
413420
</arguments>
414421
</virtualType>
415-
<virtualType name="Magento\CatalogDataExporter\Model\Indexer\CategoryIndexerCallbackInterface"
416-
type="Magento\DataExporter\Model\Indexer\FeedIndexerCallbackInterface"/>
417-
<preference for="Magento\CatalogDataExporter\Model\Indexer\CategoryIndexerCallbackInterface"
418-
type="Magento\DataExporter\Model\Indexer\EmptyIndexerCallback" />
422+
423+
<virtualType name="Magento\CatalogExport\Model\Indexer\CategoryIndexerCallback"
424+
type="Magento\CatalogExport\Model\Indexer\EntityIndexerCallback">
425+
<arguments>
426+
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\CategoryFeedIndexMetadata</argument>
427+
<argument name="topicName" xsi:type="string">catalog.export.category.data</argument>
428+
<argument name="updatedEventType" xsi:type="string">categories_updated</argument>
429+
<argument name="deletedEventType" xsi:type="string">categories_deleted</argument>
430+
</arguments>
431+
</virtualType>
432+
419433
<virtualType name="Magento\CatalogDataExporter\Model\Indexer\CategoryFeedIndexer" type="Magento\DataExporter\Model\Indexer\FeedIndexer">
420434
<arguments>
421435
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\CategoryFeedIndexMetadata</argument>
422436
<argument name="serializer" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\CategoryDataSerializer</argument>
423-
<argument name="feedIndexerCallback" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\CategoryIndexerCallbackInterface</argument>
437+
<argument name="feedIndexerCallback" xsi:type="object">Magento\CatalogExport\Model\Indexer\CategoryIndexerCallback</argument>
424438
<argument name="callbackSkipAttributes" xsi:type="array">
425439
<item name="store_view_code" xsi:type="string">storeViewCode</item>
426440
<item name="category_id" xsi:type="string">categoryId</item>

Diff for: ‎app/code/Magento/CatalogExport/etc/di.xml

+1-33
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,6 @@
99
<preference for="Magento\CatalogExportApi\Api\ProductRepositoryInterface" type="Magento\CatalogExport\Model\ProductRepository"/>
1010
<preference for="Magento\CatalogExportApi\Api\CategoryRepositoryInterface" type="Magento\CatalogExport\Model\CategoryRepository"/>
1111
<preference for="Magento\CatalogExportApi\Api\ProductVariantRepositoryInterface" type="Magento\CatalogExport\Model\ProductVariantRepository"/>
12-
<preference for="Magento\CatalogDataExporter\Model\Indexer\ProductIndexerCallbackInterface" type="Magento\CatalogExport\Model\Indexer\ProductIndexerCallback" />
13-
<preference for="Magento\CatalogDataExporter\Model\Indexer\CategoryIndexerCallbackInterface" type="Magento\CatalogExport\Model\Indexer\CategoryIndexerCallback" />
14-
<preference for="Magento\ProductVariantDataExporter\Model\Indexer\ProductVariantIndexerCallbackInterface" type="Magento\CatalogExport\Model\Indexer\ProductVariantIndexerCallback"/>
15-
16-
<virtualType name="Magento\CatalogExport\Model\Indexer\CategoryIndexerCallback"
17-
type="Magento\CatalogExport\Model\Indexer\EntityIndexerCallback">
18-
<arguments>
19-
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\CategoryFeedIndexMetadata</argument>
20-
<argument name="topicName" xsi:type="string">catalog.export.category.data</argument>
21-
<argument name="updatedEventType" xsi:type="string">categories_updated</argument>
22-
<argument name="deletedEventType" xsi:type="string">categories_deleted</argument>
23-
</arguments>
24-
</virtualType>
25-
26-
<virtualType name="Magento\CatalogExport\Model\Indexer\ProductIndexerCallback"
27-
type="Magento\CatalogExport\Model\Indexer\EntityIndexerCallback">
28-
<arguments>
29-
<argument name="feedIndexMetadata" xsi:type="object">Magento\CatalogDataExporter\Model\Indexer\ProductFeedIndexMetadata</argument>
30-
<argument name="topicName" xsi:type="string">catalog.export.product.data</argument>
31-
<argument name="updatedEventType" xsi:type="string">products_updated</argument>
32-
<argument name="deletedEventType" xsi:type="string">products_deleted</argument>
33-
</arguments>
34-
</virtualType>
35-
36-
<virtualType name="Magento\CatalogExport\Model\Indexer\ProductVariantIndexerCallback"
37-
type="Magento\CatalogExport\Model\Indexer\EntityIndexerCallback">
38-
<arguments>
39-
<argument name="feedIndexMetadata" xsi:type="object">Magento\ProductVariantDataExporter\Model\Indexer\ProductVariantFeedIndexMetadata</argument>
40-
<argument name="topicName" xsi:type="string">catalog.export.product.variants.data</argument>
41-
<argument name="updatedEventType" xsi:type="string">product_variants_updated</argument>
42-
<argument name="deletedEventType" xsi:type="string">product_variants_deleted</argument>
43-
</arguments>
44-
</virtualType>
4512

4613
<type name="Magento\Framework\Console\CommandListInterface">
4714
<arguments>
@@ -52,4 +19,5 @@
5219
</argument>
5320
</arguments>
5421
</type>
22+
5523
</config>

Diff for: ‎app/code/Magento/CatalogExport/etc/module.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,5 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
9-
<module name="Magento_CatalogExport">
10-
<sequence>
11-
<module name="Magento_CatalogDataExporter"/>
12-
<module name="Magento_ProductVariantDataExporter"/>
13-
</sequence>
14-
</module>
9+
<module name="Magento_CatalogExport" />
1510
</config>

Diff for: ‎app/code/Magento/ProductVariantDataExporter/composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"guzzlehttp/guzzle": "*",
2323
"guzzlehttp/psr7": "~1.0",
2424
"magento/framework": "*",
25-
"magento/module-data-exporter": "*"
25+
"magento/module-data-exporter": "*",
26+
"magento/module-catalog-export": "*"
2627
}
2728
}

Diff for: ‎app/code/Magento/ProductVariantDataExporter/etc/di.xml

+10-6
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,21 @@
3131
</arguments>
3232
</virtualType>
3333

34-
<virtualType name="Magento\ProductVariantDataExporter\Model\Indexer\ProductVariantIndexerCallbackInterface"
35-
type="Magento\DataExporter\Model\Indexer\FeedIndexerCallbackInterface"/>
36-
37-
<preference for="Magento\ProductVariantDataExporter\Model\Indexer\ProductVariantIndexerCallbackInterface"
38-
type="Magento\DataExporter\Model\Indexer\EmptyIndexerCallback"/>
34+
<virtualType name="Magento\CatalogExport\Model\Indexer\ProductVariantIndexerCallback"
35+
type="Magento\CatalogExport\Model\Indexer\EntityIndexerCallback">
36+
<arguments>
37+
<argument name="feedIndexMetadata" xsi:type="object">Magento\ProductVariantDataExporter\Model\Indexer\ProductVariantFeedIndexMetadata</argument>
38+
<argument name="topicName" xsi:type="string">catalog.export.product.variants.data</argument>
39+
<argument name="updatedEventType" xsi:type="string">product_variants_updated</argument>
40+
<argument name="deletedEventType" xsi:type="string">product_variants_deleted</argument>
41+
</arguments>
42+
</virtualType>
3943

4044
<type name="Magento\ProductVariantDataExporter\Model\Indexer\ProductVariantFeedIndexer">
4145
<arguments>
4246
<argument name="feedIndexMetadata" xsi:type="object">Magento\ProductVariantDataExporter\Model\Indexer\ProductVariantFeedIndexMetadata</argument>
4347
<argument name="serializer" xsi:type="object">Magento\ProductVariantDataExporter\Model\Indexer\ProductVariantDataSerializer</argument>
44-
<argument name="feedIndexerCallback" xsi:type="object">Magento\ProductVariantDataExporter\Model\Indexer\ProductVariantIndexerCallbackInterface</argument>
48+
<argument name="feedIndexerCallback" xsi:type="object">Magento\CatalogExport\Model\Indexer\ProductVariantIndexerCallback</argument>
4549
</arguments>
4650
</type>
4751

0 commit comments

Comments
 (0)