cleanup hasOne and belongsToOne

TypeRocket · Aug 5, 2022 · 9f0b0a4 · 9f0b0a4
1 parent bac282d
commit 9f0b0a4
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/Models/Model.php b/src/Models/Model.php
@@ -1967,15 +1967,14 @@ public function getCast( $property )
      */
     public function hasOne($modelClass, $id_foreign = null, $scope = null)
     {
-        $id = $this->getID();
+        /** @var Model $relationship */
+        $relationship = new $modelClass;
+        $relationship->setRelatedModel( $this );
 
         if( ! $id_foreign && $this->resource ) {
             $id_foreign = $this->resource . '_id';
         }
 
-        /** @var Model $relationship */
-        $relationship = new $modelClass;
-        $relationship->setRelatedModel( $this );
         $relationship->relatedBy = [
             'type' => 'hasOne',
             'query' => [
@@ -1986,7 +1985,12 @@ public function hasOne($modelClass, $id_foreign = null, $scope = null)
             ]
         ];
 
-        return $relationship->findAll()->where( $id_foreign, $id)->take(1);
+        if(is_callable($scope)) {
+            $scope($relationship);
+        }
+
+        $id = $this->getID();
+        return $relationship->where( $id_foreign, $id)->take(1);
     }
 
     /**
@@ -2003,6 +2007,11 @@ public function belongsTo($modelClass, $id_local = null, $scope = null)
         /** @var Model $relationship */
         $relationship = new $modelClass;
         $relationship->setRelatedModel( $this );
+
+        if( ! $id_local && $relationship->resource ) {
+            $id_local = $relationship->resource . '_id';
+        }
+
         $relationship->relatedBy = [
             'type' => 'belongsTo',
             'query' => [
@@ -2013,8 +2022,8 @@ public function belongsTo($modelClass, $id_local = null, $scope = null)
             ]
         ];
 
-        if( ! $id_local && $relationship->resource ) {
-            $id_local = $relationship->resource . '_id';
+        if(is_callable($scope)) {
+            $scope($relationship);
         }
 
         $id = $this->getProperty( $id_local );