From cb93b9ebe4f400582ba8f107bee8e6790d3f6c9a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 3 Apr 2019 14:22:13 +1100 Subject: [PATCH] Update a Product --- app/Http/Controllers/ProductController.php | 7 ++-- app/Http/Middleware/QueryLogging.php | 2 +- .../Requests/Product/EditProductRequest.php | 2 +- .../Requests/Product/ShowProductRequest.php | 2 -- .../Requests/Product/UpdateProductRequest.php | 34 +++++++++++++++++++ 5 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 app/Http/Requests/Product/UpdateProductRequest.php diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index 7991667a2a13..6aca14859da1 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -8,6 +8,7 @@ use App\Http\Requests\Product\CreateProductRequest; use App\Http\Requests\Product\EditProductRequest; use App\Http\Requests\Product\ShowProductRequest; use App\Http\Requests\Product\StoreProductRequest; +use App\Http\Requests\Product\UpdateProductRequest; use App\Models\Product; use App\Repositories\ProductRepository; use App\Transformers\ProductTransformer; @@ -102,9 +103,11 @@ class ProductController extends BaseController * @param int $id * @return \Illuminate\Http\Response */ - public function update(Request $request, $id) + public function update(UpdateProductRequest $request, Product $product) { - // + $product = $this->product_repo->save($request, $product); + + return $this->itemResponse($product); } /** diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index 73fc3f1af3ae..603c04384924 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -39,7 +39,7 @@ class QueryLogging $timeEnd = microtime(true); $time = $timeEnd - $timeStart; Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time); - //Log::info($queries); + Log::info($queries); } } diff --git a/app/Http/Requests/Product/EditProductRequest.php b/app/Http/Requests/Product/EditProductRequest.php index 1091fe1e6429..3ab28b4526c8 100644 --- a/app/Http/Requests/Product/EditProductRequest.php +++ b/app/Http/Requests/Product/EditProductRequest.php @@ -24,7 +24,7 @@ class EditProductRequest extends Request public function rules() { return [ - 'product_key' => 'required', + // ]; } } diff --git a/app/Http/Requests/Product/ShowProductRequest.php b/app/Http/Requests/Product/ShowProductRequest.php index 6a3e0245b279..370b02961e12 100644 --- a/app/Http/Requests/Product/ShowProductRequest.php +++ b/app/Http/Requests/Product/ShowProductRequest.php @@ -1,8 +1,6 @@ user()->can('create', Product::class); + + } + + public function rules() + { + //when updating you need to ignore the column ID + + return [ + 'product_key' => 'required|unique:products,product_key,'.$this->product->id.',id,company_id,'.auth()->user()->companyId(), + ]; + } + +} +