Fix - Relationship Mocking (#10)

* Make changes * Fix issues
VATSIM-UK · Feb 16, 2020 · 28760d6 · 28760d6
1 parent 0204cff
commit 28760d6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Models/Relationships/RemoteRelationshipBuilder.php b/src/Models/Relationships/RemoteRelationshipBuilder.php
@@ -105,7 +105,8 @@ public function getModels($columns = ['*'])
             $pivotAttributes = collect($results->firstWhere($details->relatedPivotKey, $model->getKey()))->mapWithKeys(function ($value, $key) {
                 return ['pivot_' . $key => $value];
             });
-            return $model->setRawAttributes($pivotAttributes->all());
+
+            return $model->setRawAttributes(array_merge($pivotAttributes->all(), $model->getAttributes()));
         });
 
         return $models->all();
@@ -245,4 +246,4 @@ private function determineParentModelKey(): ?string
     {
         return isset($this->query->wheres[0]['value']) ? $this->query->wheres[0]['value'] : $this->query->wheres[0]['values'][0];
     }
-}
+}