Merge pull request #115 from marcteyssier/4.2

Deleting a bean in database now impacts the many to one related lists.
thecodingmachine · Oct 4, 2016 · 37bf925 · 37bf925
2 parents 9b8943c + 2bbf8c2
commit 37bf925
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 4 deletions.
diff --git a/src/Mouf/Database/TDBM/AbstractTDBMObject.php b/src/Mouf/Database/TDBM/AbstractTDBMObject.php
@@ -180,6 +180,10 @@ public function _setStatus($state)
         foreach ($this->dbRows as $dbRow) {
             $dbRow->_setStatus($state);
         }
+
+        if ($state === TDBMObjectStateEnum::STATE_DELETED) {
+            $this->onDelete();
+        }
     }
 
     /**
@@ -631,4 +635,11 @@ public function _getCachedRelationships()
      * @return string[]
      */
     abstract protected function getUsedTables();
+
+    /**
+     * Method called when the bean is removed from database.
+     */
+    protected function onDelete()
+    {
+    }
 }
diff --git a/src/Mouf/Database/TDBM/MapIterator.php b/src/Mouf/Database/TDBM/MapIterator.php
@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace Mouf\Database\TDBM;
 

diff --git a/src/Mouf/Database/TDBM/Utils/BeanDescriptor.php b/src/Mouf/Database/TDBM/Utils/BeanDescriptor.php
@@ -643,6 +643,8 @@ class $baseClassName extends $extends implements \\JsonSerializable
 
         $str .= $this->generateGetUsedTablesCode();
 
+        $str .= $this->generateOnDeleteCode();
+
         $str .= '}
 ';
 
@@ -800,4 +802,31 @@ protected function getUsedTables()
     }
 ', $code);
     }
+
+    private function generateOnDeleteCode()
+    {
+        $code = '';
+        $relationships = $this->getPropertiesForTable($this->table);
+        foreach ($relationships as $relationship) {
+            if ($relationship instanceof ObjectBeanPropertyDescriptor) {
+                $code .= sprintf('        $this->setRef('.var_export($relationship->getForeignKey()->getName(), true).', null, '.var_export($this->table->getName(), true).');');
+            }
+        }
+
+        if ($code) {
+            return sprintf('
+    /**
+     * Method called when the bean is removed from database.
+     *
+     */
+    protected function onDelete()
+    {
+        parent::onDelete();
+%s
+    }
+', $code);
+        }
+
+        return '';
+    }
 }
diff --git a/tests/Mouf/Database/TDBM/AlterableResultIteratorTest.php b/tests/Mouf/Database/TDBM/AlterableResultIteratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace Mouf\Database\TDBM;
 

diff --git a/tests/Mouf/Database/TDBM/TDBMDaoGeneratorTest.php b/tests/Mouf/Database/TDBM/TDBMDaoGeneratorTest.php
@@ -40,8 +40,6 @@
 use Mouf\Database\TDBM\Test\Dao\UserDao;
 use Mouf\Database\TDBM\Utils\TDBMDaoGenerator;
 
-/**
- */
 class TDBMDaoGeneratorTest extends TDBMAbstractServiceTest
 {
     /** @var TDBMDaoGenerator $tdbmDaoGenerator */
@@ -272,6 +270,31 @@ public function testDirectReversedRelationship()
         $this->assertEquals('speedy.gonzalez', $arr[1]->getLogin());
     }
 
+    /**
+     * @depends testDaoGeneration
+     */
+    public function testDeleteInDirectReversedRelationship()
+    {
+        $countryDao = new CountryDao($this->tdbmService);
+        $country = $countryDao->getById(1);
+
+        $userDao = new UserDao($this->tdbmService);
+        $newUser = new UserBean('John Snow', 'john@snow.com', $country, 'john.snow');
+        $userDao->save($newUser);
+
+        $users = $country->getUsers();
+
+        $arr = $users->toArray();
+
+        $this->assertCount(2, $arr);
+
+        $userDao->delete($arr[1]);
+
+        $users = $country->getUsers();
+        $arr = $users->toArray();
+        $this->assertCount(1, $arr);
+    }
+
     /**
      * @depends testDaoGeneration
      */