clean up php

rogerordaz1 · Sep 12, 2018 · 266d737 · 266d737
1 parent 5c2411f
commit 266d737
Show file tree

Hide file tree

Showing 35 changed files with 538 additions and 234 deletions.
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use App\Models\Activity;
 use App\Http\Resources\ActivityResource;
 use App\Http\Requests\CommonRequest as Request;

diff --git a/app/Http/Controllers/CycleController.php b/app/Http/Controllers/CycleController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use App\Models\Cycle;
 use App\Http\Resources\CycleResource;
 use App\Http\Requests\CommonRequest as Request;
@@ -88,7 +87,6 @@ public function update(Request $request, $id)
 
         $this->validate($request, [
             'num_days' => 'numeric',
-            'status'   => 'in:active,inactive,deleted'
         ]);
 
         $this->authorize('update', $model);

diff --git a/app/Http/Controllers/ForgotPasswordController.php b/app/Http/Controllers/ForgotPasswordController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use App\Services\User\UserAuthService;
 use App\Http\Requests\ForgotPasswordRequest;
 

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\ImageRequest as Request;
-use App\Http\Controllers\Controller;
 use App\Models\Image;
 use Imageupload;
 

diff --git a/app/Http/Controllers/LoginController.php b/app/Http/Controllers/LoginController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\LoginRequest;
-use App\Http\Controllers\Controller;
 use App\Services\User\UserAuthService;
 
 class LoginController extends Controller

diff --git a/app/Http/Controllers/LogoutController.php b/app/Http/Controllers/LogoutController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use Auth;
 
 class LogoutController extends Controller

diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use App\Models\Package;
 use App\Http\Resources\PackageResource;
 use App\Http\Requests\PackageRequest as Request;
@@ -58,14 +57,6 @@ public function store(Request $request)
     {
         $this->authorize('create', Package::class);
 
-        $this->validate($request, [
-            'amount'      => 'required|numeric',
-            'cycle_id'    => 'required|exists:cycles,id',
-            'name'        => 'required|max:126',
-            'service_id'  => 'required|exists:services,id',
-            'status'      => 'in:active,inactive,deleted'
-        ]);
-
         $model = $this->service->create([
             'amount'      => $request->get('amount'),
             'cycle_id'    => $request->get('cycle_id'),
@@ -111,14 +102,6 @@ public function update(Request $request, $id)
 
         $this->authorize('update', $model);
 
-        $this->validate($request, [
-            'amount'      => 'numeric',
-            'cycle_id'    => 'exists:cycles,id',
-            'name'        => 'max:126',
-            'service_id'  => 'exists:services,id',
-            'status'      => 'in:active,inactive,deleted'
-        ]);
-
         $this->service->update($model, $request->all());
 
         return new PackageResource($model);

diff --git a/app/Http/Controllers/RefreshController.php b/app/Http/Controllers/RefreshController.php
@@ -2,13 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\LoginRequest;
-use App\Http\Controllers\Controller;
 use Auth;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Tymon\JWTAuth\Exceptions\JWTException;
-use Tymon\JWTAuth\JWTAuth;
 
 class RefreshController extends Controller
 {

diff --git a/app/Http/Controllers/ResetPasswordController.php b/app/Http/Controllers/ResetPasswordController.php
@@ -3,13 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\ResetPasswordRequest;
-use App\Http\Controllers\Controller;
-use App\Models\User;
 use App\Services\User\UserAuthService;
 use Config;
-use Illuminate\Support\Facades\Password;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Tymon\JWTAuth\JWTAuth;
 
 class ResetPasswordController extends Controller
 {

diff --git a/app/Http/Controllers/ServiceController.php b/app/Http/Controllers/ServiceController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use App\Models\Service;
 use App\Http\Resources\ServiceResource;
 use App\Http\Requests\CommonRequest as Request;
@@ -39,12 +38,6 @@ public function store(Request $request, ServiceLogic $service)
     {
         $this->authorize('create', Service::class);
 
-        $this->validate($request, [
-            'name' => 'required',
-            'description' => 'required',
-            'status' => 'in:active,inactive,deleted'
-        ]);
-
          $model = $service->create($request->all());
 
          return new ServiceResource($model);

diff --git a/app/Http/Controllers/SignUpController.php b/app/Http/Controllers/SignUpController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\SignUpRequest;
-use App\Http\Controllers\Controller;
 use App\Services\User\UserAuthService;
 use Illuminate\Support\Facades\Config;
 

diff --git a/app/Http/Controllers/SubscriptionController.php b/app/Http/Controllers/SubscriptionController.php
@@ -2,17 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\SubscriptionRequest as Request;
-use App\Http\Requests\SubscriptionRequest;
 use App\Constants;
-use App\Http\Controllers\Controller;
+use App\Http\Requests\SubscriptionRequest as Request;
 use App\Http\Resources\SubscriptionResource;
 use App\Models\Subscription;
-use App\Models\Package;
-use App\Models\Cycle;
 use App\Services\Subscription\SubscriptionCollection;
 use App\Services\Subscription\SubscriptionService;
-use Carbon\Carbon;
 
 /**
  * Class SubscriptionController
@@ -37,12 +32,12 @@ public function index(SubscriptionCollection $subscriptions)
     }
 
     /**
-     * @param SubscriptionRequest $request
+     * @param Request $request
      * @param SubscriptionService $subscriptionService
      * @return SubscriptionResource
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(SubscriptionRequest $request, SubscriptionService $subscriptionService)
+    public function store(Request $request, SubscriptionService $subscriptionService)
     {
         $this->authorize('create', Subscription::class);
 
@@ -72,7 +67,7 @@ public function show(SubscriptionService $service, $id)
     }
 
     /**
-     * @param SubscriptionRequest $request
+     * @param Request $request
      * @param SubscriptionService $subscriptionService
      * @param $id
      * @return SubscriptionResource
@@ -82,14 +77,6 @@ public function update(Request $request, SubscriptionService $subscriptionServic
     {
         $model = $subscriptionService->find($id);
 
-        $this->validate($request, [
-            'package_id'   => 'exists:packages,id',
-            'user_id'      => 'exists:users,id',
-            'interval'     => 'numeric|min:1',
-            'suspended_at' => 'date_format:Y-m-d',
-            'status'       => 'in:active,inactive,deleted,expired,suspended'
-        ]);
-
         $this->authorize('update', $model);
 
         $data = $request->only($model->getFillable());

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -4,7 +4,6 @@
 
 use App\Services\User\UserCollection;
 use App\Services\User\UserService;
-use App\Http\Requests\UserRequest as Request;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\UserResource;
 use App\Models\User;
@@ -55,7 +54,7 @@ public function store(Request $request)
 
         $request->validate([
             'name' => 'required',
-            'email' => 'required',
+            'email' => 'required|unique:users,email',
             'password' => 'required|min:6|max:12|confirmed'
         ]);
 
@@ -88,6 +87,7 @@ public function show($id)
     public function update(Request $request, $id)
     {
         $user = $this->userService->find($id);
+
         $rules = [];
 
         $this->authorize('update', $user);
@@ -96,8 +96,8 @@ public function update(Request $request, $id)
             $rules['password'] = 'min:8|max:12|confirmed';
         }
 
-        if ($request->has('email')) {
-            $rules['email'] = 'email|unique:users,email,'.$id;
+        if ($request->has('email') && $user->email !== $request->get('email')) {
+            $rules['email'] = 'email|unique:users,email';
         }
 
         $request = $request->all();

diff --git a/app/Http/Requests/CommonRequest.php b/app/Http/Requests/CommonRequest.php
@@ -10,7 +10,9 @@ class CommonRequest extends FormRequest
     public function rules()
     {
         return [
-            'name' => 'required|max:255',
+            'name'        => 'required',
+            'description' => 'required',
+            'status'      => 'in:active,inactive,deleted'
         ];
     }
 

diff --git a/app/Http/Requests/PackageRequest.php b/app/Http/Requests/PackageRequest.php
@@ -10,10 +10,11 @@ class PackageRequest extends FormRequest
     public function rules()
     {
         return [
-            'service_id' => 'required|exists:services,id',
-            'cycle_id'   => 'required|exists:cycles,id',
-            'name'       => 'required|max:255',
-            'amount'     => 'required|numeric'
+            'amount'      => 'required|numeric',
+            'cycle_id'    => 'required|exists:cycles,id',
+            'name'        => 'required|max:126',
+            'service_id'  => 'required|exists:services,id',
+            'status'      => 'in:active,inactive,deleted'
         ];
     }
 

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -71,6 +71,7 @@ class User extends Authenticatable implements JWTSubject
         'city',
         'state',
         'postal_code',
+        'country',
         'is_admin',
         'is_deleted',
         'last_login'

diff --git a/app/Services/User/UserCollection.php b/app/Services/User/UserCollection.php
@@ -71,7 +71,11 @@ public function get()
      */
     public function deleted($builder)
     {
-        $builder = $builder->where('is_deleted', request()->get('is_deleted', false));
+        $isDeleted = request()->get('is_deleted', 'false') === 'true';
+
+        $builder = $builder->where('is_deleted', $isDeleted);
+
+        $this->meta['is_deleted'] = $isDeleted;
 
         return $builder;
     }
@@ -81,7 +85,11 @@ public function deleted($builder)
      */
     public function active($builder)
     {
-        $builder = $builder->where('is_active', request()->get('is_active', true));
+        $isActive = request()->get('is_active', 'true') === 'true';
+
+        $builder = $builder->where('is_active', $isActive);
+
+        $this->meta['is_active'] = $isActive;
 
         return $builder;
     }
@@ -91,7 +99,11 @@ public function active($builder)
      */
     public function admin($builder)
     {
-        $builder = $builder->where('is_admin', request()->get('is_admin', false));
+        $isAdmin = request()->get('is_admin', 'false') === 'true';
+
+        $builder = $builder->where('is_admin', $isAdmin);
+
+        $this->meta['is_admin'] = $isAdmin;
 
         return $builder;
     }

diff --git a/app/Services/User/UserService.php b/app/Services/User/UserService.php
@@ -54,18 +54,35 @@ public function find($id)
      */
     public function create($data = [])
     {
+        $data = $this->hash($data);
+
         $data = array_only($data, $this->user->getFillable());
 
         return $this->user->create($data);
     }
 
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function hash($data)
+    {
+        if (isset($data['password'])) {
+            $data['password'] = hash()->make($data['password']);
+        }
+
+        return $data;
+    }
+
     /**
      * @param User $user
      * @param array $data
      * @return User
      */
     public function update(User $user, $data = [])
     {
+        $data = $this->hash($data);
+
         $data = array_only($data, $this->user->getFillable());
 
         return $this->user->where('id', $user->id)->update($data);

diff --git a/database/migrations/2018_04_16_165119_update_users_table.php b/database/migrations/2018_04_16_165119_update_users_table.php
@@ -26,6 +26,7 @@ public function up()
             $table->string('mobile')->nullable();
             $table->string('postal_code')->nullable();
             $table->string('state')->nullable();
+            $table->string('country')->nullable();
             $table->timestamp('last_login')->default(DB::raw('CURRENT_TIMESTAMP'));
         });
     }

diff --git a/resources/apps/frontend/src/components/Form/Select/BooleanSelect.js b/resources/apps/frontend/src/components/Form/Select/BooleanSelect.js
@@ -1,8 +1,26 @@
 import React from 'react';
 import Select from 'react-select';
 
-const options = [{value: true, label: 'Yes'}, {value: false, label: 'No'}];
+const options = [
+  {
+    value: true,
+    label: 'Yes',
+  },
+  {
+    value: false,
+    label: 'No',
+  },
+];
 
 export default props => {
-  return <Select {...props} options={options} />;
+  return (
+    <Select
+      options={options}
+      {...props}
+      defaultValue={options.find(option => option.value === props.defaultValue)}
+      value={options.find(option => option.value === props.value)}
+      getOptionLabel={option => option.label}
+      getOptionValue={option => option.value}
+    />
+  );
 };