diff --git a/app/GroupGameScore.php b/app/GroupDetails.php similarity index 96% rename from app/GroupGameScore.php rename to app/GroupDetails.php index 9bd86a4c85fae1a70ab1fca5b020e798f63e841e..828d8e5b6760ff755a39fcb603f70a9a6b1edc34 100644 --- a/app/GroupGameScore.php +++ b/app/GroupDetails.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model; class GroupGameScore extends Model { // - protected $table = 'group_game_score'; + protected $table = 'group_details'; public $incrementing = false; protected $primaryKey = ['group_id', 'user_id']; /** diff --git a/app/GroupsMember.php b/app/GroupsMember.php deleted file mode 100644 index 0fda24c2829eaf7ef78d2f480aa6718369700725..0000000000000000000000000000000000000000 --- a/app/GroupsMember.php +++ /dev/null @@ -1,51 +0,0 @@ -<?php - -namespace App; - -use Illuminate\Database\Eloquent\Model; - -class GroupsMember extends Model -{ - // - protected $table = 'groups_member'; - public $incrementing = false; - protected $primaryKey = ['group_id', 'user_id']; - /** - * Set the keys for a save update query. - * - * @param \Illuminate\Database\Eloquent\Builder $query - * @return \Illuminate\Database\Eloquent\Builder - */ - protected function setKeysForSaveQuery(Builder $query) - { - $keys = $this->getKeyName(); - if(!is_array($keys)){ - return parent::setKeysForSaveQuery($query); - } - - foreach($keys as $keyName){ - $query->where($keyName, '=', $this->getKeyForSaveQuery($keyName)); - } - - return $query; - } - - /** - * Get the primary key value for a save query. - * - * @param mixed $keyName - * @return mixed - */ - protected function getKeyForSaveQuery($keyName = null) - { - if(is_null($keyName)){ - $keyName = $this->getKeyName(); - } - - if (isset($this->original[$keyName])) { - return $this->original[$keyName]; - } - - return $this->getAttribute($keyName); - } -} diff --git a/database/migrations/2019_02_19_140125_create_groups_member_table.php b/database/migrations/2019_02_19_140125_create_groups_member_table.php index f38b6a8ab083a9ace6ab0cc8cc01861e49fd3b3e..e722f1e177b9414a02da283df4a4a3fd4df4256e 100644 --- a/database/migrations/2019_02_19_140125_create_groups_member_table.php +++ b/database/migrations/2019_02_19_140125_create_groups_member_table.php @@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CreateGroupsMemberTable extends Migration +class CreateGroupsDetailsTable extends Migration { /** * Run the migrations. @@ -13,13 +13,14 @@ class CreateGroupsMemberTable extends Migration */ public function up() { - Schema::create('groups_member', function (Blueprint $table) { + Schema::create('group_details', function (Blueprint $table) { $table->unsignedInteger('group_id'); $table->foreign('group_id')->references('id')->on('groups'); $table->unsignedInteger('user_id'); $table->foreign('user_id')->references('id')->on('users'); $table->primary(['group_id', 'user_id']); $table->string('role'); + $table->unsignedInteger('high_score')->default(0); $table->timestamps(); }); } @@ -31,6 +32,6 @@ class CreateGroupsMemberTable extends Migration */ public function down() { - Schema::dropIfExists('groups_member'); + Schema::dropIfExists('group_details'); } } diff --git a/database/migrations/2019_02_19_141501_create_group_game_score_table.php b/database/migrations/2019_02_19_141501_create_group_game_score_table.php deleted file mode 100644 index 1a06ff63f965d76ff5dd2c9b77a1ccc9d769452e..0000000000000000000000000000000000000000 --- a/database/migrations/2019_02_19_141501_create_group_game_score_table.php +++ /dev/null @@ -1,34 +0,0 @@ -<?php - -use Illuminate\Support\Facades\Schema; -use Illuminate\Database\Schema\Blueprint; -use Illuminate\Database\Migrations\Migration; - -class CreateGroupGameScoreTable extends Migration -{ - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::create('group_game_score', function (Blueprint $table) { - $table->integer('group_id')->foreign('group_id')->references('id')->on('groups'); - $table->integer('user_id')->foreign('user_id')->references('id')->on('users'); - $table->primary(['group_id', 'user_id']); - $table->integer('score')->nullable(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('group_game_score'); - } -}