merge PR #584

Author: mevdschee

api.php

@@ -8322,7 +8322,7 @@ private function setPaths() /*: void*/
                         $this->openapi->set("paths|$path|$method|requestBody|\$ref", "#/components/requestBodies/$operationType");
                     }
                     $this->openapi->set("paths|$path|$method|tags|0", "$type");
-                    $this->openapi->set("paths|$path|$method|operationId", "$operation"."_"."$type");
+                    $this->openapi->set("paths|$path|$method|operationId", "$operation" . "_" . "$type");
                     if ($operationType == 'updateTable') {
                         $this->openapi->set("paths|$path|$method|description", "rename table");
                     } else {
@@ -8617,7 +8617,7 @@ private function setPath(string $tableName) /*: void*/
                         $parameters = ['filter', 'include', 'exclude', 'order', 'size', 'page', 'join'];
                     }
                 } else {
-                    $path = sprintf('/records/%s/{%s}', $tableName, 'id'); // $pkName);
+                    $path = sprintf('/records/%s/{id}', $tableName);
                     if ($operation == 'read') {
                         $parameters = ['pk', 'include', 'exclude', 'join'];
                     } else {
@@ -8631,7 +8631,7 @@ private function setPath(string $tableName) /*: void*/
                     $this->openapi->set("paths|$path|$method|requestBody|\$ref", "#/components/requestBodies/$operation-" . rawurlencode($tableName));
                 }
                 $this->openapi->set("paths|$path|$method|tags|0", "$tableName");
-                $this->openapi->set("paths|$path|$method|operationId", "$operation"."_"."$tableName");
+                $this->openapi->set("paths|$path|$method|operationId", "$operation" . "_" . "$tableName");
                 $this->openapi->set("paths|$path|$method|description", "$operation $tableName");
                 switch ($operation) {
                     case 'list':

src/Tqdev/PhpCrudApi/OpenApi/OpenApiColumnsBuilder.php

@@ -74,6 +74,7 @@ private function setPaths() /*: void*/
                     $this->openapi->set("paths|$path|$method|requestBody|\$ref", "#/components/requestBodies/$operationType");
                 }
                 $this->openapi->set("paths|$path|$method|tags|0", "$type");
+                $this->openapi->set("paths|$path|$method|operationId", "$operation" . "_" . "$type");
                 if ($operationType == 'updateTable') {
                     $this->openapi->set("paths|$path|$method|description", "rename table");
                 } else {

src/Tqdev/PhpCrudApi/OpenApi/OpenApiRecordsBuilder.php

@@ -129,7 +129,7 @@ private function setPath(string $tableName) /*: void*/
                     $parameters = ['filter', 'include', 'exclude', 'order', 'size', 'page', 'join'];
                 }
             } else {
-                $path = sprintf('/records/%s/{%s}', $tableName, $pkName);
+                $path = sprintf('/records/%s/{id}', $tableName);
                 if ($operation == 'read') {
                     $parameters = ['pk', 'include', 'exclude', 'join'];
                 } else {
@@ -143,6 +143,7 @@ private function setPath(string $tableName) /*: void*/
                 $this->openapi->set("paths|$path|$method|requestBody|\$ref", "#/components/requestBodies/$operation-" . rawurlencode($tableName));
             }
             $this->openapi->set("paths|$path|$method|tags|0", "$tableName");
+            $this->openapi->set("paths|$path|$method|operationId", "$operation" . "_" . "$tableName");
             $this->openapi->set("paths|$path|$method|description", "$operation $tableName");
             switch ($operation) {
                 case 'list':