getDto() function now firstly tries to retrieve the Transformer DTO i…

…f it is attached.

src/Http/Handlers.php

@@ -10,6 +10,7 @@
 use Illuminate\Routing\Router;
 use Illuminate\Support\Str;
 use Rupadana\ApiService\ApiService;
+use Rupadana\ApiService\Attributes\UsesDTO;
 use Rupadana\ApiService\Exceptions\TransformerNotFoundException;
 use Rupadana\ApiService\Traits\HasHandlerTenantScope;
 use Rupadana\ApiService\Contracts\HasAllowedFields;
@@ -104,9 +105,15 @@ public static function getModel()
 
     public static function getDto(): ?string
     {
-        $modelReflection = new ReflectionClass(static::getModel());
-        if (property_exists(static::getModel(), 'dataClass')) {
-            return $modelReflection->getProperty('dataClass')->getDefaultValue();
+        $transformerReflection = new ReflectionClass(static::getApiTransformer());
+        $transformerAttributes = $transformerReflection->getAttributes(UsesDTO::class);
+        if (!empty($transformerAttributes)) {
+            return $transformerAttributes[0]->newInstance()->dtoClass;
+        } else {
+            $modelReflection = new ReflectionClass(static::getModel());
+            if (property_exists(static::getModel(), 'dataClass')) {
+                return $modelReflection->getProperty('dataClass')->getDefaultValue();
+            }
         }
         return null;
     }

stubs/ApiTransformer.stub

@@ -2,7 +2,6 @@
 namespace {{ namespace }};
 
 {{ dtoNamespace }}
-
 use Rupadana\ApiService\Attributes\UsesDTO;
 use Illuminate\Http\Resources\Json\JsonResource;