update server handle content type

apioo · Sep 14, 2024 · 6250ad3 · 6250ad3
1 parent 38f9218
commit 6250ad3
Show file tree

Hide file tree

Showing 28 changed files with 1,198 additions and 20 deletions.
diff --git a/src/Generator/Server/PHP.php b/src/Generator/Server/PHP.php
@@ -22,6 +22,7 @@
 
 use PSX\Api\Generator\Server\Dto\File;
 use PSX\Api\OperationInterface;
+use PSX\Schema\ContentType;
 use PSX\Schema\Generator;
 use PSX\Schema\GeneratorInterface as SchemaGeneratorInterface;
 use PSX\Schema\Type\ReferenceType;
@@ -118,7 +119,7 @@ protected function generateFooter(File $file): string
         return $controller;
     }
 
-    protected function generateArgumentPath(string $rawName, string $variableName, string $type, TypeInterface $argumentType): string
+    protected function generateArgumentPath(string $rawName, string $variableName, string $type, TypeInterface|ContentType $argumentType): string
     {
         if ($argumentType instanceof ReferenceType) {
             $type = 'Model\\' . $type;
@@ -131,7 +132,7 @@ protected function generateArgumentPath(string $rawName, string $variableName, s
         }
     }
 
-    protected function generateArgumentQuery(string $rawName, string $variableName, string $type, TypeInterface $argumentType): string
+    protected function generateArgumentQuery(string $rawName, string $variableName, string $type, TypeInterface|ContentType $argumentType): string
     {
         if ($argumentType instanceof ReferenceType) {
             $type = 'Model\\' . $type;
@@ -144,7 +145,7 @@ protected function generateArgumentQuery(string $rawName, string $variableName,
         }
     }
 
-    protected function generateArgumentHeader(string $rawName, string $variableName, string $type, TypeInterface $argumentType): string
+    protected function generateArgumentHeader(string $rawName, string $variableName, string $type, TypeInterface|ContentType $argumentType): string
     {
         if ($argumentType instanceof ReferenceType) {
             $type = 'Model\\' . $type;
@@ -157,7 +158,7 @@ protected function generateArgumentHeader(string $rawName, string $variableName,
         }
     }
 
-    protected function generateArgumentBody(string $variableName, string $type, TypeInterface $argumentType): string
+    protected function generateArgumentBody(string $variableName, string $type, TypeInterface|ContentType $argumentType): string
     {
         if ($argumentType instanceof ReferenceType) {
             $type = 'Model\\' . $type;
@@ -166,7 +167,7 @@ protected function generateArgumentBody(string $variableName, string $type, Type
         return '#[Body] ' . $type . ' $' . $variableName;
     }
 
-    protected function generateMethod(string $operationName, OperationInterface $operation, array $arguments, string $type, TypeInterface $returnType): string
+    protected function generateMethod(string $operationName, OperationInterface $operation, array $arguments, string $type, TypeInterface|ContentType $returnType): string
     {
         if ($returnType instanceof ReferenceType) {
             $type = 'Model\\' . $type;

diff --git a/src/Generator/Server/ServerAbstract.php b/src/Generator/Server/ServerAbstract.php
@@ -30,6 +30,7 @@
 use PSX\Api\Operation\ArgumentInterface;
 use PSX\Api\OperationInterface;
 use PSX\Api\SpecificationInterface;
+use PSX\Schema\ContentType;
 use PSX\Schema\DefinitionsInterface;
 use PSX\Schema\Exception\TypeNotFoundException;
 use PSX\Schema\Generator;
@@ -149,15 +150,15 @@ abstract protected function getFileExtension(): string;
 
     abstract protected function generateHeader(File $file, array $imports): string;
     abstract protected function generateFooter(File $file): string;
-    abstract protected function generateArgumentPath(string $rawName, string $variableName, string $type, TypeInterface $argumentType): string;
-    abstract protected function generateArgumentQuery(string $rawName, string $variableName, string $type, TypeInterface $argumentType): string;
-    abstract protected function generateArgumentHeader(string $rawName, string $variableName, string $type, TypeInterface $argumentType): string;
-    abstract protected function generateArgumentBody(string $variableName, string $type, TypeInterface $argumentType): string;
+    abstract protected function generateArgumentPath(string $rawName, string $variableName, string $type, TypeInterface|ContentType $argumentType): string;
+    abstract protected function generateArgumentQuery(string $rawName, string $variableName, string $type, TypeInterface|ContentType $argumentType): string;
+    abstract protected function generateArgumentHeader(string $rawName, string $variableName, string $type, TypeInterface|ContentType $argumentType): string;
+    abstract protected function generateArgumentBody(string $variableName, string $type, TypeInterface|ContentType $argumentType): string;
 
     /**
      * @param array<string> $arguments
      */
-    abstract protected function generateMethod(string $operationName, OperationInterface $operation, array $arguments, string $type, TypeInterface $returnType): string;
+    abstract protected function generateMethod(string $operationName, OperationInterface $operation, array $arguments, string $type, TypeInterface|ContentType $returnType): string;
 
     protected function buildControllerFileName(string $name): string
     {
@@ -184,7 +185,7 @@ protected function buildFolderStructure(SpecificationInterface $specification):
      * @throws InvalidTypeException
      * @throws TypeNotFoundException
      */
-    protected function newType(TypeInterface $type, DefinitionsInterface $definitions): Dto\Type
+    protected function newType(TypeInterface|ContentType $type, DefinitionsInterface $definitions): Dto\Type
     {
         if ($type instanceof ReferenceType) {
             // in case we have a reference type we take a look at the reference, normally this is a struct type but in
@@ -199,9 +200,17 @@ protected function newType(TypeInterface $type, DefinitionsInterface $definition
             }
         }
 
+        if ($type instanceof ContentType) {
+            $dataType = $this->typeGenerator->getContentType($type);
+            $docType = $dataType;
+        } else {
+            $dataType = $this->typeGenerator->getType($type);
+            $docType = $this->typeGenerator->getDocType($type);
+        }
+
         return new Dto\Type(
-            $this->typeGenerator->getType($type),
-            $this->typeGenerator->getDocType($type),
+            $dataType,
+            $docType
         );
     }
 
@@ -242,13 +251,17 @@ private function generateControllerFile(File $file, SpecificationInterface $spec
                     $args[] = $this->generateArgumentBody($variableName, $type->type, $argumentType);
                 }
 
-                $this->resolveImport($argumentType, $imports);
+                if ($argumentType instanceof TypeInterface) {
+                    $this->resolveImport($argumentType, $imports);
+                }
             }
 
             $returnType = $operation->getReturn()->getSchema();
             $type = $this->newType($returnType, $specification->getDefinitions());
 
-            $this->resolveImport($returnType, $imports);
+            if ($returnType instanceof TypeInterface) {
+                $this->resolveImport($returnType, $imports);
+            }
 
             $controller.= $this->generateMethod($operationName, $operation, $args, $type->type, $returnType);
         }

diff --git a/src/Generator/Server/TypeScript.php b/src/Generator/Server/TypeScript.php
@@ -25,6 +25,7 @@
 use PSX\Api\Generator\Server\Dto\Folder;
 use PSX\Api\OperationInterface;
 use PSX\Api\SpecificationInterface;
+use PSX\Schema\ContentType;
 use PSX\Schema\Generator;
 use PSX\Schema\GeneratorInterface as SchemaGeneratorInterface;
 use PSX\Schema\TypeInterface;
@@ -106,27 +107,27 @@ protected function generateFooter(File $file): string
         return $controller;
     }
 
-    protected function generateArgumentPath(string $rawName, string $variableName, string $type, TypeInterface $argumentType): string
+    protected function generateArgumentPath(string $rawName, string $variableName, string $type, TypeInterface|ContentType $argumentType): string
     {
         return '@Param(\'' . $rawName . '\') ' . $variableName . ': ' . $type;
     }
 
-    protected function generateArgumentQuery(string $rawName, string $variableName, string $type, TypeInterface $argumentType): string
+    protected function generateArgumentQuery(string $rawName, string $variableName, string $type, TypeInterface|ContentType $argumentType): string
     {
         return '@Query(\'' . $rawName . '\') ' . $variableName . ': ' . $type;
     }
 
-    protected function generateArgumentHeader(string $rawName, string $variableName, string $type, TypeInterface $argumentType): string
+    protected function generateArgumentHeader(string $rawName, string $variableName, string $type, TypeInterface|ContentType $argumentType): string
     {
         return '@Headers(\'' . $rawName . '\') ' . $variableName . ': ' . $type;
     }
 
-    protected function generateArgumentBody(string $variableName, string $type, TypeInterface $argumentType): string
+    protected function generateArgumentBody(string $variableName, string $type, TypeInterface|ContentType $argumentType): string
     {
         return '@Body() ' . $variableName . ': ' . $type;
     }
 
-    protected function generateMethod(string $operationName, OperationInterface $operation, array $arguments, string $type, TypeInterface $returnType): string
+    protected function generateMethod(string $operationName, OperationInterface $operation, array $arguments, string $type, TypeInterface|ContentType $returnType): string
     {
         $methodName = ucfirst(strtolower($operation->getMethod()));
 

diff --git a/tests/Generator/Server/PHPTest.php b/tests/Generator/Server/PHPTest.php
@@ -59,4 +59,16 @@ public function testGenerateCollection()
         $this->assertFileExists($target . '/src/Controller/Bar.php');
         $this->assertFileExists($target . '/src/Model/Entry.php');
     }
+
+    public function testGenerateContentType()
+    {
+        $generator = new PHP();
+
+        $result = $generator->generate($this->getSpecificationContentType());
+        $target = __DIR__ . '/resource/php_content_type';
+
+        $this->writeChunksToFolder($result, $target);
+
+        $this->assertFileExists($target . '/src/Controller/App.php');
+    }
 }
diff --git a/tests/Generator/Server/TypeScriptTest.php b/tests/Generator/Server/TypeScriptTest.php
@@ -59,4 +59,16 @@ public function testGenerateCollection()
         $this->assertFileExists($target . '/src/controller/bar.controller.ts');
         $this->assertFileExists($target . '/src/dto/Entry.ts');
     }
+
+    public function testGenerateContentType()
+    {
+        $generator = new TypeScript();
+
+        $result = $generator->generate($this->getSpecificationContentType());
+        $target = __DIR__ . '/resource/typescript_content_type';
+
+        $this->writeChunksToFolder($result, $target);
+
+        $this->assertFileExists($target . '/src/controller/app.controller.ts');
+    }
 }
diff --git a/tests/Generator/Server/resource/php_content_type/.env b/tests/Generator/Server/resource/php_content_type/.env
@@ -0,0 +1,7 @@
+APP_URL=http://127.0.0.1/projects/psx/public/
+APP_ENV=dev
+APP_DEBUG=on
+APP_CONNECTION=mysql://root:test1234@localhost/psx
+APP_MAILER=native://default
+SDKGEN_CLIENT_ID=
+SDKGEN_CLIENT_SECRET=