[graphql] @sortBy: MorphOne sorting fix.

Author: LastDragon-ru

src/SortBy/SortBuilder.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Query\JoinClause;
 use LastDragon_ru\LaraASP\GraphQL\Helpers\ModelHelper;
 use LastDragon_ru\LaraASP\GraphQL\PackageTranslator;
 use LogicException;
@@ -157,7 +158,7 @@ protected function processRelation(
                         ? "{$parentAlias}.{$relation->getForeignKeyName()}"
                         : $relation->getQualifiedForeignKeyName(),
                 );
-            } elseif ($relation instanceof HasOne || $relation instanceof MorphOne) {
+            } elseif ($relation instanceof HasOne) {
                 $builder = $builder->leftJoinSub(
                     $relation->getQuery(),
                     $alias,
@@ -167,6 +168,25 @@ protected function processRelation(
                         ? "{$parentAlias}.{$relation->getLocalKeyName()}"
                         : $relation->getQualifiedParentKeyName(),
                 );
+            } elseif ($relation instanceof MorphOne) {
+                $builder = $builder->leftJoinSub(
+                    $relation->getQuery(),
+                    $alias,
+                    static function (JoinClause $join) use ($relation, $alias, $parentAlias): void {
+                        $join->on(
+                            "{$alias}.{$relation->getForeignKeyName()}",
+                            '=',
+                            $parentAlias
+                                ? "{$parentAlias}.{$relation->getLocalKeyName()}"
+                                : $relation->getQualifiedParentKeyName(),
+                        );
+                        $join->where(
+                            "{$alias}.{$relation->getMorphType()}",
+                            '=',
+                            $relation->getMorphClass(),
+                        );
+                    },
+                );
             } else {
                 throw new LogicException('O_o => Please contact to developer.');
             }

src/SortBy/SortBuilderTest.php

@@ -190,9 +190,9 @@ static function (): EloquentBuilder {
                         ' "table_alias_1"."name" as "table_alias_1_name",'.
                         ' "table_alias_1"."created_at" as "table_alias_1_created_at" '.
                         'from "table_a" '.
-                        'left join (select * from "table_b" where "table_b"."id" = ? and "a" = ?)'.
+                        'left join (select * from "table_b" where "a" = ?)'.
                         ' as "table_alias_0" on "table_alias_0"."id" = "table_a"."belongs_to_b_id" '.
-                        'left join (select * from "table_c" where "table_c"."id" = ?)'.
+                        'left join (select * from "table_c")'.
                         ' as "table_alias_1" on "table_alias_1"."id" = "table_alias_0"."belongs_to_c_id" '.
                         'order by'.
                         ' "table_alias_0_name" asc,'.
@@ -201,9 +201,7 @@ static function (): EloquentBuilder {
                         ' "table_alias_1_created_at" desc,'.
                         ' "table_a"."name" asc',
                     'bindings' => [
-                        34,
                         'a',
-                        78,
                     ],
                 ],
                 static function (): EloquentBuilder {
@@ -242,10 +240,9 @@ static function (): EloquentBuilder {
                         ' "table_alias_1"."created_at" as "table_alias_1_created_at" '.
                         'from "table_a" '.
                         'left join (select * from "table_b" where'.
-                        ' "table_b"."model_a_id" = ? and "table_b"."model_a_id" is not null and "b" = ?'.
+                        ' "b" = ?'.
                         ') as "table_alias_0" on "table_alias_0"."model_a_id" = "table_a"."id" '.
-                        'left join (select * from "table_c" where'.
-                        ' "table_c"."model_b_id" = ? and "table_c"."model_b_id" is not null'.
+                        'left join (select * from "table_c"'.
                         ') as "table_alias_1" on "table_alias_1"."model_b_id" = "table_alias_0"."id" '.
                         'order by'.
                         ' "table_alias_0_name" asc,'.
@@ -254,9 +251,7 @@ static function (): EloquentBuilder {
                         ' "table_alias_1_created_at" desc,'.
                         ' "table_a"."name" asc',
                     'bindings' => [
-                        12,
                         'b',
-                        56,
                     ],
                 ],
                 static function (): EloquentBuilder {
@@ -295,24 +290,21 @@ static function (): EloquentBuilder {
                         ' "table_alias_1"."created_at" as "table_alias_1_created_at" '.
                         'from "table_a" '.
                         'left join (select * from "table_b" where'.
-                        ' "table_b"."morphable_a_id" = ? and "table_b"."morphable_a_id" is not null and'.
-                        ' "table_b"."morphable_a_type" = ? and "c" = ?'.
-                        ') as "table_alias_0" on "table_alias_0"."morphable_a_id" = "table_a"."id" '.
-                        'left join (select * from "table_c" where'.
-                        ' "table_c"."morphable_b_id" = ? and "table_c"."morphable_b_id" is not null and'.
-                        ' "table_c"."morphable_b_type" = ?'.
-                        ') as "table_alias_1" on "table_alias_1"."morphable_b_id" = "table_alias_0"."id" '.
+                        ' "c" = ?'.
+                        ') as "table_alias_0" on "table_alias_0"."morphable_a_id" = "table_a"."id" and'.
+                        ' "table_alias_0"."morphable_a_type" = ? '.
+                        'left join (select * from "table_c"'.
+                        ') as "table_alias_1" on "table_alias_1"."morphable_b_id" = "table_alias_0"."id" and'.
+                        ' "table_alias_1"."morphable_b_type" = ? '.
                         'order by'.
                         ' "table_alias_0_name" asc,'.
                         ' "table_alias_0_created_at" desc,'.
                         ' "table_alias_1_name" desc,'.
                         ' "table_alias_1_created_at" desc,'.
                         ' "table_a"."name" asc',
                     'bindings' => [
-                        12,
-                        SortBuilderTest__ModelA::class,
                         'c',
-                        56,
+                        SortBuilderTest__ModelA::class,
                         SortBuilderTest__ModelB::class,
                     ],
                 ],