Handle multiple relations and add more tests

Author: SOHELAHMED7

src/generator/default/dbmodel.php

@@ -87,7 +87,7 @@ public function rules()
     public function get<?= $relation->getCamelName() ?>()
     {
         return $this-><?= $relation->getMethod() ?>(\<?= trim($relationNamespace, '\\') ?>\<?= $relation->getClassName() ?>::class, <?php
-            echo $relation->linkToString()?>);
+            echo $relation->linkToString()?>)<?= $relation->getInverse() ? '->inverseOf(\''.$relation->getInverse().'\')' : '' ?>;
     }
 <?php endforeach; ?>
 <?php foreach ($model->many2many as $relation): ?>
@@ -103,12 +103,12 @@ public function get<?= $relation->getCamelName() ?>()
 <?php endif;?>
     }
 <?php endforeach; ?>
-<?php foreach ($model->inverseRelations as $relationName => $relation): ?>
+<?php $i = 1; foreach ($model->inverseRelations as $relationName => $relation): ?>
 
-    public function get<?= $relation->getCamelName() ?>()
+    public function get<?= $relation->getCamelName().($i===1 ? '' : $i) ?>()
     {
-    return $this-><?= $relation->getMethod() ?>(\<?= trim($relationNamespace, '\\') ?>\<?= $relation->getClassName() ?>::class, <?php
-    echo $relation->linkToString() ?>)->inverseOf('<?= Inflector::variablize($model->getClassName()) ?>');
+        return $this-><?= $relation->getMethod() ?>(\<?= trim($relationNamespace, '\\') ?>\<?= $relation->getClassName() ?>::class, <?php
+    echo $relation->linkToString() ?>)->inverseOf('<?= $relation->getInverse() ?>');
     }
-<?php endforeach; ?>
+<?php $i++; endforeach; ?>
 }

src/lib/AttributeResolver.php

@@ -249,14 +249,7 @@ protected function resolveProperty(
                 $relation->asSelfReference();
             }
             $this->relations[$property->getName()] = $relation;
-
-            $inverseRelation = Yii::createObject(
-                AttributeRelation::class,
-                [$this->schemaName, $this->tableName, $this->schemaName]
-            )
-                ->asHasOne([$attribute->columnName => $fkProperty->getName()]);
-            $inverseRelation->setInverse(true);
-            $this->inverseRelations[$relatedClassName] = $inverseRelation;
+            $this->addInverseRelation($relatedClassName, $attribute, $property, $fkProperty);
         }
         if (!$property->isReference() && !$property->hasRefItems()) {
             [$min, $max] = $property->guessMinMax();
@@ -329,7 +322,8 @@ protected function resolveProperty(
                     AttributeRelation::class,
                     [$property->getName(), $relatedTableName, $relatedClassName]
                 )
-                    ->asHasMany([Inflector::camel2id($this->schemaName, '_') . '_id' => $this->schema->getPkName()]);
+                    ->asHasMany([Inflector::camel2id($this->schemaName, '_') . '_id' => $this->schema->getPkName()])
+                    ->setInverse(Inflector::variablize($this->schemaName));
             return;
         }
         if ($this->schema->isNonDb() && $attribute->isReference()) {
@@ -498,4 +492,21 @@ public function createDbModel(): DbModel
             ],
         ]);
     }
+
+    public function addInverseRelation(
+        string $relatedClassName,
+        Attribute $attribute,
+        PropertySchema $property,
+        PropertySchema $fkProperty
+    ): void
+    {
+        $inverseRelation = Yii::createObject(
+            AttributeRelation::class,
+            [$this->schemaName, $this->tableName, $this->schemaName]
+        )
+            ->asHasOne([$attribute->columnName => $fkProperty->getName()]);
+        $inverseRelation->setInverse($property->getName());
+        $this->inverseRelations[$relatedClassName][] = $inverseRelation;
+
+    }
 }

src/lib/SchemaToDatabase.php

@@ -104,9 +104,11 @@ public function prepareModels(): array
         foreach ($resolvers as $aResolver) {
             /** @var AttributeResolver $aResolver */
             if ($aResolver->inverseRelations) {
-                foreach ($aResolver->inverseRelations as $name => $aRelation) {
-                    /** @var AttributeRelation $aRelation */
-                    $models[$name]->inverseRelations[] = $aRelation;
+                foreach ($aResolver->inverseRelations as $name => $relations) {
+                    foreach ($relations as $relation) {
+                        /** @var AttributeRelation $relation */
+                        $models[$name]->inverseRelations[] = $relation;
+                    }
                 }
             }
         }

src/lib/items/AttributeRelation.php

@@ -34,7 +34,7 @@ class AttributeRelation
 
     private bool $selfReference = false;
 
-    private bool $inverse = false;
+    private ?string $inverse = null;
 
     public function __construct(
         string  $name,
@@ -184,13 +184,13 @@ public function linkToString(): string
         );
     }
 
-    public function setInverse(bool $inverse): AttributeRelation
+    public function setInverse(string $inverse): AttributeRelation
     {
         $this->inverse = $inverse;
         return $this;
     }
 
-    public function getInverse(): bool
+    public function getInverse(): ?string
     {
         return $this->inverse;
     }

tests/specs/issue_fix/25_generate_inverse_relations/index.yaml

@@ -19,6 +19,10 @@ components:
         name:
           type: string
           maxLength: 128
+        accounts:
+          type: array
+          items:
+            $ref: '#/components/schemas/Account'
 
     Account:
       description: Account
@@ -38,6 +42,12 @@ components:
           type: string
         user:
           $ref: '#/components/schemas/User'
+        user2: # copy of user (not one to many)
+          $ref: '#/components/schemas/User'
+        user3: # copy of user (not one to many)
+          allOf:
+            - $ref: '#/components/schemas/User'
+            - x-fk-column-name: user3
 
 paths:
   '/account':