Merge pull request #148 from Kharhamel/requiredInFindOne

fixed an issue with required parameters in findOneBy

Author: Kharhamel

src/Utils/BeanDescriptor.php

@@ -1159,9 +1159,10 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa
         $parameters = [];
         //$functionParameters = [];
         $first = true;
+        /** @var AbstractBeanPropertyDescriptor $element */
         foreach ($elements as $element) {
             $parameter = new ParameterGenerator(ltrim($element->getVariableName(), '$'));
-            if (!$first) {
+            if (!$first && !($element->isCompulsory() && $index->isUnique())) {
                 $parameterType = '?';
             //$functionParameter = '?';
             } else {
@@ -1170,7 +1171,7 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa
             }
             $parameterType .= $element->getPhpType();
             $parameter->setType($parameterType);
-            if (!$first) {
+            if (!$first && !($element->isCompulsory() && $index->isUnique())) {
                 $parameter->setDefaultValue(null);
             }
             //$functionParameter .= $element->getPhpType();
@@ -1208,7 +1209,7 @@ private function generateFindByDaoCodeForIndex(Index $index, string $beanNamespa
                 foreach ($columns as $localColumn => $foreignColumn) {
                     // TODO: a foreign key could point to another foreign key. In this case, there is no getter for the pointed column. We don't support this case.
                     $targetedElement = new ScalarBeanPropertyDescriptor($foreignTable, $foreignTable->getColumn($foreignColumn), $this->namingStrategy, $this->annotationParser);
-                    if ($first) {
+                    if ($first || $element->isCompulsory() && $index->isUnique()) {
                         // First parameter for index is not nullable
                         $filterArrayCode .= '            '.var_export($localColumn, true).' => '.$element->getVariableName().'->'.$targetedElement->getGetterName()."(),\n";
                     } else {

tests/TDBMAbstractServiceTest.php

@@ -421,7 +421,10 @@ private static function initSchema(Connection $connection): void
         $db->table('albums')
             ->column('id')->integer()->primaryKey()->autoIncrement()
             ->column('artist_id')->references('artists')->comment('@JsonCollection(key="discography")')
-            ->column('title')->string();
+            ->column('account_id')->references('accounts')
+            ->column('node_id')->references('nodes')->null()
+            ->column('title')->string()
+            ->then()->unique(['artist_id', 'account_id'])->unique(['artist_id', 'node_id']);
 
         $db->table('tracks')
             ->column('id')->integer()->primaryKey()->autoIncrement()
@@ -682,6 +685,7 @@ private static function initSchema(Connection $connection): void
         self::insert($connection, 'albums', [
             'id' => 1,
             'artist_id' => 1,
+            'account_id' => 1,
             'title' => 'Animals'
         ]);
 

tests/TDBMDaoGeneratorTest.php

@@ -36,14 +36,17 @@
 use TheCodingMachine\TDBM\Dao\TestUserDao;
 use TheCodingMachine\TDBM\Fixtures\Interfaces\TestUserDaoInterface;
 use TheCodingMachine\TDBM\Fixtures\Interfaces\TestUserInterface;
+use TheCodingMachine\TDBM\Test\Dao\AlbumDao;
 use TheCodingMachine\TDBM\Test\Dao\AllNullableDao;
 use TheCodingMachine\TDBM\Test\Dao\AnimalDao;
 use TheCodingMachine\TDBM\Test\Dao\ArtistDao;
+use TheCodingMachine\TDBM\Test\Dao\Bean\AccountBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\AllNullableBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\AnimalBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\ArrayBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\Article2Bean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\ArticleBean;
+use TheCodingMachine\TDBM\Test\Dao\Bean\ArtistBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\BoatBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\CatBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\CategoryBean;
@@ -2032,6 +2035,33 @@ public function testCanNullifyBlob(): void
         fclose($fp);
     }
 
+    /**
+     * @depends testDaoGeneration
+     */
+    public function testOptionnalParametersCanBeNullInFindOneBy()
+    {
+        $albumDao = new AlbumDao($this->tdbmService);
+        $artist = new ArtistBean('Marcel');
+
+        $albumDao->findOneByArtistAndNode($artist, null);
+        $this->assertEquals(1, 1);
+    }
+
+    /**
+     * @depends testDaoGeneration
+     */
+    public function testRequiredParametersCannotBeNullInFindOneBy()
+    {
+        $albumDao = new AlbumDao($this->tdbmService);
+        $artist = new ArtistBean('Marcel');
+        $account = new AccountBean('Jamie');
+
+        $albumDao->findOneByArtistAndAccount($artist, $account);
+
+        $this->expectException('TypeError');
+        $albumDao->findOneByArtistAndAccount($artist, null);
+    }
+
     /**
      * @depends testDaoGeneration
      */