Merge pull request #4170 from Laravel-Backpack/refresh-the-relation-upon-item-creation

[v5] use a fresh relation instance to create related items

Author: tabacitu

src/app/Library/CrudPanel/Traits/Create.php

@@ -298,12 +298,12 @@ private function createManyEntries($entry, $relation, $relationMethod, $relation
             // we either find the matched entry by local_key (usually `id`)
             // and update the values from the input
             // or create a new item from input
-            $item = $relation->updateOrCreate([$relation_local_key => $relation_local_key_value], $directInputs);
+            $item = $entry->{$relationMethod}()->updateOrCreate([$relation_local_key => $relation_local_key_value], $directInputs);
 
-            // we store the item local key do we can match them with database and check if any item was deleted
+            // we store the item local key so we can match them with database and check if any item was deleted
             $relatedItemsSent[] = $item->{$relation_local_key};
 
-            // create the item relations if any
+            // create the item relations if any.
             $this->createRelationsForItem($item, $relationInputs);
         }
 

tests/Unit/CrudPanel/CrudPanelCreateTest.php

@@ -855,6 +855,7 @@ public function testHasManyCreatableRelationship()
             'remember_token' => null,
             'universes'          => [
                 [
+                    'id' => null,
                     'title' => 'this is the star 1 title',
                 ],
                 [
@@ -872,17 +873,45 @@ public function testHasManyCreatableRelationship()
         $inputData['universes'] = [
             [
                 'id' => 1,
-                'title' => 'only one star with changed title',
+                'title' => 'star 1 with changed title',
+            ],
+            [
+                'id' => 2,
+                'title' => 'star 2 with changed title',
             ],
         ];
 
         $this->crudPanel->update($entry->id, $inputData);
 
-        $this->assertCount(1, $entry->fresh()->universes);
+        $universes = $entry->fresh()->universes;
+        $this->assertCount(2, $universes);
+        $this->assertEquals([1, 2], $universes->pluck('id')->toArray());
+
+        $inputData['universes'] = [
+            [
+                'id' => 1,
+                'title' => 'only one star with changed title',
+            ],
+        ];
+
+        $this->crudPanel->update($entry->id, $inputData);
 
         $this->assertEquals($inputData['universes'][0]['title'], $entry->fresh()->universes->first()->title);
         $this->assertEquals($inputData['universes'][0]['id'], $entry->fresh()->universes->first()->id);
         $this->assertEquals(1, Universe::all()->count());
+
+        $inputData['universes'] = [
+            [
+                'id' => null,
+                'title' => 'new star 3',
+            ],
+        ];
+
+        $this->crudPanel->update($entry->id, $inputData);
+
+        $this->assertEquals($inputData['universes'][0]['title'], $entry->fresh()->universes->first()->title);
+        $this->assertEquals(3, $entry->fresh()->universes->first()->id);
+        $this->assertEquals(1, Universe::all()->count());
     }
 
     public function testHasManySelectableRelationshipWithoutForceDelete()