Refactor

Author: SOHELAHMED7

TODO.taskpaper

@@ -1,8 +1,8 @@
 TODO.taskpaper
 
 ### Generate inverse relations #25
- ☐ create failing test
- ☐ implement the solution
+ ✔ create failing test @done (24-08-25 15:25)
+ ✔ implement the solution @done (24-08-25 15:25)
  ☐ fix failing tests if any
  ☐ resolve TODOs if any
  ☐ review PR

src/lib/AttributeResolver.php

@@ -100,7 +100,23 @@ public function resolve(): DbModel
                 $this->resolveProperty($property, $isRequired, $nullableValue);
             }
         }
-        return $this->createDbModel();
+
+        return Yii::createObject(DbModel::class, [
+            [
+                'pkName' => $this->schema->getPkName(),
+                'name' => $this->schemaName,
+                'tableName' => $this->tableName,
+                'description' => $this->schema->getDescription(),
+                'attributes' => $this->attributes,
+                'relations' => $this->relations,
+                'nonDbRelations' => $this->nonDbRelations,
+                'many2many' => $this->many2many,
+                'indexes' => $this->prepareIndexes($this->schema->getIndexes()),
+                //For valid primary keys for junction tables
+                'junctionCols' => $this->isJunctionSchema ? $this->junctions->junctionCols($this->schemaName) : [],
+                'isNotDb' => $this->schema->isNonDb(),
+            ],
+        ]);
     }
 
     /**
@@ -472,29 +488,8 @@ protected function resolvePropertyRef(PropertySchema $property, Attribute $attri
     }
 
     /**
-     * @throws InvalidDefinitionException
      * @throws InvalidConfigException
      */
-    public function createDbModel(): DbModel
-    {
-        return Yii::createObject(DbModel::class, [
-            [
-                'pkName' => $this->schema->getPkName(),
-                'name' => $this->schemaName,
-                'tableName' => $this->tableName,
-                'description' => $this->schema->getDescription(),
-                'attributes' => $this->attributes,
-                'relations' => $this->relations,
-                'nonDbRelations' => $this->nonDbRelations,
-                'many2many' => $this->many2many,
-                'indexes' => $this->prepareIndexes($this->schema->getIndexes()),
-                //For valid primary keys for junction tables
-                'junctionCols' => $this->isJunctionSchema ? $this->junctions->junctionCols($this->schemaName) : [],
-                'isNotDb' => $this->schema->isNonDb(),
-            ],
-        ]);
-    }
-
     public function addInverseRelation(
         string $relatedClassName,
         Attribute $attribute,

src/lib/SchemaToDatabase.php

@@ -80,7 +80,12 @@ public function __construct(Config $config)
      */
     public function prepareModels(): array
     {
-        $models = $resolvers = [];
+        /** @var DbModel[] $models */
+        $models = [];
+
+        /** @var AttributeResolver[] $resolvers */
+        $resolvers = [];
+
         $openApi = $this->config->getOpenApi();
         $junctions = $this->findJunctionSchemas();
         foreach ($openApi->components->schemas as $schemaName => $openApiSchema) {
@@ -102,13 +107,10 @@ public function prepareModels(): array
 
         // handle inverse relation
         foreach ($resolvers as $aResolver) {
-            /** @var AttributeResolver $aResolver */
-            if ($aResolver->inverseRelations) {
-                foreach ($aResolver->inverseRelations as $name => $relations) {
-                    foreach ($relations as $relation) {
-                        /** @var AttributeRelation $relation */
-                        $models[$name]->inverseRelations[] = $relation;
-                    }
+            foreach ($aResolver->inverseRelations as $name => $relations) {
+                foreach ($relations as $relation) {
+                    /** @var AttributeRelation $relation */
+                    $models[$name]->inverseRelations[] = $relation;
                 }
             }
         }