Fix alias for allowed includes

src/AllowedInclude.php

@@ -31,13 +31,24 @@ public static function relationship(string $name, ?string $internalName = null):
         $internalName = Str::camel($internalName ?? $name);
 
         return IncludedRelationship::getIndividualRelationshipPathsFromInclude($internalName)
-            ->flatMap(function (string $relationship) use ($name, $internalName): Collection {
-                return collect([
-                    new self($relationship, new IncludedRelationship(), $relationship === $internalName ? $internalName : null),
-                ])
-                    ->when(! Str::contains($relationship, '.'), function (Collection $includes) use ($internalName, $relationship) {
-                        return $includes->merge(self::count("{$relationship}Count", $relationship === $internalName ? "{$internalName}Count" : null));
-                    });
+            ->zip(IncludedRelationship::getIndividualRelationshipPathsFromInclude($name))
+            ->flatMap(function ($args): Collection {
+                [$relationship, $alias] = $args;
+
+                $includes = collect([
+                    new self($alias, new IncludedRelationship, $relationship),
+                ]);
+
+                if (! Str::contains($relationship, '.')) {
+                    $suffix = config('query-builder.count_suffix');
+
+                    $includes = $includes->merge(self::count(
+                        $alias.$suffix,
+                        $relationship.$suffix
+                    ));
+                }
+
+                return $includes;
             });
     }
 

src/Concerns/AddsIncludesToQuery.php

@@ -19,6 +19,10 @@ public function allowedIncludes($includes): self
 
         $this->allowedIncludes = collect($includes)
             ->flatMap(function ($include): Collection {
+                if ($include instanceof Collection) {
+                    return $include;
+                }
+
                 if ($include instanceof IncludeInterface) {
                     return collect([$include]);
                 }

src/Includes/IncludedRelationship.php

@@ -33,7 +33,7 @@ public function __invoke(Builder $query, string $relationship)
     public static function getIndividualRelationshipPathsFromInclude(string $include): Collection
     {
         return collect(explode('.', $include))
-            ->reduce(function ($includes, $relationship) {
+            ->reduce(function (Collection $includes, string $relationship) {
                 if ($includes->isEmpty()) {
                     return $includes->push($relationship);
                 }

tests/IncludeTest.php

@@ -280,6 +280,26 @@ public function an_invalid_include_query_exception_contains_the_unknown_and_allo
         $this->assertEquals(['allowed include'], $exception->allowedIncludes->all());
     }
 
+    /** @test */
+    public function it_can_alias_multiple_allowed_includes()
+    {
+        $request = new Request([
+            'include' => 'relatedModelsCount,relationShipAlias',
+        ]);
+
+        $models = QueryBuilder::for(TestModel::class, $request)
+            ->allowedIncludes([
+                AllowedInclude::count('relatedModelsCount'),
+                AllowedInclude::relationship('relationShipAlias', 'otherRelatedModels'),
+            ])
+            ->get();
+
+        $this->assertRelationLoaded($models, 'otherRelatedModels');
+        $models->each(function ($model) {
+            $this->assertNotNull($model->related_models_count);
+        });
+    }
+
     protected function createQueryFromIncludeRequest(string $includes): QueryBuilder
     {
         $request = new Request([