Merge pull request #18 from this-is-raj/master

Feat: added functionality for fetching results in belongs to many rel…

Author: ajayfroiden

src/ApiController.php

@@ -9,7 +9,7 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Froiden\RestAPI\ExtendedRelations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\Relation;
@@ -424,7 +424,7 @@ protected function addIncludes()
 
                         $q->select($fields)
                             ->join(\DB::raw("(" . $outerQuery->toSql() . ") as `outer_query`"), function ($join) use($q) {
-                                $join->on("outer_query.id", "=", $q->getQualifiedRelatedPivotKeyName ());
+                                $join->on("outer_query." . $q->getRelatedKeyName(), "=", $q->getQualifiedRelatedPivotKeyName ());
                                 $join->on("outer_query.whatever", "=", $q->getQualifiedForeignPivotKeyName());
                             })
                             ->setBindings(array_merge($q->getQuery()->getBindings(), $outerQuery->getBindings()))
@@ -870,4 +870,4 @@ protected function setQuery($query) {
     }
 
     //endregion
-}
+}

src/ExtendedRelations/BelongsToMany.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Raj Kumar
+ * Date: 2/12/19
+ * Time: 5:08 PM
+ */
+
+namespace Froiden\RestAPI\ExtendedRelations;
+
+
+use Illuminate\Database\Eloquent\Relations\BelongsToMany as LaravelBelongsToMany;
+
+class BelongsToMany extends LaravelBelongsToMany
+{
+    /**
+     * @return string
+     */
+    public function getRelatedKeyName() {
+        return $this->relatedKey ?: 'id';
+    }
+}