refactor

src/Abstract/Models/BaseModel.php

@@ -2,12 +2,12 @@
 
 namespace Apiato\Abstract\Models;
 
-use Apiato\Contracts\Resource;
+use Apiato\Http\Resources\ResourceKeyAware;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model as LaravelEloquentModel;
 use Illuminate\Support\Str;
 
-abstract class BaseModel extends LaravelEloquentModel implements Resource
+abstract class BaseModel extends LaravelEloquentModel implements ResourceKeyAware
 {
     use HasFactory;
 

src/Http/Resources/Collection.php

@@ -2,10 +2,9 @@
 
 namespace Apiato\Http\Resources;
 
-use Apiato\Contracts\Resource;
 use League\Fractal\Resource\Collection as FractalCollection;
 
-final class Collection extends FractalCollection
+final class Collection extends FractalCollection implements ResourceKeyAware
 {
     public function getResourceKey(): string
     {
@@ -25,7 +24,7 @@ public function getResourceKey(): string
             $resource = $resource->current();
         }
 
-        if ($resource instanceof Resource) {
+        if ($resource instanceof ResourceKeyAware) {
             return $resource->getResourceKey();
         }
 

src/Http/Resources/Item.php

@@ -2,18 +2,17 @@
 
 namespace Apiato\Http\Resources;
 
-use Apiato\Contracts\Resource;
 use League\Fractal\Resource\Item as FractalItem;
 
-final class Item extends FractalItem
+final class Item extends FractalItem implements ResourceKeyAware
 {
     public function getResourceKey(): string
     {
         if (!is_null($this->resourceKey)) {
             return $this->resourceKey;
         }
 
-        if ($this->data instanceof Resource) {
+        if ($this->data instanceof ResourceKeyAware) {
             return $this->data->getResourceKey();
         }
 

src/Contracts/Resource.php → src/Http/Resources/ResourceKeyAware.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Apiato\Contracts;
+namespace Apiato\Http\Resources;
 
-interface Resource
+interface ResourceKeyAware
 {
     /**
      * Get the resource key to be used for the response serialization.

src/Http/Response.php

@@ -43,7 +43,7 @@ public static function getRequestedIncludes(): array
 
     public function createData(): Scope
     {
-        $this->withResourceName($this->defaultResourceName());
+        $this->withResourceName($this->resourceKeyOrDefault());
         $this->setAvailableIncludesMeta();
 
         return parent::createData();
@@ -62,14 +62,14 @@ public function getResourceClass(): string
         return parent::getResourceClass();
     }
 
-    private function defaultResourceName(): string
+    private function resourceKeyOrDefault(): string
     {
         $resourceName = $this->getResourceName();
-        if (!is_null($resourceName)) {
-            return $resourceName;
+        if (is_null($resourceName)) {
+            return $this->getResource()->getResourceKey();
         }
 
-        return $this->getResource()->getResourceKey();
+        return $resourceName;
     }
 
     private function setAvailableIncludesMeta(): void