JSON Serialize Stop Recursion: Composite Fk Implementation

Author: homersimpsons

src/Utils/ObjectBeanPropertyDescriptor.php

@@ -245,8 +245,10 @@ private function getLazySerializeCode(string $propertyAccess): string
     {
         $rows = [];
         foreach ($this->getForeignKey()->getUnquotedForeignColumns() as $column) {
-            $columnGetterName = 'get' . TDBMDaoGenerator::toCamelCase($column);
-            $rows[] = "'$column' => $propertyAccess->$columnGetterName()";
+            $camelColumn = TDBMDaoGenerator::toCamelCase($column);
+            $indexName = lcfirst($camelColumn);
+            $columnGetterName = 'get' . $camelColumn;
+            $rows[] = "'$indexName' => $propertyAccess->$columnGetterName()";
         }
         return '[' . implode(', ', $rows) . ']';
     }

tests/TDBMAbstractServiceTest.php

@@ -451,6 +451,17 @@ private static function initSchema(Connection $connection): void
             ->column('id')->integer()->primaryKey()->autoIncrement()
             ->column('base_object_id')->references('base_objects')->unique()->comment('@JsonCollection');
 
+        $targetTable = $db->table('composite_fk_target')
+            ->column('id_1')->integer()
+            ->column('id_2')->integer()
+            ->then()->primaryKey(['id_1', 'id_2']);
+        $db->table('composite_fk_source')
+            ->column('id')->integer()->primaryKey()->autoIncrement()
+            ->column('fk_1')->integer()
+            ->column('fk_2')->integer()
+            ->then()->addForeignKeyConstraint($targetTable, ['fk_1', 'fk_2'], ['id_1', 'id_2']);
+
+
         $sqlStmts = $toSchema->getMigrateFromSql($fromSchema, $connection->getDatabasePlatform());
 
         foreach ($sqlStmts as $sqlStmt) {
@@ -771,6 +782,15 @@ private static function initSchema(Connection $connection): void
             'person_id' => 1,
             'boat_id' => 1,
         ]);
+        self::insert($connection, 'composite_fk_target', [
+            'id_1' => 1,
+            'id_2' => 1
+        ]);
+        self::insert($connection, 'composite_fk_source', [
+            'id' => 1,
+            'fk_1' => 1,
+            'fk_2' => 1
+        ]);
     }
 
     protected static function insert(Connection $connection, string $tableName, array $data): void

tests/TDBMDaoGeneratorTest.php

@@ -68,6 +68,7 @@
 use TheCodingMachine\TDBM\Test\Dao\BoatDao;
 use TheCodingMachine\TDBM\Test\Dao\CatDao;
 use TheCodingMachine\TDBM\Test\Dao\CategoryDao;
+use TheCodingMachine\TDBM\Test\Dao\CompositeFkSourceDao;
 use TheCodingMachine\TDBM\Test\Dao\ContactDao;
 use TheCodingMachine\TDBM\Test\Dao\CountryDao;
 use TheCodingMachine\TDBM\Test\Dao\DogDao;
@@ -2149,4 +2150,13 @@ public function testLazyStopRecursion(): void
         $this->assertArrayHasKey('id', $json['artist']);
         $this->assertArrayNotHasKey('name', $json['artist']);
     }
+
+    public function testLazyStopRecursionOnCompositeForeignKey(): void
+    {
+        $compositeFkSourceDao = new CompositeFkSourceDao($this->tdbmService);
+        $compositeFkSourceBean = $compositeFkSourceDao->getById(1);
+        $json = $compositeFkSourceBean->jsonSerialize(true);
+        $this->assertEquals(1, $json['compositeFkTarget']['id1']);
+        $this->assertEquals(1, $json['compositeFkTarget']['id2']);
+    }
 }