Merge pull request #4 from magento-fearless-kiwis/develop-1

[FearlessKiwis] MAGETWO-50636

Author: dvoskoboinikov

app/code/Magento/Sales/Model/Order/AddressRepository.php

@@ -91,7 +91,6 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
                 $searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
             }
         }
-
         $searchResult->setCurPage($searchCriteria->getCurrentPage());
         $searchResult->setPageSize($searchCriteria->getPageSize());
 

app/code/Magento/Sales/Model/Order/CreditmemoRepository.php

@@ -99,6 +99,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
                 $searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
             }
         }
+        $searchResult->setSearchCriteria($searchCriteria);
         $searchResult->setCurPage($searchCriteria->getCurrentPage());
         $searchResult->setPageSize($searchCriteria->getPageSize());
         return $searchResult;

app/code/Magento/Sales/Model/Order/InvoiceRepository.php

@@ -95,6 +95,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
                 $collection->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
             }
         }
+        $collection->setSearchCriteria($searchCriteria);
         $collection->setCurPage($searchCriteria->getCurrentPage());
         $collection->setPageSize($searchCriteria->getPageSize());
         return $collection;

app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php

@@ -193,6 +193,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
                 $collection->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
             }
         }
+        $collection->setSearchCriteria($searchCriteria);
         $collection->setCurPage($searchCriteria->getCurrentPage());
         $collection->setPageSize($searchCriteria->getPageSize());
         $collection->addPaymentInformation(['method']);

app/code/Magento/Sales/Model/Order/ShipmentRepository.php

@@ -91,7 +91,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
                 $searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
             }
         }
-
+        $searchResult->setSearchCriteria($searchCriteria);
         $searchResult->setCurPage($searchCriteria->getCurrentPage());
         $searchResult->setPageSize($searchCriteria->getPageSize());
 

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoListTest.php

@@ -62,7 +62,8 @@ public function testCreditmemoList()
             [
                 $filterBuilder
                     ->setField('state')
-                    ->setValue(\Magento\Sales\Model\Order\Creditmemo::STATE_OPEN)
+                    ->setValue((string)\Magento\Sales\Model\Order\Creditmemo::STATE_OPEN)
+                    ->setConditionType('eq')
                     ->create(),
             ]
         );
@@ -85,5 +86,7 @@ public function testCreditmemoList()
         // TODO Test fails, due to the inability of the framework API to handle data collection
         $this->assertArrayHasKey('items', $result);
         $this->assertCount(1, $result['items']);
+        $this->assertArrayHasKey('search_criteria', $result);
+        $this->assertEquals($searchData, $result['search_criteria']);
     }
 }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceListTest.php

@@ -47,7 +47,8 @@ public function testInvoiceList()
             [
                 $filterBuilder
                     ->setField('state')
-                    ->setValue(2)
+                    ->setValue((string)\Magento\Sales\Model\Order\Invoice::STATE_PAID)
+                    ->setConditionType('eq')
                     ->create(),
             ]
         );
@@ -70,5 +71,7 @@ public function testInvoiceList()
         // TODO Test fails, due to the inability of the framework API to handle data collection
         $this->assertArrayHasKey('items', $result);
         $this->assertCount(1, $result['items']);
+        $this->assertArrayHasKey('search_criteria', $result);
+        $this->assertEquals($searchData, $result['search_criteria']);
     }
 }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php

@@ -43,7 +43,15 @@ public function testShipmentList()
             'Magento\Framework\Api\FilterBuilder'
         );
 
-        $searchCriteriaBuilder->addFilters([$filterBuilder->setField('shipment_status')->setValue(1)->create()]);
+        $searchCriteriaBuilder->addFilters(
+            [
+                $filterBuilder
+                    ->setField('shipment_status')
+                    ->setValue((string)\Magento\Sales\Model\Order\Shipment::STATUS_NEW)
+                    ->setConditionType('eq')
+                    ->create()
+            ]
+        );
         $searchData = $searchCriteriaBuilder->create()->__toArray();
 
         $requestData = ['searchCriteria' => $searchData];
@@ -63,5 +71,7 @@ public function testShipmentList()
         // TODO Test fails, due to the inability of the framework API to handle data collection
         $this->assertArrayHasKey('items', $result);
         $this->assertCount(1, $result['items']);
+        $this->assertArrayHasKey('search_criteria', $result);
+        $this->assertEquals($searchData, $result['search_criteria']);
     }
 }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/TransactionTest.php

@@ -141,6 +141,8 @@ public function testTransactionList($filters)
         $expectedData = [$transactionData, $childTransactionData];
 
         $this->assertEquals($expectedData, $result['items']);
+        $this->assertArrayHasKey('search_criteria', $result);
+        $this->assertEquals($searchData, $result['search_criteria']);
     }
 
     /**