WIP

Author: 27pchrisl

src/PathSegment/OpenAPI.php

@@ -302,32 +302,35 @@ public function emitJson(Transaction $transaction): void
             $boundParameterName = $operation->getBindingParameterName();
             $boundParameter = $operation->getCallableArguments()[$boundParameterName] ?? null;
             $pathItemObject = (object) [];
+            $tags = [];
 
             switch (true) {
                 case null === $boundParameter:
                     $paths->{'/'.$operation->getName()} = $pathItemObject;
+                    $tags[] = __('lodata::Service operations');
+                    $tags[] = $operation->getName();
                     break;
 
                 case $boundParameter instanceof Operation\EntitySetArgument:
-                    $paths->{"/{$boundParameterName}/{$operation->getName()}()"} = $pathItemObject;
+                    $paths->{"/{$boundParameter->getName()}/{$operation->getName()}()"} = $pathItemObject;
+                    $tags[] = $boundParameter->getName();
                     break;
 
                 case $boundParameter instanceof Operation\EntityArgument:
-                    $paths->{"/{$boundParameterName}/{{$boundParameter->getType()->getKey()->getName()}}/{$operation->getName()}()"} = $pathItemObject;
+                    foreach (Lodata::getResources()->sliceByClass(EntitySet::class)->filter(function (
+                        EntitySet $entitySet
+                    ) use ($boundParameter) {
+                        return $entitySet->getType() === $boundParameter->getType();
+                    }) as $resource) {
+                        $paths->{"/{$resource->getName()}/{{$resource->getType()->getKey()->getName()}}/{$operation->getName()}()"} = $pathItemObject;
+                        $tags[] = $resource->getName();
+                    }
                     break;
             }
 
             $queryObject = (object) [];
             $pathItemObject->{$operation->isFunction() ? 'get' : 'post'} = $queryObject;
 
-            $tags = [];
-            $tags[] = __('lodata::Service operations');
-            $tags[] = $operation->getName();
-
-            if ($boundParameterName) {
-                $tags[] = $boundParameterName;
-            }
-
             $parameters = [];
 
             $returnType = $operation->getReturnType();
@@ -338,8 +341,6 @@ public function emitJson(Transaction $transaction): void
                     continue;
                 }
 
-                $tags[] = $argument->getName();
-
                 $parameters[] = [
                     'required' => !$argument->isNullable(),
                     'in' => 'query',

tests/__snapshots__/Entity/EloquentTest__test_generated_property__4.json

@@ -3394,8 +3394,7 @@
             "get": {
                 "tags": [
                     "Service operations",
-                    "op2",
-                    "prefix"
+                    "op2"
                 ],
                 "parameters": [
                     {

tests/__snapshots__/EntitySet/EloquentTest__test_metadata__4.json

@@ -3390,8 +3390,7 @@
             "get": {
                 "tags": [
                     "Service operations",
-                    "op2",
-                    "prefix"
+                    "op2"
                 ],
                 "parameters": [
                     {

tests/__snapshots__/Operation/ActionTest__test_array_argument__4.json

@@ -289,8 +289,7 @@
             "post": {
                 "tags": [
                     "Service operations",
-                    "arrayv1",
-                    "args"
+                    "arrayv1"
                 ],
                 "parameters": [
                     {

tests/__snapshots__/Operation/ActionTest__test_date_argument__4.json

@@ -289,8 +289,7 @@
             "post": {
                 "tags": [
                     "Service operations",
-                    "datev1",
-                    "dt"
+                    "datev1"
                 ],
                 "parameters": [
                     {

tests/__snapshots__/Operation/ActionTest__test_odata_binary_argument__4.json

@@ -289,8 +289,7 @@
             "post": {
                 "tags": [
                     "Service operations",
-                    "op",
-                    "arg"
+                    "op"
                 ],
                 "parameters": [
                     {

tests/__snapshots__/Operation/ActionTest__test_odata_boolean_argument__4.json

@@ -289,8 +289,7 @@
             "post": {
                 "tags": [
                     "Service operations",
-                    "op",
-                    "arg"
+                    "op"
                 ],
                 "parameters": [
                     {

tests/__snapshots__/Operation/ActionTest__test_odata_byte_argument__4.json

@@ -289,8 +289,7 @@
             "post": {
                 "tags": [
                     "Service operations",
-                    "op",
-                    "arg"
+                    "op"
                 ],
                 "parameters": [
                     {

tests/__snapshots__/Operation/ActionTest__test_odata_collection_argument__4.json

@@ -289,8 +289,7 @@
             "post": {
                 "tags": [
                     "Service operations",
-                    "op",
-                    "args"
+                    "op"
                 ],
                 "parameters": [
                     {

tests/__snapshots__/Operation/ActionTest__test_odata_date_argument__4.json

@@ -289,8 +289,7 @@
             "post": {
                 "tags": [
                     "Service operations",
-                    "op",
-                    "arg"
+                    "op"
                 ],
                 "parameters": [
                     {