bugfixes: BulkInit had no casting

readme for production

Author: matteoc99

README.md

@@ -1,7 +1,3 @@
-#  
-
-# work in progress
-
 # Laravel User Preferences
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/matteoc99/laravel-preference.svg?style=flat-square)](https://packagist.org/packages/matteoc99/laravel-preference)
@@ -223,7 +219,7 @@ class MyRule extends DataRule
 
 ## Test
 
-`composer test ./tests`
+`composer test <path>`
 
 ## Security Vulnerabilities
 
@@ -232,6 +228,7 @@ Please review [our security policy](SECURITY.md) on how to report security vulne
 ## Credits
 
 - [matteoc99](https://github.com/mattoc99)
+- [Joel Brown](https://stackoverflow.com/users/659653/joel-brown) for [this](https://stackoverflow.com/questions/10204902/database-design-for-user-settings/10228192#10228192) awesome starting point and initial inspiration
 
 ## License
 

src/Casts/EnumCaster.php

@@ -12,7 +12,7 @@ class EnumCaster implements CastsAttributes
 {
 
 
-    public function get(Model $model, string $key, mixed $value, array $attributes): CastableEnum|null
+    public function get(?Model $model, string $key, mixed $value, array $attributes): CastableEnum|null
     {
         return $this->deserializeEnum($value);
     }
@@ -33,7 +33,7 @@ protected function deserializeEnum($value)
         return $enumClass::tryFrom($value['value']);
     }
 
-    public function set(Model $model, string $key, mixed $value, array $attributes)
+    public function set(?Model $model, string $key, mixed $value, array $attributes)
     {
         return json_encode($this->serializeEnum($value));
     }

src/Casts/RuleCaster.php

@@ -10,7 +10,7 @@
 
 class RuleCaster implements CastsAttributes
 {
-    public function get(Model $model, string $key, mixed $value, array $attributes)
+    public function get(?Model $model, string $key, mixed $value, array $attributes)
     {
         return $this->deserializerRule($value);
     }
@@ -38,7 +38,7 @@ protected function deserializerRule($value)
         return $rule;
     }
 
-    public function set(Model $model, string $key, mixed $value, array $attributes)
+    public function set(?Model $model, string $key, mixed $value, array $attributes)
     {
         return json_encode($this->serializeRule($value));
     }

src/Casts/ValueCaster.php

@@ -9,7 +9,9 @@
 class ValueCaster implements CastsAttributes
 {
 
-    public function get(Model $model, string $key, mixed $value, array $attributes)
+    public function __construct(protected ?CastableEnum $caster = null) { }
+
+    public function get(?Model $model, string $key, mixed $value, array $attributes)
     {
         $caster = $this->getCaster($model);
 
@@ -22,7 +24,7 @@ public function get(Model $model, string $key, mixed $value, array $attributes)
 
     }
 
-    public function set(Model $model, string $key, mixed $value, array $attributes)
+    public function set(?Model $model, string $key, mixed $value, array $attributes)
     {
         $caster = $this->getCaster($model);
 
@@ -34,9 +36,9 @@ public function set(Model $model, string $key, mixed $value, array $attributes)
         return $value;
     }
 
-    private function getCaster(Model $model): CastableEnum|null
+    private function getCaster(?Model $model): CastableEnum|null
     {
-        $caster = $model->cast ?? $model->preference?->cast ?? null;
+        $caster = $this->caster ?? $model?->cast ?? $model?->preference?->cast ?? null;
 
         return $caster instanceof CastableEnum ? $caster : null;
     }

src/Factory/PreferenceBuilder.php

@@ -3,6 +3,9 @@
 namespace Matteoc99\LaravelPreference\Factory;
 
 use Illuminate\Database\Eloquent\Builder;
+use Matteoc99\LaravelPreference\Casts\EnumCaster;
+use Matteoc99\LaravelPreference\Casts\RuleCaster;
+use Matteoc99\LaravelPreference\Casts\ValueCaster;
 use Matteoc99\LaravelPreference\Contracts\CastableEnum;
 use Matteoc99\LaravelPreference\Contracts\HasValidation;
 use Matteoc99\LaravelPreference\Enums\Cast;
@@ -101,20 +104,33 @@ public static function initBulk(array $preferences)
                 );
             }
 
+            if (!empty($preferenceData['default_value']) && !empty($preferenceData['rule']) && !$preferenceData['rule']->passes('', $preferenceData['default_value'])) {
+                throw new \InvalidArgumentException(
+                    sprintf("index: #%s default_value fails the validation rule", $key)
+                );
+            }
+
+            //cast values for DB
+
+            if(array_key_exists('rule',$preferenceData)){
+                $ruleCaster = new RuleCaster();
+                $preferenceData['rule'] = $ruleCaster->set(null,'',$preferenceData['rule'],[]);
+            }
+            if(array_key_exists('default_value',$preferenceData)){
+                $valueCaster = new ValueCaster($preferenceData['cast']);
+                $preferenceData['default_value'] = $valueCaster->set(null,'',$preferenceData['default_value'],[]);
+            }
+
+            $enumCaster = new EnumCaster();
+            $preferenceData['cast'] = $enumCaster->set(null,'',$preferenceData['cast'],[]);
+
             // Ensure Defaults
             $preferenceData = array_merge([
                 'group'         => 'general',
                 'default_value' => null,
                 'description'   => '',
                 'rule'          => null,
             ], $preferenceData);
-
-            if ($preferenceData['default_value'] && $preferenceData['rule'] && !$preferenceData['rule']->passes('', $preferenceData['default_value'])) {
-                throw new \InvalidArgumentException(
-                    sprintf("index: #%s default_value fails the validation rule", $key)
-                );
-            }
-
         }
 
         Preference::upsert($preferences, ['name', 'group']);

tests/PreferenceBuilderBulkTest.php

@@ -5,6 +5,7 @@
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Matteoc99\LaravelPreference\Enums\Cast;
 use Matteoc99\LaravelPreference\Factory\PreferenceBuilder;
+use Matteoc99\LaravelPreference\Models\Preference;
 use Matteoc99\LaravelPreference\Tests\Models\LowerThanRule;
 
 class PreferenceBuilderBulkTest extends TestCase
@@ -106,10 +107,10 @@ public function init_bulk_creates_new_and_updates_existing_preferences()
 
         $this->assertDatabaseCount('preferences', 2);
         $this->assertDatabaseHas('preferences', ['name' => 'new_pref']);
-        $this->assertDatabaseHas('preferences', [
-            'name' => 'existing_pref',
-            'cast' => Cast::INT->value,
-        ]);
+
+        $found = Preference::query()->where('name',"=",'existing_pref');
+        $this->assertEquals(1, $found->count());
+        $this->assertEquals(Cast::INT, $found->first()->cast);
     }
 
     public function delete_bulk_does_not_deletes_all_matching_preferences_when_multiple_exist()