Skip to content

Commit

Permalink
Clean code -> run laravel pint
Browse files Browse the repository at this point in the history
  • Loading branch information
soheilkhaledabdi committed Apr 4, 2024
1 parent 0cf8efb commit 8648886
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 42 deletions.
3 changes: 0 additions & 3 deletions app/Constants/OrderConstants.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ class OrderConstants

public const CANCELLED = 'cancelled';




public static function getStatusFromId($id)
{
switch ($id) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -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 = '';
Expand All @@ -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');
}
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
15 changes: 8 additions & 7 deletions app/Http/Controllers/api/v1/OrderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.');
}
}
Expand Down Expand Up @@ -46,18 +47,18 @@ protected function mapProducts($products)
return [
'title' => $product?->product?->title,
'image' => $product?->product?->image,
'price' => $product?->product?->price
'price' => $product?->product?->price,
];
});
}

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,
];
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions app/Http/Requests/Basket/BasketBuyRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
class BasketBuyRequest extends FormRequest
{
use FailValidation;

public function authorize(): bool
{
return true;
Expand Down
1 change: 0 additions & 1 deletion app/Http/Requests/Basket/BasketDeleteRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

class BasketDeleteRequest extends FormRequest
{

use FailValidation;

public function authorize(): bool
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Address extends Model
'state',
'zip_code',
'is_default',
'county'
'county',
];

public function user()
Expand Down
6 changes: 3 additions & 3 deletions app/Models/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion app/Models/OrderProduct.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class OrderProduct extends Model
protected $fillable = [
'order_id',
'product_id',
'count'
'count',
];

public function product()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
}

Expand Down
20 changes: 10 additions & 10 deletions routes/api.php
Original file line number Diff line number Diff line change
@@ -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 () {
Expand Down Expand Up @@ -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');
Expand Down

0 comments on commit 8648886

Please sign in to comment.