Add missing import for nested controllers

Author: jasonmccreary

src/Generators/ControllerGenerator.php

@@ -41,6 +41,10 @@ public function output(array $tree): array
         foreach ($tree['controllers'] as $controller) {
             $this->addImport($controller, 'Illuminate\\Http\\Request');
 
+            if ($controller->fullyQualifiedNamespace() !== 'App\\Http\\Controllers') {
+                $this->addImport($controller, 'App\\Http\\Controllers\\Controller');
+            }
+
             $path = $this->getPath($controller);
 
             if (!$this->files->exists(dirname($path))) {
@@ -121,10 +125,10 @@ private function buildMethods(Controller $controller)
                     $body .= self::INDENT . $statement->output() . PHP_EOL;
                 } elseif ($statement instanceof EloquentStatement) {
                     $body .= self::INDENT . $statement->output($controller->prefix(), $name) . PHP_EOL;
-                    $this->addImport($controller, config('blueprint.namespace') . '\\' . ($controller->namespace() ? $controller->namespace() . '\\' : '') . $this->determineModel($controller, $statement->reference()));
+                    $this->addImport($controller, $this->determineModel($controller, $statement->reference()));
                 } elseif ($statement instanceof QueryStatement) {
                     $body .= self::INDENT . $statement->output($controller->prefix()) . PHP_EOL;
-                    $this->addImport($controller, config('blueprint.namespace') . '\\' . ($controller->namespace() ? $controller->namespace() . '\\' : '') . $this->determineModel($controller, $statement->model()));
+                    $this->addImport($controller, $this->determineModel($controller, $statement->model()));
                 }
 
                 $body .= PHP_EOL;
@@ -165,13 +169,21 @@ private function buildImports(Controller $controller)
     private function determineModel(Controller $controller, ?string $reference)
     {
         if (empty($reference) || $reference === 'id') {
-            return Str::studly(Str::singular($controller->prefix()));
+            return $this->fullyQualifyModelReference($controller->namespace(), Str::studly(Str::singular($controller->prefix())));
         }
 
         if (Str::contains($reference, '.')) {
-            return Str::studly(Str::before($reference, '.'));
+            return $this->fullyQualifyModelReference($controller->namespace(), Str::studly(Str::before($reference, '.')));
         }
 
-        return Str::studly($reference);
+        return $this->fullyQualifyModelReference($controller->namespace(), Str::studly($reference));
+    }
+
+    private function fullyQualifyModelReference(string $sub_namespace, string $model_name)
+    {
+        // TODO: get model_name from tree.
+        // If not found, assume parallel namespace as controller.
+        // Use respond-statement.php as test case.
+        return config('blueprint.namespace') . '\\' . ($sub_namespace ? $sub_namespace . '\\' : '') . $model_name;
     }
 }

tests/fixtures/controllers/controller-configured.php

@@ -2,6 +2,7 @@
 
 namespace Some\App\Other\Http;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Some\App\Http\Requests\UserStoreRequest;
 use Some\App\User;

tests/fixtures/controllers/nested-components.php

@@ -4,6 +4,7 @@
 
 use App\Admin\User;
 use App\Events\NewUser;
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\UserStoreRequest;
 use App\Jobs\BuildAccount;
 use App\Mail\InviteNotification;

tests/fixtures/controllers/respond-statements.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use App\Api\Post;
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 class PostController extends Controller

tests/fixtures/definitions/nested-components.bp

@@ -5,7 +5,7 @@ models:
 controllers:
   Admin/User:
     index:
-      query: all:users
+      query: all
       render: admin.user.index with:users
 
     store:

tests/fixtures/definitions/respond-statements.bp

@@ -1,7 +1,11 @@
+models:
+  Post:
+    title: string
+
 controllers:
   Api/Post:
     index:
-      query: all:posts
+      query: all
       respond: posts
     store:
       respond: 204