From bf0ad37d46f54738321be12fbe546a5118e62b6c Mon Sep 17 00:00:00 2001
From: Farhan <mfarhan0304@gmail.com>
Date: Thu, 21 Feb 2019 12:41:48 +0700
Subject: [PATCH] merge group member and score db
---
app/{GroupGameScore.php => GroupDetails.php} | 2 +-
app/GroupsMember.php | 51 -------------------
...2_19_140125_create_groups_member_table.php | 7 +--
...9_141501_create_group_game_score_table.php | 34 -------------
4 files changed, 5 insertions(+), 89 deletions(-)
rename app/{GroupGameScore.php => GroupDetails.php} (96%)
delete mode 100644 app/GroupsMember.php
delete mode 100644 database/migrations/2019_02_19_141501_create_group_game_score_table.php
diff --git a/app/GroupGameScore.php b/app/GroupDetails.php
similarity index 96%
rename from app/GroupGameScore.php
rename to app/GroupDetails.php
index 9bd86a4..828d8e5 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 0fda24c..0000000
--- 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 f38b6a8..e722f1e 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 1a06ff6..0000000
--- 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');
- }
-}
--
GitLab