Fix sql ambiguous error for related id

Author: Admin

src/Http/Controllers/ResourceControllerTrait.php

@@ -263,10 +263,8 @@ public function getRelated(
         string $relatedIdentifier
     ): JsonResponse {
         try {
-            return $this->getRelatedController(
-                $this->getRelatedFromRelation($identifier, $relation, $relatedIdentifier),
-                $relation
-            )->get($relatedIdentifier, $request);
+            return $this->getRelatedController($identifier, $relation, $relatedIdentifier)
+                ->get($relatedIdentifier, $request);
         } catch (\Throwable $e) {
             if (!$e instanceof ModelNotFoundException) {
                 Log::error($this->label . '/' . $identifier . '/' . $relation . '/' . $relatedIdentifier .
@@ -287,10 +285,8 @@ public function updateRelated(
         string $relatedIdentifier
     ): JsonResponse {
         try {
-            return $this->getRelatedController(
-                $this->getRelatedFromRelation($identifier, $relation, $relatedIdentifier),
-                $relation
-            )->update($relatedIdentifier, $request);
+            return $this->getRelatedController($identifier, $relation, $relatedIdentifier)
+                ->update($relatedIdentifier, $request);
         } catch (\Throwable $e) {
             if (!$e instanceof ModelNotFoundException) {
                 Log::error($this->label . '/' . $identifier . '/' . $relation . '/' . $relatedIdentifier .
@@ -307,10 +303,8 @@ public function updateRelated(
     public function deleteRelated(string $identifier, string $relation, string $relatedIdentifier): JsonResponse
     {
         try {
-            return $this->getRelatedController(
-                $this->getRelatedFromRelation($identifier, $relation, $relatedIdentifier),
-                $relation
-            )->delete($relatedIdentifier);
+            return $this->getRelatedController($identifier, $relation, $relatedIdentifier)
+                ->delete($relatedIdentifier);
         } catch (\Throwable $e) {
             if (!$e instanceof ModelNotFoundException) {
                 Log::error($this->label . '/' . $identifier . '/' . $relation . '/' . $relatedIdentifier .
@@ -467,8 +461,12 @@ protected function throwIfForbidden(bool $condition): void
      * @return self
      * @throws \Throwable
      */
-    protected function getRelatedController(BaseModel $related, string $relation): object
-    {
+    protected function getRelatedController(
+        string $identifier,
+        string $relation,
+        string $relatedIdentifier
+    ): object {
+        $related = $this->getRelatedFromRelation($identifier, $relation, $relatedIdentifier);
         $controllerFqn = (string)($this->modelFqnToControllerMap[$related::class] ??
             ($this->relatedModelFqnToControllerMap[$related::class] ?? ''));
 
@@ -497,12 +495,12 @@ protected function getRelatedFromRelation(
 
         foreach ($related->getPrimaryKeyFilter() as $column => $value) {
             if (!\is_array($value) && \is_string($column)) {
-                $pks[] = $column;
+                $pks[] = $related->qualifyColumn($column);
 
                 continue;
             }
 
-            $pks[] = \reset($value);
+            $pks[] = $related->qualifyColumn(\reset($value));
         }
 
         if (