[JSON:API] add tests for type, included merge and id in attributes

src/Illuminate/Http/Resources/JsonApi/Concerns/ResolvesJsonApiElements.php

@@ -53,6 +53,10 @@ public function resolveResourceData(Request $request): array
      */
     protected function resolveResourceIdentifier(Request $request): string
     {
+        if (! is_null($resourceId = $this->id($request))) {
+            return $resourceId;
+        }
+
         if (! $this->resource instanceof Model) {
             throw ResourceIdentificationException::attemptingToDetermineIdFor($this);
         }
@@ -68,6 +72,10 @@ protected function resolveResourceIdentifier(Request $request): string
      */
     protected function resolveResourceType(Request $request): string
     {
+        if (! is_null($resourceType = $this->type($request))) {
+            return $resourceType;
+        }
+
         if (! $this->resource instanceof Model) {
             throw ResourceIdentificationException::attemptingToDetermineTypeFor($this);
         }
@@ -219,8 +227,10 @@ protected static function resourceTypeFromModel(Model $model): string
 
         $morphMap = Relation::getMorphAlias($modelClassName);
 
-        return Str::of(
-            $morphMap !== $modelClassName ? $morphMap : class_basename($modelClassName)
-        )->snake()->pluralStudly();
+        if ($morphMap !== $modelClassName) {
+            return Str::of($morphMap)->pluralStudly();
+        }
+
+        return Str::of($modelClassName)->classBasename()->snake()->pluralStudly();
     }
 }

src/Illuminate/Http/Resources/JsonApi/JsonApiResource.php

@@ -54,21 +54,21 @@ public static function configure(?string $version = null, array $ext = [], array
     /**
      * Get the resource's ID.
      *
-     * @return string
+     * @return string|null
      */
     public function id(Request $request)
     {
-        return $this->resolveResourceIdentifier($request);
+        return null;
     }
 
     /**
      * Get the resource's type.
      *
-     * @return string
+     * @return string|null
      */
     public function type(Request $request)
     {
-        return $this->resolveResourceType($request);
+        return null;
     }
 
     /**

tests/Http/Resources/JsonApi/JsonApiResourceTest.php

@@ -3,16 +3,40 @@
 namespace Illuminate\Tests\Http\Resources\JsonApi;
 
 use BadMethodCallException;
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Routing\ResponseFactory as ResponseFactoryContract;
+use Illuminate\Contracts\View\Factory as ViewFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\JsonApi\JsonApiResource;
+use Illuminate\Routing\Redirector;
+use Illuminate\Routing\ResponseFactory;
+use Mockery as m;
 use PHPUnit\Framework\TestCase;
 
 class JsonApiResourceTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        Relation::morphMap(['json-api-model' => JsonApiModel::class]);
+
+        $container = Container::setInstance(new Container);
+        $container->instance(ResponseFactoryContract::class, new ResponseFactory(
+            m::mock(ViewFactory::class),
+            m::mock(Redirector::class)
+        ));
+    }
+
     protected function tearDown(): void
     {
         JsonResource::flushState();
         JsonApiResource::flushState();
+        Relation::morphMap([], false);
+
+        Container::setInstance(null);
+        m::close();
     }
 
     public function testResponseWrapperIsHardCodedToData()
@@ -37,4 +61,54 @@ public function testUnableToUnsetWrapper()
 
         JsonApiResource::withoutWrapping();
     }
+
+    public function testResourceTypeIsPickedFromMorph()
+    {
+        $model = new JsonApiModel(['id' => 1, 'name' => 'User']);
+
+        $responseData = $this->fakeJsonApiResponseForModel($model)['data'];
+
+        $this->assertArrayHasKey('type', $responseData);
+        $this->assertSame('json-api-models', $responseData['type']);
+    }
+
+    public function testIncludedResourceDoesNotContainPrimaryKey()
+    {
+        $model = new JsonApiModel(['id' => 1, 'name' => 'User']);
+        $model->setRelation('manager', new JsonApiModel(['id' => 2, 'name' => 'Manager']));
+        $model->setRelation('deputy', new JsonApiModel(['id' => 2, 'email' => '[email protected]']));
+
+        $responseData = $this->fakeJsonApiResponseForModel($model);
+        $this->assertArrayNotHasKey('id', $responseData['included'][0]['attributes']);
+    }
+
+    public function testIncludedMatchingResourceAttributesAreMerged()
+    {
+        $model = new JsonApiModel(['id' => 1, 'name' => 'User']);
+        $model->setRelation('manager', new JsonApiModel(['id' => 2, 'name' => 'Manager']));
+        $model->setRelation('deputy', new JsonApiModel(['id' => 2, 'email' => '[email protected]']));
+
+        $responseData = $this->fakeJsonApiResponseForModel($model);
+
+        $this->assertEquals([
+            'id' => '2',
+            'type' => 'json-api-models',
+            'attributes' => [
+                'name' => 'Manager',
+                'email' => '[email protected]',
+            ],
+        ], $responseData['included'][0]);
+    }
+
+    protected function fakeJsonApiResponseForModel(Model $model): array
+    {
+        return (new JsonApiResource($model))
+            ->toResponse(new Request)
+            ->getData(true);
+    }
+}
+
+class JsonApiModel extends Model
+{
+    protected $guarded = [];
 }