Fix missing increment id

Author: schmengler

phpunit.xml.dist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="test/bootstrap.php"
+        >
+    <testsuites>
+        <testsuite name="Unit">
+            <directory>./test/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./src/</directory>
+            <exclude>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>

src/app/code/community/IntegerNet/Anonymizer/Model/Bridge/Entity/Abstract.php

@@ -30,7 +30,7 @@ abstract class IntegerNet_Anonymizer_Model_Bridge_Entity_Abstract
      */
     protected $_formattersByAttribute = array();
     /**
-     * @var string[]
+     * @var string[] Specifies attributes that will be loaded
      */
     protected $_attributesUsedForIdentifier = array();
     /**
@@ -153,8 +153,10 @@ public function getCollectionIterator()
     {
         /** @var Varien_Data_Collection_Db $collection */
         $collection = $this->_entity->getCollection();
-        //TODO add columns used by identifier to select
-        $fields = array_unique(array_merge(array_keys($this->_formattersByAttribute), $this->_attributesUsedForIdentifier));
+        $fields = array_unique(array_merge(
+            array_keys($this->_formattersByAttribute),
+            $this->_attributesUsedForIdentifier
+            ));
         if ($collection instanceof Mage_Eav_Model_Entity_Collection_Abstract) {
             $collection->addAttributeToSelect($fields, 'left');
         } elseif ($collection instanceof Mage_Core_Model_Resource_Db_Collection_Abstract) {

src/app/code/community/IntegerNet/Anonymizer/Model/Bridge/Entity/Order.php

@@ -12,7 +12,7 @@ class IntegerNet_Anonymizer_Model_Bridge_Entity_Order extends IntegerNet_Anonymi
     protected $_entityType = 'order';
 
     protected $_attributesUsedForIdentifier = array(
-        'customer_id'
+        'customer_id', 'increment_id'
     );
 
     protected $_formattersByAttribute = array(

src/app/code/community/IntegerNet/Anonymizer/Test/Model/Anonymizer.php

@@ -53,6 +53,7 @@ protected function _testAnonymizeAll()
         $orderGridData = $orderGridCollection->addFieldToFilter('entity_id', 1)->getFirstItem();
         $this->assertEquals('Testname Testname', $orderGridData->getShippingName());
         $this->assertEquals('Testname Testname', $orderGridData->getBillingName());
+        $this->assertEquals('1000000001', $orderGridData->getIncrementId(), 'Precondition: Increment ID in grid');
 
         // RUN ANONYMIZER
 
@@ -103,6 +104,7 @@ protected function _testAnonymizeAll()
 
         /** @var Mage_Sales_Model_Order $order */
         $order = Mage::getModel('sales/order')->load(1);
+        $this->assertEquals('1000000001', $order->getIncrementId(), 'Increment ID should be unchanged');
         $this->assertNotEquals('test2@test.de', $order->getCustomerEmail());
         $this->assertNotEquals('Testname', $order->getCustomerFirstname());
         $this->assertNotEquals('J', $order->getCustomerMiddlename());
@@ -137,6 +139,7 @@ protected function _testAnonymizeAll()
         $this->assertNotEquals('Testname Testname', $orderGridData->getShippingName());
         $this->assertNotEquals('Testname Testname', $orderGridData->getBillingName());
         $this->assertEquals($orderAddress->getName(), $orderGridData->getBillingName());
+        $this->assertEquals('1000000001', $orderGridData->getIncrementId(), 'Increment ID in grid should be unchanged');
 
         $subscriber = Mage::getModel('newsletter/subscriber')->load(1);
         $this->assertNotEquals('guest1@example.com', $subscriber->getSubscriberEmail());

src/app/code/community/IntegerNet/Anonymizer/Test/Model/Bridge/Entity/Order.php

@@ -34,31 +34,35 @@ public function testGetValues($orderId)
     }
 
     /**
+     * @param $orderId
      * @param $customerId
      * @test
      * @dataProvider dataProvider
-     * @dataProviderFile testCustomerBridge.yaml
+     * @dataProviderFile testOrderBridge.yaml
      * @loadFixture customers.yaml
      */
-    public function testUpdateValues($customerId)
+    public function testUpdateValues($orderId, $customerId)
     {
         static $changedEmail = 'changed@example.com',
                $changedMiddlename = 'trouble';
 
-        /** @var IntegerNet_Anonymizer_Model_Bridge_Entity_Customer $bridge */
-        $bridge = Mage::getModel('integernet_anonymizer/bridge_entity_customer');
+        /** @var IntegerNet_Anonymizer_Model_Bridge_Entity_Order $bridge */
+        $bridge = Mage::getModel('integernet_anonymizer/bridge_entity_order');
 
         $bridge->setRawData(array(
-            'entity_id' => $customerId,
-            'email'     => $changedEmail,
-            'middlename' => $changedMiddlename
+            'entity_id' => $orderId,
+            'increment_id' => '1000000001',
+            'customer_id' => $customerId,
+            'customer_email'     => $changedEmail,
+            'customer_middlename' => $changedMiddlename
             ));
 
         $this->_updateValues($bridge);
 
-        $customer = Mage::getModel('customer/customer')->load($customerId);
-        $this->assertEquals($changedMiddlename, $customer->getMiddlename());
-        $this->assertEquals($changedEmail, $customer->getEmail());
+        $order = Mage::getModel('sales/order')->load($orderId);
+        $this->assertEquals($changedMiddlename, $order->getCustomerMiddlename());
+        $this->assertEquals($changedEmail, $order->getCustomerEmail());
+        $this->assertNotEmpty($order->getIncrementId(), 'Increment ID should not be empty');
     }
 
 }

src/app/code/community/IntegerNet/Anonymizer/Test/Model/Bridge/Entity/expectations/bridge.yaml

@@ -133,7 +133,8 @@ giftregistry_1:
     - formatter: address
       value: Something something somewhere
     - formatter: 'null'
-      value: 'a:1:{s:3:"foo";s:3:"bar";}'
+      value:
+        foo: 'bar'
 giftregistry_person_1:
   identifier: 'b.schenkter@example.com'
   values:

src/app/code/community/IntegerNet/Anonymizer/Test/Model/Bridge/Entity/providers/testOrderBridge.yaml

@@ -1,2 +1,3 @@
 order_1:
-  id: 1
+  id: 1
+  customer_id: 1

src/app/code/community/IntegerNet/Anonymizer/Test/fixtures/customers.yaml

@@ -111,6 +111,7 @@ tables:
       customer_id: null
   sales/order:
     - entity_id: 1
+      increment_id: 1000000001
       quote_id: 1
       billing_address_id: 1
       customer_id: 2
@@ -122,13 +123,15 @@ tables:
       customer_suffix: III
       customer_taxvat: DE 987654321
     - entity_id: 2
+      increment_id: 1000000002
       quote_id: 2
       billing_address_id: 2
       customer_email: guest@guest.de
       customer_firstname: Gast
       customer_lastname: Gast
   sales/order_grid:
     - entity_id: 1
+      increment_id: 1000000001
       customer_id: 2
       shipping_name: Testname Testname
       billing_name: Testname Testname