Merge branch 'user_password'

app/Entities/Users/User.php

@@ -24,16 +24,6 @@ class User extends Authenticatable
     protected $hidden = ['password', 'remember_token', 'api_token'];
 
     /**
-     * Set user password attribute on save.
-     *
-     * @param void
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = bcrypt($value);
-    }
-
-    /**
      * Show user name with link to user detail.
      *
      * @return Illuminate\Support\HtmlString

app/Http/Controllers/Auth/ChangePasswordController.php

@@ -43,7 +43,7 @@ class ChangePasswordController extends Controller
 
         if (app('hash')->check($input['old_password'], auth()->user()->password)) {
             $user = auth()->user();
-            $user->password = $input['password'];
+            $user->password = bcrypt($input['password']);
             $user->save();
 
             flash(trans('auth.password_changed'), 'success');

app/Http/Controllers/InstallationController.php

@@ -48,6 +48,7 @@ class InstallationController extends Controller
         $adminData = $request->only('name', 'email', 'password');
 
         $adminData['api_token'] = str_random(32);
+        $adminData['password'] = bcrypt($adminData['password']);
 
         $admin = User::create($adminData);
         $admin->assignRole('admin');

app/Http/Controllers/Users/UsersController.php

@@ -37,8 +37,10 @@ class UsersController extends Controller
             'role'     => 'required|array',
         ]);
 
-        if (!$userData['password']) {
-            $userData['password'] = \Option::get('password_default', 'member');
+        if ($userData['password']) {
+            $userData['password'] = bcrypt($userData['password']);
+        } else {
+            $userData['password'] = bcrypt(\Option::get('password_default', 'member'));
         }
 
         $userData['api_token'] = str_random(32);
@@ -90,6 +92,9 @@ class UsersController extends Controller
             'lang'     => 'required|string|in:en,id',
         ]);
 
+        if ($userData['password']) {
+            $userData['password'] = bcrypt($userData['password']);
+        }
         $user->update($userData);
 
         \DB::table('user_roles')->where(['user_id' => $user->id])->delete();

app/Queries/AdminDashboardQuery.php

@@ -26,7 +26,7 @@ class AdminDashboardQuery
     public function totalEarnings($year)
     {
         $totalEarnings = 0;
-        $payments = Payment::where('date', 'like', $year.'%')->get();
+        $payments = Payment::whereYear('date', $year)->get();
         foreach ($payments as $payment) {
             if ($payment->in_out == 1) {
                 $totalEarnings += $payment->amount;
@@ -47,7 +47,7 @@ class AdminDashboardQuery
      */
     public function totalFinishedProjects($year)
     {
-        return Project::where('status_id', 4)->where('start_date', 'like', $year.'%')->count();
+        return Project::where('status_id', 4)->whereYear('start_date', $year)->count();
     }
 
     /**
@@ -61,7 +61,7 @@ class AdminDashboardQuery
     {
         // On Progress, Done, On Hold
         $projects = Project::whereIn('status_id', [2, 3, 6])
-            ->where('start_date', 'like', $year.'%')
+            ->whereYear('start_date', $year)
             ->with('payments')
             ->get();
 

database/factories/ModelFactory.php

@@ -10,7 +10,7 @@ $factory->define(User::class, function (Faker\Generator $faker) {
     return [
         'name'           => $faker->name,
         'email'          => $faker->unique()->email,
-        'password'       => 'member',
+        'password'       => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
         'remember_token' => str_random(10),
         'api_token'      => str_random(32),
         'lang'           => 'en',

tests/Feature/Auth/ChangePasswordTest.php

@@ -24,12 +24,12 @@ class ChangePasswordTest extends TestCase
         ]);
         $this->see(trans('auth.old_password_failed'));
         $this->assertTrue(
-            app('hash')->check('member', $user->password),
+            app('hash')->check('secret', $user->password),
             'The password shouldn\'t changed!'
         );
 
         $this->submitForm(trans('auth.change_password'), [
-            'old_password'          => 'member',
+            'old_password'          => 'secret',
             'password'              => 'rahasia',
             'password_confirmation' => 'rahasia',
         ]);

tests/Feature/Auth/LoginTest.php

@@ -19,7 +19,7 @@ class LoginTest extends TestCase
 
         $this->submitForm(trans('auth.login'), [
             'email'    => 'email@mail.com',
-            'password' => 'member',
+            'password' => 'secret',
         ]);
 
         $this->see(trans('auth.welcome', ['name' => $user->name]));

tests/Feature/Users/ManageUsersTest.php

@@ -113,6 +113,11 @@ class ManageUsersTest extends TestCase
             'user_id' => $user2->id,
             'role_id' => 2,
         ]);
+
+        $this->assertTrue(
+            app('hash')->check('password', $user2->fresh()->password),
+            'The password should changed!'
+        );
     }
 
     /** @test */