Feature JoinRelationship Flexibility Initial Model #197

kirschbaum-development · Jan 27, 2025 · 62a45d3 · 62a45d3
1 parent 3c1af9b
commit 62a45d3
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/src/Mixins/JoinRelationship.php b/src/Mixins/JoinRelationship.php
@@ -98,22 +98,32 @@ public function joinRelationship(): Closure
             bool $useAlias = false,
             bool $disableExtraConditions = false,
             ?string $morphable = null,
+            ?string $initialModel = null,
         ) {
             $joinType = JoinsHelper::$joinMethodsMap[$joinType] ?? $joinType;
             $useAlias = is_string($callback) ? false : $useAlias;
-            $joinHelper = JoinsHelper::make($this->getModel());
+            $currentModel = $initialModel ? (new $initialModel) : $this->getModel();
+            $joinHelper = JoinsHelper::make($currentModel);
             $callback = $joinHelper->formatJoinCallback($callback);
 
             $this->getQuery()->beforeQuery(function () use ($joinHelper) {
                 $joinHelper->clear();
             });
 
             if (is_null($this->getSelect())) {
-                $this->select(sprintf('%s.*', $this->getModel()->getTable()));
+                $this->select(sprintf('%s.*', $currentModel->getTable()));
             }
 
             if (Str::contains($relationName, '.')) {
-                $this->joinNestedRelationship($relationName, $callback, $joinType, $useAlias, $disableExtraConditions, $morphable);
+                $this->joinNestedRelationship(
+                    $relationName, 
+                    $callback, 
+                    $joinType, 
+                    $useAlias, 
+                    $disableExtraConditions, 
+                    $morphable,
+                    $initialModel
+                );
 
                 return $this;
             }
@@ -123,7 +133,7 @@ public function joinRelationship(): Closure
                 $relationCallback = $callback[$relationName];
             }
 
-            $relation = $this->getModel()->{$relationName}();
+            $relation = $currentModel->{$relationName}();
             $relationQuery = $relation->getQuery();
             $alias = $joinHelper->getAliasName(
                 $useAlias,
@@ -151,15 +161,15 @@ public function joinRelationship(): Closure
                 ? "{$aliasString}.{$relationQuery->getModel()->getTable()}.{$relationName}"
                 : "{$relationQuery->getModel()->getTable()}.{$relationName}";
 
-            if ($joinHelper->relationshipAlreadyJoined($this->getModel(), $relationJoinCache)) {
+            if ($joinHelper->relationshipAlreadyJoined($currentModel, $relationJoinCache)) {
                 return $this;
             }
 
             if ($useAlias) {
                 StaticCache::setTableAliasForModel($relation->getModel(), $alias);
             }
 
-            $joinHelper->markRelationshipAsAlreadyJoined($this->getModel(), $relationJoinCache);
+            $joinHelper->markRelationshipAsAlreadyJoined($currentModel, $relationJoinCache);
             StaticCache::clear();
 
             $relation->performJoinForEloquentPowerJoins(
@@ -259,9 +269,11 @@ public function joinNestedRelationship(): Closure
             bool $useAlias = false,
             bool $disableExtraConditions = false,
             ?string $morphable = null,
+            ?string $initialModel = null,
         ) {
             $relations = explode('.', $relationships);
-            $joinHelper = JoinsHelper::make($this->getModel());
+            $currentModel = $initialModel ? (new $initialModel) : $this->getModel();
+            $joinHelper = JoinsHelper::make($currentModel);
             /** @var Relation */
             $latestRelation = null;
 
@@ -270,7 +282,7 @@ public function joinNestedRelationship(): Closure
                 $part[] = $relationName;
                 $fullRelationName = join('.', $part);
 
-                $currentModel = $latestRelation ? $latestRelation->getModel() : $this->getModel();
+                $currentModel = $latestRelation ? $latestRelation->getModel() : $currentModel;
                 $relation = $currentModel->{$relationName}();
                 $relationCallback = null;
 
@@ -319,7 +331,7 @@ public function joinNestedRelationship(): Closure
                     StaticCache::setTableAliasForModel($relation->getModel(), $alias);
                 }
 
-                if ($joinHelper->relationshipAlreadyJoined($this->getModel(), $relationJoinCache)) {
+                if ($joinHelper->relationshipAlreadyJoined($currentModel, $relationJoinCache)) {
                     $latestRelation = $relation;
 
                     continue;
@@ -335,7 +347,7 @@ public function joinNestedRelationship(): Closure
                 );
 
                 $latestRelation = $relation;
-                $joinHelper->markRelationshipAsAlreadyJoined($this->getModel(), $relationJoinCache);
+                $joinHelper->markRelationshipAsAlreadyJoined($currentModel, $relationJoinCache);
             }
 
             StaticCache::clear();