Merge pull request #64 from tipoff/drewroberts/feature/63-address-rel…

…ationships Address Relationships #63
TIPOFF · Mar 10, 2021 · 2d814b5 · 2d814b5
2 parents 5e4fdfc + d803926
commit 2d814b5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "tipoff/authorization": "^2.5.0",
         "tipoff/laravel-google-api": "^1.3",
         "tipoff/seo": "^2.0.0",
-        "tipoff/support": "^1.5.11"
+        "tipoff/support": "^1.5.12"
     },
     "require-dev": {
         "tipoff/test-support": "^1.2.0"

diff --git a/database/factories/GmbDetailFactory.php b/database/factories/GmbDetailFactory.php
@@ -18,11 +18,6 @@ public function definition()
         return [
             'name'          => $this->faker->name,
             'opened_at'     => $this->faker->date('Y-m-d'),
-            'address'       => $this->faker->address,
-            'address2'      => $this->faker->address,
-            'city'          => $this->faker->city,
-            'state'         => $this->faker->state,
-            'zip'           => $this->faker->postcode,
             'phone'         => $this->faker->phoneNumber,
             'latitude'      => $this->faker->latitude,
             'longitude'     => $this->faker->longitude,

diff --git a/database/migrations/2020_02_17_180000_create_locations_table.php b/database/migrations/2020_02_17_180000_create_locations_table.php
@@ -19,6 +19,7 @@ public function up()
             $table->string('title_part')->nullable(); // For when have more than one location in a market, this is used to generate formal title.
             $table->foreignIdFor(app('timezone'));
             $table->foreignIdFor(Market::class);
+            $table->foreignIdFor(app('domestic_address'))->nullable();
             $table->foreignIdFor(app('user'), 'manager_id')->nullable();
             $table->string('contact_email');
             $table->date('closed_at')->nullable();

diff --git a/database/migrations/2020_02_17_181000_create_gmb_details_table.php b/database/migrations/2020_02_17_181000_create_gmb_details_table.php
@@ -16,16 +16,12 @@ public function up()
             $table->id();
             $table->foreignIdFor(Location::class);
             $table->string('name');
-            $table->date('opened_at')->nullable();
-            $table->string('address')->nullable();
-            $table->string('address2')->nullable();
-            $table->string('city')->nullable();
-            $table->string('state')->nullable();
-            $table->string('zip', 5)->nullable();
+            $table->foreignIdFor(app('domestic_address'))->nullable();
             $table->string('phone', 25)->nullable();
+            $table->foreignIdFor(Webpage::class)->nullable();
+            $table->date('opened_at')->nullable();
             $table->string('latitude')->nullable();
             $table->string('longitude')->nullable();
-            $table->foreignIdFor(Webpage::class)->nullable();
 
             $table->foreignIdFor(app('user'), 'creator_id')->nullable(); // User that requested the place data to be updated
             $table->timestamp('created_at');