Update unit of work

Author: Marco Bunge

src/UnitOfWork.php

@@ -30,12 +30,12 @@ final class UnitOfWork
     /**
      * @var object[]
      */
-    private $completed = [];
+    private $modified = [];
 
     /**
-     * @var \SplObjectStorage
+     * @var array
      */
-    private $completedState = null;
+    private $processed = [];
 
     /**
      * @var Connection
@@ -55,15 +55,14 @@ final class UnitOfWork
     public function __construct(Connection $connection)
     {
         $this->connection = $connection;
-        $this->completedState = new \SplObjectStorage();
     }
 
     /**
      * @return \object[]
      */
-    public function getCompleted()
+    public function getModified()
     {
-        return $this->completed;
+        return $this->modified;
     }
 
     /**
@@ -219,8 +218,10 @@ protected function process($label, &$entities, callable $task)
     {
         foreach ($entities as $key => $entity) {
             $task($entity);
-            $this->completedState[$entity] = $label;
-            $this->completed[] = $entity;
+            $this->processed[$label][] = $entity;
+            if(IdentityMap::REMOVED !== $label){
+                $this->modified[] = $entity;
+            }
             unset($entities[$key]);
         }
     }

tests/IntegrationTest.php

@@ -14,6 +14,8 @@
 use Hawkbit\Database\ConnectionManager;
 use Hawkbit\Database\Tests\Stubs\PostEntity;
 use Hawkbit\Database\Tests\Stubs\PostMapper;
+use Hawkbit\Database\Tests\Stubs\UserEntity;
+use Hawkbit\Database\Tests\Stubs\UserMapper;
 
 class IntegrationTest extends \PHPUnit_Framework_TestCase
 {
@@ -35,6 +37,7 @@ protected function setUp()
         ]);
 
         $connection->getMapperLocator()->register(PostMapper::class);
+        $connection->getMapperLocator()->register(UserMapper::class);
 
         $connection->exec('CREATE TABLE post (id INTEGER PRIMARY KEY, content TEXT)');
         $connection->exec('CREATE TABLE user (id INTEGER PRIMARY KEY, username VARCHAR)');
@@ -109,8 +112,11 @@ public function testMapperIntegration()
     public function testUoWIntegration()
     {
         $connection = $this->connection;
-        /** @var PostMapper $mapper */
-        $mapper = $connection->loadMapper(PostEntity::class);
+        /** @var PostMapper $postMapper */
+        $postMapper = $connection->loadMapper(PostEntity::class);
+
+        /** @var UserMapper $userMapper */
+        $userMapper = $connection->loadMapper(UserEntity::class);
         $unitOfWork = $connection->createUnitOfWork();
 
         $contentFromAnyOtherSource = [
@@ -119,25 +125,57 @@ public function testUoWIntegration()
             'Hello 2',
         ];
 
+        $userFromAnyOtherSource = [
+            'Jake',
+            'Andy',
+            'Dave',
+        ];
+
         foreach ($contentFromAnyOtherSource as $content) {
             /** @var PostEntity $entity */
-            $entity = $mapper->createEntity();
+            $entity = $postMapper->createEntity();
             $entity->setContent($content);
             $unitOfWork->create($entity);
         }
 
+        foreach ($userFromAnyOtherSource as $content) {
+            /** @var UserEntity $entity */
+            $entity = $userMapper->createEntity();
+            $entity->setUsername($content);
+            $unitOfWork->create($entity);
+        }
+
         $this->assertTrue($unitOfWork->commit());
 
         // test find commited entities
         foreach ($contentFromAnyOtherSource as $content) {
-            $foundEntity = $mapper->select(function (QueryBuilder $query) use ($content) {
+            /** @var PostEntity $foundPostEntity */
+            $foundPostEntity = $postMapper->select(function (QueryBuilder $query) use ($content) {
                 $query->where($query->expr()->eq('content', $query->createPositionalParameter($content, Type::STRING)));
             }, ['*'], true);
 
             // test object has been found in database
-            $foundResult = $mapper->getGateway()->select()->where('content = ?')->setParameter(0, $content, Type::STRING)->execute()->fetch();
-            $this->assertEquals((int)$foundResult['id'], $foundEntity->getId());
-            $this->assertEquals($foundResult['content'], $foundEntity->getContent());
+            $foundResult = $postMapper->getGateway()->select()->where('content = ?')->setParameter(0, $content, Type::STRING)->execute()->fetch();
+            $this->assertEquals((int)$foundResult['id'], $foundPostEntity->getId());
+            $this->assertEquals($foundResult['content'], $foundPostEntity->getContent());
+        }
+
+        // test find commited entities
+        foreach ($userFromAnyOtherSource as $user) {
+
+            /** @var UserEntity $foundUserEntity */
+            $foundUserEntity = $userMapper->select(function (QueryBuilder $query) use ($user) {
+                $query->where($query->expr()->eq('username', $query->createPositionalParameter($user, Type::STRING)));
+            }, ['*'], true);
+
+            // test object has been found in database
+            $foundResult = $userMapper->getGateway()->select()->where('username = ?')->setParameter(0, $user, Type::STRING)->execute()->fetch();
+            $this->assertEquals((int)$foundResult['id'], $foundUserEntity->getId());
+            $this->assertEquals($foundResult['username'], $foundUserEntity->getUsername());
+        }
+
+        if(true){
+
         }
     }
 }

tests/Stubs/UserMapper.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: marco.bunge
+ * Date: 05.12.2016
+ * Time: 10:05
+ */
+
+namespace Hawkbit\Database\Tests\Stubs;
+
+
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Types\Type;
+use Hawkbit\Database\AbstractMapper;
+
+class UserMapper extends AbstractMapper
+{
+    public function define()
+    {
+        $this->tableName = 'user';
+        $this->columns = [
+            new Column('id', Type::getType(Type::INTEGER)),
+            new Column('username', Type::getType(Type::TEXT)),
+        ];
+        $this->primaryKey = ['id'];
+        $this->entityClass = UserEntity::class;
+    }
+}