From 8648886cb170c8d4c96393edc39f29ce22905796 Mon Sep 17 00:00:00 2001
From: soheil khaledabadi <soheilkhaledabdi@gmail.com>
Date: Fri, 5 Apr 2024 00:44:05 +0330
Subject: [PATCH] Clean code -> run laravel pint

---
 app/Constants/OrderConstants.php              |  3 ---
 .../api/{ => v1}/AuthController.php           |  3 ++-
 .../api/{ => v1}/BasketController.php         | 15 +++++++-------
 .../api/{ => v1}/CommentController.php        |  2 +-
 .../api/{ => v1}/HomeController.php           |  3 ++-
 .../api/{ => v1}/LikeController.php           |  2 +-
 .../Controllers/api/v1/OrderController.php    | 15 +++++++-------
 .../api/{ => v1}/ProductController.php        |  2 +-
 .../api/{ => v1}/ProfileController.php        |  2 +-
 app/Http/Requests/Basket/BasketBuyRequest.php |  1 +
 .../Requests/Basket/BasketDeleteRequest.php   |  1 -
 app/Models/Address.php                        |  2 +-
 app/Models/Order.php                          |  6 +++---
 app/Models/OrderProduct.php                   |  2 +-
 .../2024_02_04_142723_create_orders_table.php |  2 +-
 ...4_02_23_111738_add_code_to_order_table.php |  2 +-
 routes/api.php                                | 20 +++++++++----------
 17 files changed, 41 insertions(+), 42 deletions(-)
 rename app/Http/Controllers/api/{ => v1}/AuthController.php (95%)
 rename app/Http/Controllers/api/{ => v1}/BasketController.php (92%)
 rename app/Http/Controllers/api/{ => v1}/CommentController.php (96%)
 rename app/Http/Controllers/api/{ => v1}/HomeController.php (99%)
 rename app/Http/Controllers/api/{ => v1}/LikeController.php (95%)
 rename app/Http/Controllers/api/{ => v1}/ProductController.php (98%)
 rename app/Http/Controllers/api/{ => v1}/ProfileController.php (97%)

diff --git a/app/Constants/OrderConstants.php b/app/Constants/OrderConstants.php
index 62e75d8..3ca8604 100644
--- a/app/Constants/OrderConstants.php
+++ b/app/Constants/OrderConstants.php
@@ -14,9 +14,6 @@ class OrderConstants
 
     public const CANCELLED = 'cancelled';
 
-
-
-
     public static function getStatusFromId($id)
     {
         switch ($id) {
diff --git a/app/Http/Controllers/api/AuthController.php b/app/Http/Controllers/api/v1/AuthController.php
similarity index 95%
rename from app/Http/Controllers/api/AuthController.php
rename to app/Http/Controllers/api/v1/AuthController.php
index 2b6d918..9e774b1 100644
--- a/app/Http/Controllers/api/AuthController.php
+++ b/app/Http/Controllers/api/v1/AuthController.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\api;
+namespace App\Http\Controllers\api\v1;
 
+use App\Http\Controllers\api\Exception;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\LoginRequest;
 use App\Http\Requests\Auth\RegisterRequest;
diff --git a/app/Http/Controllers/api/BasketController.php b/app/Http/Controllers/api/v1/BasketController.php
similarity index 92%
rename from app/Http/Controllers/api/BasketController.php
rename to app/Http/Controllers/api/v1/BasketController.php
index a0f47b5..bd3f4b2 100644
--- a/app/Http/Controllers/api/BasketController.php
+++ b/app/Http/Controllers/api/v1/BasketController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\api;
+namespace App\Http\Controllers\api\v1;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Basket\BasketBuyRequest;
@@ -26,7 +26,6 @@ public function index(): JsonResponse
         return $this->success(BasketResource::collection($baskets), 'success', 'Product successfully.');
     }
 
-
     public function add(BasketRequest $request): JsonResponse
     {
         $userId = auth()->user()->id;
@@ -66,7 +65,7 @@ public function delete(BasketDeleteRequest $request): JsonResponse
         return $this->success(null, 'success', 'Basket item not found or you do not have permission to delete it.');
     }
 
-    public function buy(BasketBuyRequest $request)
+    public function buy(BasketBuyRequest $request): JsonResponse
     {
         $validated = $request->validated();
         if (auth()->user()->baskets()->where('status', 'created')->count() == 0) {
@@ -75,7 +74,7 @@ public function buy(BasketBuyRequest $request)
         $products = auth()->user()->baskets()->where('status', 'created')->get();
 
         auth()->user()->baskets()->where('status', 'created')->update([
-            'status' => 'paid'
+            'status' => 'paid',
         ]);
 
         $method = '';
@@ -94,17 +93,17 @@ public function buy(BasketBuyRequest $request)
             'code' => rand(),
             'user_id' => auth()->user()->id,
             'address_id' => $validated['address_id'],
-            'method' => $method
+            'method' => $method,
         ]);
 
-        foreach($products as $product){
+        foreach ($products as $product) {
             OrderProduct::query()->create([
                 'order_id' => $order->id,
                 'product_id' => $product->id,
-                'count' => $product->count
+                'count' => $product->count,
             ]);
         }
-        
+
         return $this->success(null, 'Success', 'Your purchase was successful');
     }
 }
diff --git a/app/Http/Controllers/api/CommentController.php b/app/Http/Controllers/api/v1/CommentController.php
similarity index 96%
rename from app/Http/Controllers/api/CommentController.php
rename to app/Http/Controllers/api/v1/CommentController.php
index ab4d281..d277a74 100644
--- a/app/Http/Controllers/api/CommentController.php
+++ b/app/Http/Controllers/api/v1/CommentController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\api;
+namespace App\Http\Controllers\api\v1;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Comment\StoreComment;
diff --git a/app/Http/Controllers/api/HomeController.php b/app/Http/Controllers/api/v1/HomeController.php
similarity index 99%
rename from app/Http/Controllers/api/HomeController.php
rename to app/Http/Controllers/api/v1/HomeController.php
index 5e4c809..18b0056 100644
--- a/app/Http/Controllers/api/HomeController.php
+++ b/app/Http/Controllers/api/v1/HomeController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\api;
+namespace App\Http\Controllers\api\v1;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Search\SearchRequest;
@@ -35,6 +35,7 @@ public function index(): JsonResponse
 
             $categories = Category::query()->select('id', 'name', 'parent', 'icon')->get();
             $address = auth()->user()->address()->first() ? new AddressResource(auth()->user()->address()->first()) : null;
+
             return $this->success([
                 'banners' => $banners,
                 'categories' => $categories,
diff --git a/app/Http/Controllers/api/LikeController.php b/app/Http/Controllers/api/v1/LikeController.php
similarity index 95%
rename from app/Http/Controllers/api/LikeController.php
rename to app/Http/Controllers/api/v1/LikeController.php
index fa13fe9..a3eb2bc 100644
--- a/app/Http/Controllers/api/LikeController.php
+++ b/app/Http/Controllers/api/v1/LikeController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\api;
+namespace App\Http\Controllers\api\v1;
 
 use App\Http\Controllers\Controller;
 use App\Models\LikeProducts;
diff --git a/app/Http/Controllers/api/v1/OrderController.php b/app/Http/Controllers/api/v1/OrderController.php
index 6064719..a7b7417 100644
--- a/app/Http/Controllers/api/v1/OrderController.php
+++ b/app/Http/Controllers/api/v1/OrderController.php
@@ -5,7 +5,6 @@
 use App\Constants\OrderConstants;
 use App\Http\Controllers\Controller;
 use App\Traits\BaseApiResponse;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 
 class OrderController extends Controller
@@ -16,9 +15,11 @@ public function index()
     {
         try {
             $orders = $this->getOrdersByStatus();
+
             return $this->success($orders, 'Order', 'Order list completed');
         } catch (\Exception $e) {
-            Log::error('Error retrieving orders: ' . $e->getMessage());
+            Log::error('Error retrieving orders: '.$e->getMessage());
+
             return $this->failed(null, 'Error', 'An error occurred while fetching orders.');
         }
     }
@@ -46,7 +47,7 @@ protected function mapProducts($products)
             return [
                 'title' => $product?->product?->title,
                 'image' => $product?->product?->image,
-                'price' => $product?->product?->price
+                'price' => $product?->product?->price,
             ];
         });
     }
@@ -54,10 +55,10 @@ protected function mapProducts($products)
     protected function mapAddress($address)
     {
         return [
-            "address" => $address->address,
-            "city" => $address->city,
-            "county" => $address->county,
-            "state" => $address->state,
+            'address' => $address->address,
+            'city' => $address->city,
+            'county' => $address->county,
+            'state' => $address->state,
         ];
     }
 
diff --git a/app/Http/Controllers/api/ProductController.php b/app/Http/Controllers/api/v1/ProductController.php
similarity index 98%
rename from app/Http/Controllers/api/ProductController.php
rename to app/Http/Controllers/api/v1/ProductController.php
index 80c96e6..352312f 100644
--- a/app/Http/Controllers/api/ProductController.php
+++ b/app/Http/Controllers/api/v1/ProductController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\api;
+namespace App\Http\Controllers\api\v1;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Comment\CommentResource;
diff --git a/app/Http/Controllers/api/ProfileController.php b/app/Http/Controllers/api/v1/ProfileController.php
similarity index 97%
rename from app/Http/Controllers/api/ProfileController.php
rename to app/Http/Controllers/api/v1/ProfileController.php
index 51d27ba..2524c9b 100644
--- a/app/Http/Controllers/api/ProfileController.php
+++ b/app/Http/Controllers/api/v1/ProfileController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\api;
+namespace App\Http\Controllers\api\v1;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Profile\UpdateAddressRequest;
diff --git a/app/Http/Requests/Basket/BasketBuyRequest.php b/app/Http/Requests/Basket/BasketBuyRequest.php
index cdbbda9..7a83a84 100644
--- a/app/Http/Requests/Basket/BasketBuyRequest.php
+++ b/app/Http/Requests/Basket/BasketBuyRequest.php
@@ -8,6 +8,7 @@
 class BasketBuyRequest extends FormRequest
 {
     use FailValidation;
+
     public function authorize(): bool
     {
         return true;
diff --git a/app/Http/Requests/Basket/BasketDeleteRequest.php b/app/Http/Requests/Basket/BasketDeleteRequest.php
index 7d4a31d..c919222 100644
--- a/app/Http/Requests/Basket/BasketDeleteRequest.php
+++ b/app/Http/Requests/Basket/BasketDeleteRequest.php
@@ -7,7 +7,6 @@
 
 class BasketDeleteRequest extends FormRequest
 {
-
     use FailValidation;
 
     public function authorize(): bool
diff --git a/app/Models/Address.php b/app/Models/Address.php
index 57bbcea..38e8804 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -16,7 +16,7 @@ class Address extends Model
         'state',
         'zip_code',
         'is_default',
-        'county'
+        'county',
     ];
 
     public function user()
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 3ecbe4c..455d071 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -13,11 +13,11 @@ class Order extends Model
         'code',
         'user_id',
         'address_id',
-        'status'
+        'status',
     ];
 
-
-    public function products(){
+    public function products()
+    {
         return $this->hasMany(OrderProduct::class);
     }
 
diff --git a/app/Models/OrderProduct.php b/app/Models/OrderProduct.php
index fc13ffc..fe4489f 100644
--- a/app/Models/OrderProduct.php
+++ b/app/Models/OrderProduct.php
@@ -12,7 +12,7 @@ class OrderProduct extends Model
     protected $fillable = [
         'order_id',
         'product_id',
-        'count'
+        'count',
     ];
 
     public function product()
diff --git a/database/migrations/2024_02_04_142723_create_orders_table.php b/database/migrations/2024_02_04_142723_create_orders_table.php
index b658295..350a00d 100644
--- a/database/migrations/2024_02_04_142723_create_orders_table.php
+++ b/database/migrations/2024_02_04_142723_create_orders_table.php
@@ -15,7 +15,7 @@ public function up(): void
             $table->id();
             $table->foreignId('user_id');
             $table->foreignId('address_id');
-            $table->enum('method',['economy','regular','cargo','express']);
+            $table->enum('method', ['economy', 'regular', 'cargo', 'express']);
             $table->timestamps();
         });
     }
diff --git a/database/migrations/2024_02_23_111738_add_code_to_order_table.php b/database/migrations/2024_02_23_111738_add_code_to_order_table.php
index 87efea9..0d8e787 100644
--- a/database/migrations/2024_02_23_111738_add_code_to_order_table.php
+++ b/database/migrations/2024_02_23_111738_add_code_to_order_table.php
@@ -13,7 +13,7 @@ public function up(): void
     {
         Schema::table('orders', function (Blueprint $table) {
             $table->string('code')->after('id')->nullable();
-            $table->enum('status',['active','created','success','failed','cancelled'])->after('code')->default('success');
+            $table->enum('status', ['active', 'created', 'success', 'failed', 'cancelled'])->after('code')->default('success');
         });
     }
 
diff --git a/routes/api.php b/routes/api.php
index ee9d72f..96544f8 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,13 +1,13 @@
 <?php
 
-use App\Http\Controllers\api\AuthController;
-use App\Http\Controllers\api\BasketController;
-use App\Http\Controllers\api\CommentController;
-use App\Http\Controllers\api\HomeController;
-use App\Http\Controllers\api\LikeController;
-use App\Http\Controllers\api\ProductController;
-use App\Http\Controllers\api\ProfileController;
+use App\Http\Controllers\api\v1\AuthController;
+use App\Http\Controllers\api\v1\BasketController;
+use App\Http\Controllers\api\v1\CommentController;
+use App\Http\Controllers\api\v1\HomeController;
+use App\Http\Controllers\api\v1\LikeController;
 use App\Http\Controllers\api\v1\OrderController;
+use App\Http\Controllers\api\v1\ProductController;
+use App\Http\Controllers\api\v1\ProfileController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1')->group(function () {
@@ -37,11 +37,11 @@
         Route::get('', [BasketController::class, 'index'])->name('api.basket');
         Route::post('add', [BasketController::class, 'add'])->name('api.basket.add');
         Route::post('delete', [BasketController::class, 'delete'])->name('api.basket.delete');
-        Route::post('buy',[BasketController::class, 'buy'])->name('api.basket.buy');
+        Route::post('buy', [BasketController::class, 'buy'])->name('api.basket.buy');
     });
 
-    Route::prefix('orders')->group(function(){
-        Route::get('',[OrderController::class,'index']);
+    Route::prefix('orders')->group(function () {
+        Route::get('', [OrderController::class, 'index']);
     });
 
     Route::get('address', [ProfileController::class, 'address'])->name('api.address');