diff --git a/app/Http/Controllers/GroupsMemberController.php b/app/Http/Controllers/GroupsMemberController.php index e845ca8c5faa1b7e4e04c396d09bb723fa510c39..d5e207283084490d1162596454b16fb941e01fde 100644 --- a/app/Http/Controllers/GroupsMemberController.php +++ b/app/Http/Controllers/GroupsMemberController.php @@ -160,10 +160,15 @@ class GroupsMemberController extends Controller if ($user) { $groupsMember = GroupsMember::where(['user_id' => $user->id])->get(); - foreach($groupsMember as $d) { - $d->high_score = $request->high_score; - $d->save(); + if ($groupsMember) { + if ($request->high_score > $groupsMember[0]->high_score) { + foreach($groupsMember as $d) { + $d->high_score = $request->high_score; + $d->save(); + } + } } + return response(json_encode([ diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index e031b1bca898c327f295f9d0b4bcc3f234cc22ad..b4132f78a64d1de988113cfc6b2157832186cae5 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -62,7 +62,7 @@ class UserController extends Controller } public function testMasukAuthAPI(Request $req) { - return $req->user(); + return "ASDAS"; } public function logOut(Request $req) { @@ -81,6 +81,16 @@ class UserController extends Controller ]), 200); } + public function getIdByEmail($email) { + $user = User::where('email', $email)->first(); + + if ($user) { + return $user['id']; + } else { + return -1; + } + } + public function getUserByEmail($email) { $user = User::where('email',$email)->first(); diff --git a/database/factories/GroupsMemberFactory.php b/database/factories/GroupsMemberFactory.php index c367113bd527d79cbb0e5ee7fe3a8a65dbb8ef84..673e03db513dcb7c6da6fdbe5f68bc7e0613eae1 100644 --- a/database/factories/GroupsMemberFactory.php +++ b/database/factories/GroupsMemberFactory.php @@ -17,6 +17,6 @@ $factory->define(App\GroupsMember::class, function (Faker $faker) { return [ 'user_id' => factory('App\User')->create()->id, // 'role' => $faker->randomElement(Config::get('constants.ROLE')), - 'high_score' => $faker->randomNumber + 'high_score' => 0 ]; }); \ No newline at end of file diff --git a/routes/api.php b/routes/api.php index c9dab5644c7d02237fd67334fe12304d2726ae2e..2564885904d36bb4ccd3228dbfad3aca9db4a06f 100644 --- a/routes/api.php +++ b/routes/api.php @@ -28,6 +28,7 @@ Route::post('/logout', 'UserController@logOut'); //User +Route::get('/email/{email}', 'UserController@getIdByEmail'); Route::get('/user/{userId}/groups', 'UserController@getGroups'); //Bisa //Ambil Group yang dipunyai user Route::get('/user/email/{email}', 'UserController@getUserByEmail'); //Bisa //Ambil user dengan param email