merge migrations :danger!

Hifone · Jun 24, 2016 · 38b62fd · 38b62fd
1 parent ac6d6cc
commit 38b62fd
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 290 deletions.
diff --git a/app/Services/Notifier/Notifier.php b/app/Services/Notifier/Notifier.php
@@ -31,15 +31,15 @@ public function notify($type, User $author, User $toUser, $object = null)
         $data = [
             'author_id'     => $author->id,
             'user_id'       => $toUser->id,
-            'body'          => isset($object) ? $object->body : '',
+            'body'          => isset($object) && isset($object->body) ? $object->body : '',
             'type'          => $type,
             'created_at'    => $nowTimestamp,
             'updated_at'    => $nowTimestamp,
         ];
 
         $toUser->increment('notification_count', 1);
 
-        $object->notifications()->insert([$data]);
+        $object->notifications()->create($data);
     }
 
     /**

diff --git a/database/migrations/2016_05_19_161651_create_advertisements_table.php b/database/migrations/2016_05_19_161651_create_advertisements_table.php
@@ -25,6 +25,7 @@ public function up()
             $table->increments('id');
             $table->string('name');
             $table->integer('adspace_id');
+            $table->boolean('enabled')->default(true);
             $table->text('body');
             $table->timestamps();
 

diff --git a/database/migrations/2016_05_29_013615_create_notifications_table.php b/database/migrations/2016_05_29_013615_create_notifications_table.php
@@ -23,18 +23,18 @@ public function up()
     {
         Schema::create('notifications', function (Blueprint $table) {
             $table->increments('id');
-            $table->integer('from_user_id');
+            $table->integer('author_id');
             $table->integer('user_id');
-            $table->integer('thread_id');
-            $table->integer('reply_id')->nullable();
-            $table->text('body')->nullable();
+            $table->integer('object_id');
+            $table->string('object_type');
             $table->string('type');
+            $table->text('body')->nullable();
             $table->timestamps();
 
-            $table->index('from_user_id');
+            $table->index('author_id');
             $table->index('user_id');
-            $table->index('thread_id');
-            $table->index('reply_id');
+            $table->index('object_id');
+            $table->index('object_type');
             $table->index('type');
         });
     }

diff --git a/database/migrations/2016_06_01_233353_create_locations_table.php b/database/migrations/2016_06_01_233353_create_locations_table.php
@@ -29,6 +29,7 @@ public function up()
             $table->timestamps();
 
             $table->index('name');
+            $table->index('order');
         });
     }
 

diff --git a/database/migrations/2016_06_02_162707_create_adblocks_table.php b/database/migrations/2016_06_02_162707_create_adblocks_table.php
@@ -25,7 +25,6 @@ public function up()
             $table->increments('id');
             $table->string('name');
             $table->string('slug');
-            $table->text('desctiption');
             $table->timestamps();
 
             $table->unique('slug');

diff --git a/database/migrations/2016_06_08_131239_create_sections_table.php b/database/migrations/2016_06_08_131239_create_sections_table.php
@@ -28,6 +28,7 @@ public function up()
             $table->timestamps();
 
             $table->unique('name');
+            $table->index('order');
         });
     }
 

diff --git a/database/migrations/2016_06_16_152646_alter_table_adblocks_drop_invalid_column.php b/database/migrations/2016_06_16_152646_alter_table_adblocks_drop_invalid_column.php
diff --git a/database/migrations/2016_06_21_091827_create_credits_table.php b/database/migrations/2016_06_21_091827_create_credits_table.php
@@ -26,10 +26,13 @@ public function up()
             $table->integer('user_id');
             $table->integer('rule_id');
             $table->integer('balance');
+            $table->string('frequency_tag')->nullable();
             $table->text('body')->nullable();
             $table->timestamps();
 
             $table->index('user_id');
+            $table->index('rule_id');
+            $table->index('frequency_tag');
         });
     }
 

diff --git a/database/migrations/2016_06_21_091855_create_credit_rules_table.php b/database/migrations/2016_06_21_091855_create_credit_rules_table.php
@@ -25,6 +25,7 @@ public function up()
             $table->increments('id');
             $table->string('name');
             $table->string('slug')->nullable();
+            $table->integer('frequency')->unsigned()->default(0);
             $table->integer('reward')->default(0);
             $table->timestamps();
 

diff --git a/database/migrations/2016_06_21_133233_alter_table_credit_rules_add_frequency_column.php b/database/migrations/2016_06_21_133233_alter_table_credit_rules_add_frequency_column.php
diff --git a/database/migrations/2016_06_21_134734_alter_table_credits_add_frequency_tag_column.php b/database/migrations/2016_06_21_134734_alter_table_credits_add_frequency_tag_column.php
diff --git a/database/migrations/2016_06_23_145748_alter_table_notifications_drop_reply_id_column.php b/database/migrations/2016_06_23_145748_alter_table_notifications_drop_reply_id_column.php
diff --git a/database/migrations/2016_06_24_001037_alter_table_advertisements_add_enabled_column.php b/database/migrations/2016_06_24_001037_alter_table_advertisements_add_enabled_column.php
diff --git a/database/migrations/2016_06_24_131630_alter_table_notifications_rename_author_id_column.php b/database/migrations/2016_06_24_131630_alter_table_notifications_rename_author_id_column.php
diff --git a/database/migrations/2016_06_24_153905_alter_table_notifications_add_object_type_column.php b/database/migrations/2016_06_24_153905_alter_table_notifications_add_object_type_column.php