From 07a66427cf1ca850b218bfba95972a34686961d9 Mon Sep 17 00:00:00 2001
From: W <W>
Date: Mon, 18 Mar 2019 23:08:58 +0700
Subject: [PATCH] adding score compare
---
app/Http/Controllers/GroupsMemberController.php | 11 ++++++++---
app/Http/Controllers/UserController.php | 12 +++++++++++-
database/factories/GroupsMemberFactory.php | 2 +-
routes/api.php | 1 +
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/app/Http/Controllers/GroupsMemberController.php b/app/Http/Controllers/GroupsMemberController.php
index e845ca8..d5e2072 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 e031b1b..b4132f7 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 c367113..673e03d 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 c9dab56..2564885 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
--
GitLab