MDEE-968: [PoC] Deliver MDEE relate changes from PoC to main branches (#474)

* MDEE-968: [PoC] Deliver MDEE relate changes from PoC to main branches

Author: duhon

CatalogDataExporter/Test/Integration/ProductDataSerializerTest.php

@@ -88,6 +88,7 @@ public function testSecondFeedItemHasErrorInExportStatus(): void
                 ],
                 'feed_hash' => 'hash',
                 'feed_id' => 'feed_id_1',
+                "source_entity_id" => 1,
                 'operation' => IndexStateProvider::INSERT_OPERATION
             ],
             [
@@ -102,6 +103,7 @@ public function testSecondFeedItemHasErrorInExportStatus(): void
                 ],
                 'feed_hash' => 'hash',
                 'feed_id' => 'feed_id_2',
+                "source_entity_id" => 2,
                 'operation' => IndexStateProvider::INSERT_OPERATION
             ],
             [
@@ -116,6 +118,7 @@ public function testSecondFeedItemHasErrorInExportStatus(): void
                 ],
                 'feed_hash' => 'hash',
                 'feed_id' => 'feed_id_3',
+                "source_entity_id" => 3,
                 'operation' => IndexStateProvider::INSERT_OPERATION
             ],
         ];
@@ -171,6 +174,7 @@ public function testAllItemsHaveErrorsInExportStatus(): void
                 ],
                 'feed_hash' => 'hash',
                 'feed_id' => 'feed_id_1',
+                "source_entity_id" => 1,
                 'operation' => IndexStateProvider::INSERT_OPERATION
             ],
             [
@@ -185,6 +189,7 @@ public function testAllItemsHaveErrorsInExportStatus(): void
                 ],
                 'feed_hash' => 'hash',
                 'feed_id' => 'feed_id_2',
+                "source_entity_id" => 2,
                 'operation' => IndexStateProvider::INSERT_OPERATION
 
             ],
@@ -200,6 +205,7 @@ public function testAllItemsHaveErrorsInExportStatus(): void
                 ],
                 'feed_hash' => 'hash',
                 'feed_id' => 'feed_id_3',
+                "source_entity_id" => 3,
                 'operation' => IndexStateProvider::INSERT_OPERATION
             ],
         ];
@@ -243,19 +249,21 @@ private function prepareExpectedData(
         $status = $exportStatus->getStatus()->getValue();
         foreach ($feedItems as $position => $item) {
             $feed = $item['feed_data'];
+            $finalStatus = $failedSkuPosition === $position ? ExportStatusCodeProvider::FAILED_ITEM_ERROR : $status;
+            $errors = $failedSkuPosition === $position ? $failedStatus['message'] : '';
             $expected[] = [
                 'is_deleted' => $feed['deleted'],
-                'status' => $failedSkuPosition
-                    ? ($failedSkuPosition === $position ? ExportStatusCodeProvider::FAILED_ITEM_ERROR : $status)
-                    : $status,
-                'errors' => $failedSkuPosition
-                    ? ($failedSkuPosition === $position ? $failedStatus['message'] : '')
-                    : $exportStatus->getReasonPhrase(),
+                'status' => $failedSkuPosition ? $finalStatus : $status,
+                'errors' => $failedSkuPosition ? $errors : $exportStatus->getReasonPhrase(),
                 'feed_data' => $this->jsonSerializer->serialize($feed),
                 'feed_hash' => $item['feed_hash'],
                 'feed_id' => $item['feed_id'],
                 'source_entity_id' => $feed['productId']
             ];
+            $currentKey = array_key_last($expected);
+            if (empty($expected[$currentKey]['errors'])) {
+                unset($expected[$currentKey]['errors']);
+            }
         }
         return $expected;
     }

InventoryDataExporter/Test/Integration/ExportStockStatusWithoutFeedProcessingTest.php

@@ -74,7 +74,6 @@ public function testExportStockStatusesWithoutFeedPersisting()
         $actualStockStatuses = $this->getFeedData($productsSkus);
         foreach ($this->getExpectedStockStatusMandatoryFeedsOnly() as $stockId => $stockStatuses) {
             foreach ($stockStatuses as $sku => $stockStatus) {
-                $stockStatus['productId'] = $productIds[$sku] ?? null;
                 if (!isset($actualStockStatuses[$stockId][$sku])) {
                     self::fail("Cannot find stock status for stock $stockId & sku $sku");
                 }
@@ -127,7 +126,6 @@ public function testExportStockStatusesWithoutFeedPersistingProductsDeleted()
         $actualStockStatuses = $this->getFeedData($productsSkus);
         foreach ($this->getExpectedStockStatusMandatoryFeedsOnlyDeletedProducts() as $stockId => $stockStatuses) {
             foreach ($stockStatuses as $sku => $stockStatus) {
-                $stockStatus['productId'] = $productIds[$sku] ?? null;
                 if (!isset($actualStockStatuses[$stockId][$sku])) {
                     self::fail("Cannot find stock status for stock $stockId & sku $sku");
                 }