Use observer and fix change detection

Author: Alexander Stoimenov

composer.json

@@ -8,15 +8,13 @@
         "localization",
         "database"
     ],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Tihomir Banov",
-            "email": "tbanov@despark.com"
-        }
-    ],
+    "license": "GPL-3.0",
+    "authors": [{
+        "name": "Tihomir Banov",
+        "email": "tbanov@despark.com"
+    }],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.5.0",
         "illuminate/auth": "^5.1",
         "illuminate/support": "^5.1",
         "illuminate/routing": "^5.1",
@@ -30,6 +28,5 @@
             "Despark\\LaravelDbLocalization\\": "src/"
         }
     },
-    "minimum-stability": "stable",
-    "version": "0.0.1"
-}
+    "minimum-stability": "stable"
+}

src/LocalizationObserver.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Despark\LaravelDbLocalization;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class LocalizationObserver.
+ */
+class LocalizationObserver
+{
+    /**
+     * @param Model $model
+     */
+    public function saved(Model $model)
+    {
+        $model->saveTranslations($model->id);
+    }
+}

src/config/laravel-db-localization.php

@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
 
     /*
     |--------------------------------------------------------------------------
@@ -11,5 +11,5 @@
     | Please provide the full namespaced path.
     |
     */
-    'locale_class' => 'Despark\LaravelDbLocalization\I18n',
-);
+    'locale_class' => \Despark\LaravelDbLocalization\I18n::class,
+];

src/i18nModelTrait.php

@@ -76,7 +76,7 @@ public function getI18nId($locale = null)
         }
 
         $localeModel = config('laravel-db-localization.locale_class');
-        $i18n = $localeModel::select('id')->where('locale', $locale)->first();
+        $i18n = app($localeModel)->select('id')->where('locale', $locale)->first();
 
         $i18nId = null;
 
@@ -92,10 +92,10 @@ public function getI18nId($locale = null)
      *
      * @param false $locale
      */
-    public function translate($locale = false, $alowRevision = false)
+    public function translate($locale = null, $alowRevision = false)
     {
         $translation = null;
-        $translationModel = new $this->translator();
+        $translationModel = app($this->translator);
 
         if (!is_int($locale)) {
             $locale = $this->getI18nId($locale);
@@ -126,7 +126,7 @@ public function scopeWithTranslations($query, $locale = null, $softDelete = null
         // get i18n id by locale
         $i18nId = $this->getI18nId($locale);
 
-        $translatorTable = new $this->translator();
+        $translatorTable = app($this->translator);
         $translatorTableName = $translatorTable->getTable();
         $translatableTable = $this->getTable();
 
@@ -163,45 +163,30 @@ public function scopeWithTranslations($query, $locale = null, $softDelete = null
     }
 
     /**
-     * Save record.
-     *
-     * @param array $options
+     * Boot the trait.
      */
-    public function save(array $options = [])
+    public static function bootI18nModelTrait()
     {
-        if (empty($options)) {
-            $options = \Request::all();
-        }
-
-        parent::save($options);
-
-        $this->saveTranslations($this->id, $options);
-
-        return $this;
+        static::observe(LocalizationObserver::class);
     }
 
     /**
      * Insert translation values.
      *
      * @param array translatable Id
-     * @param array $options
      */
-    public function saveTranslations($translatableId, $options)
+    public function saveTranslations($translatableId)
     {
         $translationsArray = [];
-        $explode = [];
-
-        $fillables = $this->translatedAttributes;
 
-        foreach ($options as $input) {
+        foreach (\Request::all() as $input) {
             if (is_array($input)) {
                 foreach ($input as $i18n => $i18nValue) {
-                    $explode = explode('_', $i18n);
-                    $i18nId = array_last($explode, function ($first, $last) {
-                            return $last;
-                        });
+                    $i18nId = array_last(explode('_', $i18n), function ($first, $last) {
+                        return $last;
+                    });
                     $filedName = str_replace('_'.$i18nId, '', $i18n);
-                    if (in_array($filedName, $fillables)) {
+                    if (in_array($filedName, $this->translatedAttributes)) {
                         $translationsArray[$i18nId][$filedName] = $i18nValue;
                         $translationsArray[$i18nId][$this->localeField] = $i18nId;
                         $translationsArray[$i18nId][$this->translatorField] = $translatableId;
@@ -210,31 +195,22 @@ public function saveTranslations($translatableId, $options)
             }
         }
 
-        $modelName = $this->translator;
-
         foreach ($translationsArray as  $translationValues) {
-            $translation = $modelName::where($this->translatorField, array_get($translationValues, $this->translatorField))
-                ->where($this->localeField, array_get($translationValues, $this->localeField))
+            $translatorId = array_get($translationValues, $this->translatorField);
+            $localeId = array_get($translationValues, $this->localeField);
+
+            $translation = $this->translator::where($this->translatorField, $translatorId)
+                ->where($this->localeField, $localeId)
                 ->first();
 
-            // check if translation exists with same values
-            $query = $modelName::select('id');
-            foreach ($translationValues as $key => $val) {
-                $query->where($key, $val);
+            if (!$translation) {
+                $translation = app($this->translator);
             }
-            $result = $query->first();
-
-            if (!isset($result->id)) {
-                if (!isset($translation->id)) {
-                    $translation = new $modelName();
-                }
 
-                foreach ($translationValues as $key => $val) {
-                    $translation->$key = $val;
-                }
+            $translation->fillable = array_keys($translationValues);
 
-                $translation->save();
-            }
+            $translation->fill($translationValues);
+            $translation->save();
         }
     }
 

src/seeds/DatabaseSeeder.php

@@ -10,12 +10,12 @@ class DatabaseSeeder extends \Seeder
     public function run()
     {
         \DB::table('i18n')->insert([
-                'name'   => 'English',
+                'name' => 'English',
                 'locale' => 'en',
         ]);
 
         \DB::table('i18n')->insert([
-                'name'   => 'Български',
+                'name' => 'Български',
                 'locale' => 'bg',
         ]);
     }