No dto if no request data (#14)

onmoon · Jan 24, 2020 · ef2eb32 · ef2eb32
1 parent 30f5b5d
commit ef2eb32
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 29 deletions.
diff --git a/src/CodeGenerator/Dto/PhpParserRootDtoFactory.php b/src/CodeGenerator/Dto/PhpParserRootDtoFactory.php
@@ -97,7 +97,7 @@ public function generateRootDto(
         }
 
         if (count($queryParameters)) {
-            $queryParametersDtoClassName = rtrim($className, 'Dto') . self::QUERY_PARAMETERS_PREFIX;
+            $queryParametersDtoClassName = preg_replace('/Dto$/', '', $className)  . self::QUERY_PARAMETERS_PREFIX;
             $queryParametersDtoFileName  = $queryParametersDtoClassName . '.php';
 
             $generatedClasses[] = $this->dtoFactory->generateParamDto(

diff --git a/src/Command/GenerateApiCodeCommand.php b/src/Command/GenerateApiCodeCommand.php
@@ -222,37 +222,41 @@ protected function execute(InputInterface $input, OutputInterface $output) : ?in
 
                     // Root dto generation
 
-                    $dtoNamespace = $this->namingStrategy->buildNamespace(
-                        $operationNamespace,
-                        self::DTO_NAMESPACE,
-                        self::REQUEST_SUFFIX
-                    );
-                    $dtoClassName = $this->namingStrategy->stringToNamespace(
-                        $operationName . self::REQUEST_SUFFIX . self::DTO_SUFFIX
-                    );
-                    $dtoPath      = $this->namingStrategy->buildPath(
-                        $operationPath, self::DTO_NAMESPACE, self::REQUEST_SUFFIX
-                    );
-                    $dtoFileName  = $dtoClassName . '.php';
+                    $parameters = array_merge($pathItem->parameters, $operation->parameters);
 
-                    $rootDtoNamespace = $dtoNamespace;
-                    $rootDtoClassName = $dtoClassName;
+                    if(count($parameters) or !is_null($inputDtoClassName)) {
 
-                    $parameters = array_merge($pathItem->parameters, $operation->parameters);
+                        $dtoNamespace = $this->namingStrategy->buildNamespace(
+                            $operationNamespace,
+                            self::DTO_NAMESPACE,
+                            self::REQUEST_SUFFIX
+                        );
+                        $dtoClassName = $this->namingStrategy->stringToNamespace(
+                            $operationName . self::REQUEST_SUFFIX . self::DTO_SUFFIX
+                        );
+                        $dtoPath = $this->namingStrategy->buildPath(
+                            $operationPath, self::DTO_NAMESPACE, self::REQUEST_SUFFIX
+                        );
+                        $dtoFileName = $dtoClassName . '.php';
+
+                        $rootDtoNamespace = $dtoNamespace;
+                        $rootDtoClassName = $dtoClassName;
+
+                        $filesToGenerate = array_merge(
+                            $filesToGenerate,
+                            $this->rootDtoFactory->generateRootDto(
+                                $dtoPath,
+                                $dtoFileName,
+                                $dtoNamespace,
+                                $dtoClassName,
+                                $inputDtoNamespace,
+                                $inputDtoClassName,
+                                $this->filterAllowedParameters($parameters, 'path'),
+                                $this->filterAllowedParameters($parameters, 'query')
+                            )
+                        );
 
-                    $filesToGenerate = array_merge(
-                        $filesToGenerate,
-                        $this->rootDtoFactory->generateRootDto(
-                            $dtoPath,
-                            $dtoFileName,
-                            $dtoNamespace,
-                            $dtoClassName,
-                            $inputDtoNamespace,
-                            $inputDtoClassName,
-                            $this->filterAllowedParameters($parameters, 'path'),
-                            $this->filterAllowedParameters($parameters, 'query')
-                        )
-                    );
+                    }
 
                     // Service interface generation