Merge pull request #129 from Lomkit/fix/bug_documentation-routes

🐛 documentation routes
Lomkit · Jul 10, 2024 · 2e004b9 · 2e004b9
2 parents c5d525f + 7573bf1
commit 2e004b9
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 34 deletions.
diff --git a/src/Documentation/Schemas/OpenAPI.php b/src/Documentation/Schemas/OpenAPI.php
@@ -265,18 +265,17 @@ public function generatePaths()
             $controller = $route->getController();
 
             if ($controller instanceof Controller) {
-                $path = match (Str::afterLast($route->getName(), '.')) {
-                    'details'      => (new Path())->generateDetailAndDestroy($controller),
-                    'search'       => (new Path())->generateSearch($controller),
-                    'mutate'       => (new Path())->generateMutate($controller),
-                    'operate'      => (new Path())->generateActions($controller),
-                    'restore'      => (new Path())->generateRestore($controller),
-                    'forceDelete'  => (new Path())->generateForceDelete($controller),
-                    default        => null
-                };
-
-                if (!is_null($path)) {
-                    $paths['/'.$route->uri()] = $path;
+                switch ($actionMethod = $route->getActionMethod()) {
+                    case 'mutate':
+                    case 'search':
+                    case 'operate':
+                    case 'restore':
+                    case 'forceDelete':
+                    case 'details':
+                    case 'destroy':
+                        $path = $paths['/'.$route->uri()] ?? new Path();
+                        $paths['/'.$route->uri()] = $path->{'generate'.Str::ucfirst($actionMethod)}($controller);
+                        break;
                 }
             }
         }

diff --git a/src/Documentation/Schemas/Operation.php b/src/Documentation/Schemas/Operation.php
@@ -192,7 +192,7 @@ public function generate(): Schema
      *
      * @return Operation
      */
-    public function generateDetail(Controller $controller): Operation
+    public function generateDetails(Controller $controller): Operation
     {
         return $controller->generateDocumentationDetailOperation(
             $this
@@ -267,7 +267,7 @@ public function generateMutate(Controller $controller): Operation
      *
      * @return Operation
      */
-    public function generateActions(Controller $controller): Operation
+    public function generateOperate(Controller $controller): Operation
     {
         return $controller->generateDocumentationActionsOperation(
             $this

diff --git a/src/Documentation/Schemas/Path.php b/src/Documentation/Schemas/Path.php
@@ -380,24 +380,35 @@ public function generate(): Path
     }
 
     /**
-     * Generates a Path schema with operations for retrieving resource details and performing resource deletion.
+     * Generates a Path schema with operations for performing resource deletion.
      *
      * @param Controller $controller The controller instance used for generating documentation.
      *
      * @return Path
      */
-    public function generateDetailAndDestroy(Controller $controller): Path
+    public function generateDestroy(Controller $controller): Path
     {
         return $this
-            ->withGet(
-                (new Operation())
-                    ->generateDetail($controller)
-            )
             ->withDelete(
                 (new Operation())
                     ->generateDestroy($controller)
-            )
-            ->generate();
+            );
+    }
+
+    /**
+     * Generates a Path schema with operations for retrieving resource details.
+     *
+     * @param Controller $controller The controller instance used for generating documentation.
+     *
+     * @return Path
+     */
+    public function generateDetails(Controller $controller): Path
+    {
+        return $this
+            ->withGet(
+                (new Operation())
+                    ->generateDetails($controller)
+            );
     }
 
     /**
@@ -413,8 +424,7 @@ public function generateSearch(Controller $controller): Path
             ->withPost(
                 (new Operation())
                     ->generateSearch($controller)
-            )
-            ->generate();
+            );
     }
 
     /**
@@ -430,8 +440,7 @@ public function generateMutate(Controller $controller): Path
             ->withPost(
                 (new Operation())
                     ->generateMutate($controller)
-            )
-            ->generate();
+            );
     }
 
     /**
@@ -441,12 +450,12 @@ public function generateMutate(Controller $controller): Path
      *
      * @return Path
      */
-    public function generateActions(Controller $controller): Path
+    public function generateOperate(Controller $controller): Path
     {
         return $this
             ->withPost(
                 (new Operation())
-                    ->generateActions($controller)
+                    ->generateOperate($controller)
             )
             ->withParameters(
                 [
@@ -462,8 +471,7 @@ public function generateActions(Controller $controller): Path
                         ->withRequired()
                         ->generate(),
                 ]
-            )
-            ->generate();
+            );
     }
 
     /**
@@ -479,8 +487,7 @@ public function generateRestore(Controller $controller): Path
             ->withPost(
                 (new Operation())
                     ->generateRestore($controller)
-            )
-            ->generate();
+            );
     }
 
     /**
@@ -496,7 +503,6 @@ public function generateForceDelete(Controller $controller): Path
             ->withDelete(
                 (new Operation())
                     ->generateForceDelete($controller)
-            )
-            ->generate();
+            );
     }
 }