Skip to content

upgrade laravel to v12 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Emadshirzad wants to merge 2 commits into
base: master
Choose a base branch
from
Open

upgrade laravel to v12 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
682b910
add rent
Emadshirzad Jun 6, 2025
76c6a43
fix bugs and upgrade to laravel v12
Emadshirzad Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 111 additions & 13 deletions app/Http/Controllers/Admin/BookController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use App\Http\Controllers\Controller;
use App\Models\Book;
use App\Models\book_user;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Routing\Controllers\HasMiddleware;
Expand Down Expand Up @@ -115,7 +116,7 @@ public static function middleware(): array
*/
public function index()
{
return $this->success(Book::latest()->paginate(20));
return $this->success(Book::with('bookUser')->latest()->paginate(20));
}

/**
Expand Down Expand Up @@ -147,7 +148,42 @@ public function index()
* description="price",
* default="null",
* example=0,
* )
* ),
* @OA\Property(
* property="sold_price",
* type="integer",
* description="sold price",
* default="null",
* example=0,
* ),
* @OA\Property(
* property="count",
* type="integer",
* description="count",
* default="null",
* example=0,
* ),
* @OA\Property(
* property="type",
* type="string",
* description="type book",
* default="null",
* example="sell",
* ),
* @OA\Property(
* property="release_date",
* type="string",
* description="release date",
* default="null",
* example="1403-2-24",
* ),
* @OA\Property(
* property="status",
* type="string",
* description="status book",
* default="null",
* example="accept",
* ),
* )
* ),
* @OA\Response(
Expand All @@ -166,16 +202,30 @@ public function index()
public function store(Request $request)
{
$request->validate([
'title' => 'required',
'author' => 'required',
'price' => 'required|numeric',
// 'picture' => 'required|string',
'title' => 'required',
'author' => 'required',
'price' => 'required|numeric',
'sold_price' => 'required|numeric',
'type' => 'required|in:rent,sell,gift,ebook',
'count' => 'required|numeric',
'release_date'=> 'required',
'status' => 'in:reject,accept,is_waiting'
]);

try {
$book = Book::create($request->all());
book_user::create([
'user_id' => $request->user_id,
'book_id' => $book->id,
'price' => $book->price,
'sold_price' => $request->sold_price,
'count' => $request->count,
'type' => $request->type,
'release_date'=> $request->release_date,
'status' => $request->status
]);
return $this->success($book);
} catch (Exception $e) {
} catch(Exception $e) {
Log::error($e->getMessage());
} return $this->error(__('messages.book.notCreated'));
}
Expand Down Expand Up @@ -316,8 +366,43 @@ public function show(Int $id)
* type="integer",
* description="price",
* default="null",
* example="price Item",
* )
* example=0,
* ),
* @OA\Property(
* property="sold_price",
* type="integer",
* description="sold price",
* default="null",
* example=0,
* ),
* @OA\Property(
* property="count",
* type="integer",
* description="count",
* default="null",
* example=0,
* ),
* @OA\Property(
* property="type",
* type="string",
* description="type book",
* default="null",
* example="sell",
* ),
* @OA\Property(
* property="release_date",
* type="string",
* description="release date",
* default="null",
* example="1403-2-24",
* ),
* @OA\Property(
* property="status",
* type="string",
* description="status book",
* default="null",
* example="accept",
* ),
* )
* ),
* @OA\Response(
Expand All @@ -336,15 +421,28 @@ public function show(Int $id)
public function update(Request $request, Int $id)
{
$request->validate([
'title' => 'required',
'author' => 'required',
'price' => 'required|numeric',
//'picture' => 'required|url',
'title' => 'required',
'author' => 'required',
'price' => 'required|numeric',
'sold_price' => 'numeric',
'type' => 'in:rent,sell,gift,ebook',
'count' => 'numeric',
'release_date'=> '',
'status' => 'in:reject,accept,is_waiting'
]);

try {
$book = Book::findOrFail($id);
$book->update($request->all());
$manage = book_user::whereBookId($book->id);
$manage->update([
'price' => $book->price,
'sold_price' => $request->sold_price,
'count' => $request->count,
'type' => $request->type,
'release_date'=> $request->release_date,
'status' => $request->status
]);
return response()->json($book);
} catch (Exception $e) {
Log::error($e->getMessage());
Expand Down
111 changes: 98 additions & 13 deletions app/Http/Controllers/BookController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
namespace App\Http\Controllers;

use App\Models\Book;
use App\Models\book_user;
use Carbon\Carbon;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Routing\Controllers\HasMiddleware;
Expand Down Expand Up @@ -146,7 +148,35 @@ public function index()
* description="price",
* default="null",
* example=0,
* )
* ),
* @OA\Property(
* property="sold_price",
* type="integer",
* description="sold price",
* default="null",
* example=0,
* ),
* @OA\Property(
* property="count",
* type="integer",
* description="count",
* default="null",
* example=0,
* ),
* @OA\Property(
* property="type",
* type="string",
* description="type book",
* default="null",
* example=0,
* ),
* @OA\Property(
* property="release_date",
* type="string",
* description="release date",
* default="null",
* example="1403-2-24",
* ),
* )
* ),
* @OA\Response(
Expand All @@ -165,18 +195,30 @@ public function index()
public function store(Request $request)
{
$request->validate([
'title' => 'required',
'author' => 'required',
'price' => 'required|numeric',
// 'picture' => 'required|string',
'title' => 'required',
'author' => 'required',
'price' => 'required|numeric',
'sold_price' => 'required|numeric',
'type' => 'required|in:rent,sell,gift,ebook',
'count' => 'required|numeric',
'release_date'=> 'required',
]);

try {
$book = Book::create($request->all());
book_user::create([
'user_id' => $request->user_id,
'book_id' => $book->id,
'price' => $book->price,
'sold_price' => $request->sold_price,
'count' => $request->count,
'type' => $request->type,
'release_date'=> $request->release_date,
]);
return $this->success($book);
} catch (Exception $e) {
Log::error($e->getMessage());
return $this->error(__('messages.book.notCreated'));
return $this->error(__('messages.book.notCreated'));
}
}

Expand Down Expand Up @@ -257,8 +299,43 @@ public function show(Int $id)
* type="integer",
* description="price",
* default="null",
* example="price Item",
* )
* example=0,
* ),
* @OA\Property(
* property="sold_price",
* type="integer",
* description="sold price",
* default="null",
* example=0,
* ),
* @OA\Property(
* property="count",
* type="integer",
* description="count",
* default="null",
* example=0,
* ),
* @OA\Property(
* property="type",
* type="string",
* description="type book",
* default="null",
* example="sell",
* ),
* @OA\Property(
* property="release_date",
* type="string",
* description="release date",
* default="null",
* example="1403-2-24",
* ),
* @OA\Property(
* property="status",
* type="string",
* description="status book",
* default="null",
* example="accept",
* ),
* )
* ),
* @OA\Response(
Expand All @@ -277,19 +354,27 @@ public function show(Int $id)
public function update(Request $request, Int $id)
{
$request->validate([
'title' => 'required',
'author' => 'required',
'price' => 'required|numeric',
'picture' => 'required|url',
'title' => 'required',
'author' => 'required',
'price' => 'required|numeric',
'sold_price' => 'numeric',
'count' => 'numeric',
'release_date'=> '',
]);

try {
$book = Book::findOrFail($id);
if ($book->user_id !== auth()->id() || $book->verified == 1) {
return $this->error(__('messages.Forbidden'), status:403);
}

$book->update($request->all());
$manage = book_user::whereBookId($book->id);
$manage->update([
'price' => $book->price,
'sold_price' => $request->sold_price,
'count' => $request->count,
'release_date'=> $request->release_date,
]);
return response()->json($book);
} catch (Exception $e) {
Log::error($e->getMessage());
Expand Down
5 changes: 5 additions & 0 deletions app/Models/Book.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,9 @@ public function ebook()
{
return $this->hasMany(Ebook::class);
}

public function bookUser()
{
return $this->hasOne(book_user::class);
}
}
5 changes: 5 additions & 0 deletions app/Models/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,9 @@ public function books()
{
return $this->hasMany(Book::class);
}

public function bookUser()
{
return $this->hasOne(book_user::class);
}
}
11 changes: 11 additions & 0 deletions app/Models/book_jobs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace App\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;

class book_jobs extends Model
{
use HasFactory;
}
30 changes: 30 additions & 0 deletions app/Models/book_user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace App\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;

class book_user extends Model
{
use HasFactory;
protected $fillable = [
'user_id',
'book_id',
'count',
'price',
'sold_price',
'release_date',
'status'
];

public function user()
{
return $this->belongsTo(User::class);
}

public function book()
{
return $this->belongsTo(Book::class);
}
}
Loading