Ignore not found IDs (#39)

Author: ClintWinter

src/Traits/HasCustomFields.php

@@ -69,11 +69,9 @@ public function order($fields)
     protected function validationData(array|null $fields, Collection $customFields): array
     {
         return collect($fields)
-            ->mapWithKeys(function (mixed $field, int $key) use ($customFields) {
-                $id = $customFields->firstOrFail('id', $key)->id;
-
-                return ["field_{$id}" => $field];
-            })->toArray();
+            ->intersectByKeys(array_flip($customFields->modelKeys()))
+            ->mapWithKeys(fn ($v, $k) => ["field_$k" => $v])
+            ->toArray();
     }
 
     protected function validationRules(Collection $fields): array

tests/Feature/CustomFieldControllerTest.php

@@ -93,6 +93,7 @@ public function can_overwrite_response_values()
     /** @test */
     public function invalid_data_throws_validation_exception()
     {
+        /** @var Survey $survey */
         $survey = Survey::create();
         $survey->customfields()->save(
             CustomField::factory()->make([
@@ -119,7 +120,8 @@ public function invalid_data_throws_validation_exception()
                 'custom_fields' => [
                     $fieldId => 'Yeezus',
                 ],
-            ])->assertJsonFragment(["field_1" => ["The selected favorite_album is invalid."]]);
+            ])
+            ->assertJsonFragment(["field_1" => ["The selected favorite_album is invalid."]]);
     }
 
     /** @test */

tests/Feature/HasCustomFieldsTest.php

@@ -27,4 +27,22 @@ public function custom_fields_can_be_created_and_accessed_on_models_with_trait()
         $this->assertCount(1, $model->fresh()->customFields);
         $this->assertEquals('Lil Wayne', $model->fresh()->customFields->first()->description);
     }
+
+    /** @test */
+    public function test_validating_unowned_custom_field_ids_are_ignored()
+    {
+        $model = Survey::create();
+
+        $customField = CustomField::factory()->make([
+            'model_id' => $model->id,
+            'model_type' => get_class($model),
+            'type' => 'text',
+        ]);
+
+        $validator = $model->validateCustomFields([
+            $customField->id + 1 => 'foo',
+        ]);
+
+        $this->assertTrue($validator->passes());
+    }
 }