Fix Setting Media type test error

darron1217 · darron1217 · commit 1c60878c3a15 · 2018-04-19T14:00:47.000+09:00
diff --git a/Modules/Setting/Entities/Setting.php b/Modules/Setting/Entities/Setting.php
@@ -13,4 +13,10 @@ class Setting extends Model
     public $translatedAttributes = ['value', 'description'];
     protected $fillable = ['name', 'value', 'description', 'isTranslatable', 'plainValue'];
     protected $table = 'setting__settings';
+
+    public function hasMedia(): boolean
+    {
+        $value = json_decode($this->plainValue, true);
+        return is_array($value) && isset($value['media_single']) && $setting->files->count();
+    }
 }
diff --git a/Modules/Setting/Repositories/Eloquent/EloquentSettingRepository.php b/Modules/Setting/Repositories/Eloquent/EloquentSettingRepository.php
@@ -50,10 +50,10 @@ public function createOrUpdate($settings)
 
         foreach ($settings as $settingName => $settingValues) {
             // Check if media exists
-            if(in_array($settingName, ['medias_single', 'medias_multiple'])) {
+            if($settingName == 'medias_single') {
                 // Get first key of values (Original settingName)
-                foreach ($settingValues as $key => $value) {
-                    $normalisedValue = [ $settingName => [$key => $value] ];
+                foreach ($settingValues as $key => $mediaId) {
+                    $normalisedValue = [ 'media_single' => $mediaId ];
                     $settingName = $key;
                     break;
                 }
diff --git a/Modules/Setting/Support/Settings.php b/Modules/Setting/Support/Settings.php
@@ -36,7 +36,7 @@ public function get($name, $locale = null, $default = null)
             return is_null($default) ? $defaultFromConfig : $default;
         }
 
-        if($media = $setting->files()->first()) {
+        if($setting->hasMedia() && $media = $setting->files->first()) {
             return $media->path;
         }
 
diff --git a/Modules/Setting/Tests/BaseSettingTest.php b/Modules/Setting/Tests/BaseSettingTest.php
@@ -78,5 +78,9 @@ private function resetDatabase()
         $this->artisan('migrate', [
             '--database' => 'sqlite',
         ]);
+        $this->artisan('migrate', [
+            '--database' => 'sqlite',
+            '--path'     => 'Modules/Media/Database/Migrations',
+        ]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function get($name, $locale = null, $default = null)`
`36`	`36`	`return is_null($default) ? $defaultFromConfig : $default;`
`37`	`37`	`}`
`38`	`38`
`39`		`- if($media = $setting->files()->first()) {`
	`39`	`+ if($setting->hasMedia() && $media = $setting->files->first()) {`
`40`	`40`	`return $media->path;`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -78,5 +78,9 @@ private function resetDatabase()`
`78`	`78`	`$this->artisan('migrate', [`
`79`	`79`	`'--database' => 'sqlite',`
`80`	`80`	`]);`
	`81`	`+ $this->artisan('migrate', [`
	`82`	`+ '--database' => 'sqlite',`
	`83`	`+ '--path' => 'Modules/Media/Database/Migrations',`
	`84`	`+ ]);`
`81`	`85`	`}`
`82`	`86`	`}`