refactoring

Author: aeq-dev

.gitignore

@@ -0,0 +1,2 @@
+/vendor
+composer.lock

composer.json

@@ -12,14 +12,9 @@
     "homepage": "https://github.com/bkfdev/laravel-address",
     "keywords": ["Laravel", "LaravelAddress"],
     "require": {
-        "illuminate/support": "~9",
-        "bkfdev/laravel-world": "*",
-        "genealabs/laravel-model-caching": "^0.12.4"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~9.0",
-        "orchestra/testbench": "~7"
+        "bkfdev/laravel-world": "*"
     },
+   
     "autoload": {
         "psr-4": {
             "Bkfdev\\Addressable\\": "src/"

config/laravel-address.php

@@ -11,4 +11,9 @@
         'address' => \Bkfdev\Addressable\Models\Address::class,
     ],
 
-];
+    // Addresses Geocoding Options
+    'geocoding' => [
+        'enabled' => false,
+        'api_key' => env('GOOGLE_APP_KEY'),
+    ],
+];

database/migrations/2020_01_01_000001_create_addresses_table.php

@@ -13,10 +13,13 @@ public function up()
         Schema::create(config('laravel-address.tables.addresses'), function (Blueprint $table) {
             // Columns
             $table->increments('id');
+            $table->string('given_name');
+            $table->string('family_name')->nullable;
             $table->morphs('addressable');
             $table->string('label')->nullable();
-            $table->foreignId('country_id');
-            $table->foreignId('state_id');
+            $table->string('organization')->nullable();
+            $table->foreignId('country_id')->on('countries');
+            $table->foreignId('state_id')->on('states');
             $table->foreignId('city_id');
             $table->string('street')->nullable();
             $table->string('postal_code')->nullable();
@@ -34,4 +37,4 @@ public function down()
     {
         Schema::dropIfExists(config('laravel-address.tables.addresses'));
     }
-}
+}

src/Models/Address.php

@@ -10,56 +10,25 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use GeneaLabs\LaravelModelCaching\Traits\Cachable;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Address extends Model
 {
     use HasFactory;
     use SoftDeletes;
-    use Cachable;
-
-    protected $with = ['country', 'state', 'city'];
-
-    protected $fillable = [
-        'addressable_id',
-        'addressable_type',
-        'label',
-        'country_id',
-        'state_id',
-        'city_id',
-        'street',
-        'postal_code',
-        'latitude',
-        'longitude',
-        'is_primary',
-        'is_billing',
-        'is_shipping',
-    ];
+
+    //protected $with = ['country', 'state', 'city'];
+
+    protected $guarded = [];
 
 
     protected $casts = [
-        'addressable_id' => 'integer',
-        'addressable_type' => 'string',
-        'label' => 'string',
-        'street' => 'string',
-        'postal_code' => 'string',
-        'latitude' => 'float',
-        'longitude' => 'float',
         'is_primary' => 'boolean',
         'is_billing' => 'boolean',
         'is_shipping' => 'boolean',
-        'deleted_at' => 'datetime',
     ];
 
-    public function __construct(array $attributes = [])
-    {
-        $this->setTable(config('laravel-address.tables.addresses'));
-
-        parent::__construct($attributes);
-    }
-
     public function addressable(): MorphTo
     {
         return $this->morphTo('addressable', 'addressable_type', 'addressable_id', 'id');
@@ -70,6 +39,18 @@ public function scopeIsPrimary(Builder $builder): Builder
         return $builder->where('is_primary', true);
     }
 
+    public function scopeIsBilling(Builder $builder): Builder
+    {
+        return $builder->where('is_billing', true);
+    }
+    public function scopeIsShipping(Builder $builder): Builder
+    {
+        return $builder->where('is_shipping', true);
+    }
+    public function getFullNameAttribute(): string
+    {
+        return implode(' ', [$this->given_name, $this->family_name]);
+    }
     public function scopeInCountry(Builder $builder, string $countryId): Builder
     {
         return $builder->where('country_id', $countryId);
@@ -89,4 +70,31 @@ public function city()
     {
         return $this->belongsTo(City::class);
     }
-}
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::saving(function (self $address) {
+            $geocoding = config('laravel-address.geocoding.enabled');
+            $geocoding_api_key = config('laravel-address.geocoding.api_key');
+            if ($geocoding && $geocoding_api_key) {
+                $segments[] = $address->street;
+                $segments[] = sprintf('%s, %s %s', $address->city?->name, $address->state?->name, $address->postal_code);
+                $segments[] = country($address->country?->country_code)->getName();
+
+                $query = str_replace(' ', '+', implode(', ', $segments));
+                $geocode = json_decode(
+                    file_get_contents(
+                        "https://maps.google.com/maps/api/geocode/json?address={$query}&sensor=false&key={$geocoding_api_key}"
+                    )
+                );
+
+                if (count($geocode->results)) {
+                    $address->latitude = $geocode->results[0]->geometry->location->lat;
+                    $address->longitude = $geocode->results[0]->geometry->location->lng;
+                }
+            }
+        });
+    }
+}