From e73440d081897761e310d56097b8935735bd0575 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Sun, 31 Dec 2017 11:19:18 -0600
Subject: [PATCH] format settings key

---
 app/Models/Setting.php                 | 7 ++++++-
 app/Repositories/SettingRepository.php | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index e9a1900f..8d772003 100644
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -17,6 +17,11 @@ class Setting extends BaseModel
         'description',
     ];
 
+    public static function formatKey($key)
+    {
+        return str_replace('.', '_', strtolower($key));
+    }
+
     protected static function boot()
     {
         parent::boot();
@@ -26,7 +31,7 @@ class Setting extends BaseModel
          */
         static::creating(function (Setting $model) {
             if (!empty($model->id)) {
-                $model->id = str_replace('.', '_', strtolower($model->id));
+                $model->id = Setting::formatKey($model->id);
             }
         });
     }
diff --git a/app/Repositories/SettingRepository.php b/app/Repositories/SettingRepository.php
index 877ebb27..9820b83f 100644
--- a/app/Repositories/SettingRepository.php
+++ b/app/Repositories/SettingRepository.php
@@ -28,7 +28,7 @@ class SettingRepository extends BaseRepository implements CacheableInterface
      */
     public function retrieve($key)
     {
-        $key = str_replace('.', '_', strtolower($key));
+        $key = Setting::formatKey($key);
         $setting = $this->findWhere(['id' => $key], ['type', 'value'])->first();
 
         if(!$setting) {
@@ -66,7 +66,8 @@ class SettingRepository extends BaseRepository implements CacheableInterface
      */
     public function store($key, $value)
     {
-        $setting = $this->findWhere(['key' => $key], ['id'])->first();
+        $key = Setting::formatKey($key);
+        $setting = $this->findWhere(['id' => $key], ['id'])->first();
         if (!$setting) {
             return null;
         }