From 9c301724593d64c5627055293357f2816266f5a2 Mon Sep 17 00:00:00 2001 From: Porrapat Petchdamrongskul Date: Fri, 29 Sep 2023 14:48:54 +0700 Subject: [PATCH] Test all pass --- app/Http/Controllers/CountryController.php | 2 +- app/Http/Controllers/ProjectController.php | 4 +++- app/Http/Controllers/UserController.php | 2 +- app/Models/Attachment.php | 1 + app/Models/Role.php | 2 +- app/Models/Task.php | 7 +++++++ app/Models/Team.php | 2 +- app/Models/User.php | 6 ++++-- resources/views/tasks/index.blade.php | 2 +- 9 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/CountryController.php b/app/Http/Controllers/CountryController.php index 2b9be507..14215428 100644 --- a/app/Http/Controllers/CountryController.php +++ b/app/Http/Controllers/CountryController.php @@ -9,7 +9,7 @@ class CountryController extends Controller public function index() { // TASK: load the relationship average of team size - $countries = Country::all(); + $countries = Country::withAvg('teams', 'size')->get();; return view('countries.index', compact('countries')); } diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index e04fb1a6..9fd3c524 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -3,6 +3,8 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; class ProjectController extends Controller { @@ -10,7 +12,7 @@ public function store(Request $request) { // TASK: Add one sentence to save the project to the logged-in user // by $request->project_id and with $request->start_date parameter - + Auth::user()->projects()->attach($request->project_id, ['start_date' => $request->start_date]); return 'Success'; } } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 7ae1d3d6..e3893236 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -8,7 +8,7 @@ class UserController extends Controller { public function index() { - $users = User::all(); + $users = User::has('projects', '>=', 1)->get(); return view('users.index', compact('users')); } diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 158b6470..b03eb415 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -14,5 +14,6 @@ class Attachment extends Model public function attachable() { // TASK: fill in the code to make it work + return $this->morphTo('attachable', 'attachable_type', 'attachable_id'); } } diff --git a/app/Models/Role.php b/app/Models/Role.php index c2f3fc89..24099baa 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -14,6 +14,6 @@ class Role extends Model public function users() { // TASK: fix this by adding a parameter - return $this->belongsToMany(User::class); + return $this->belongsToMany(User::class, 'users_roles'); } } diff --git a/app/Models/Task.php b/app/Models/Task.php index 01f6912d..9bed4d9c 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -4,6 +4,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\HasMany; class Task extends Model { @@ -15,4 +16,10 @@ public function user() { return $this->belongsTo(User::class, 'users_id'); } + + public function comments(): HasMany + { + // TASK: fix this by adding a parameter + return $this->hasMany(Comment::class); + } } diff --git a/app/Models/Team.php b/app/Models/Team.php index 13969525..ebe4cb50 100644 --- a/app/Models/Team.php +++ b/app/Models/Team.php @@ -14,7 +14,7 @@ class Team extends Model public function users() { // TASK: fix this by adding some extra code - return $this->belongsToMany(User::class); + return $this->belongsToMany(User::class, 'team_user:position,created_at'); } } diff --git a/app/Models/User.php b/app/Models/User.php index 3d7facd2..b8cf157a 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -7,6 +7,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Laravel\Sanctum\HasApiTokens; +use Illuminate\Database\Eloquent\Relations\HasMany; class User extends Authenticatable { @@ -42,15 +43,16 @@ class User extends Authenticatable 'email_verified_at' => 'datetime', ]; - public function tasks() + public function tasks(): HasMany { // TASK: fix this by adding a parameter - return $this->hasMany(Task::class); + return $this->hasMany(Task::class, 'users_id'); } public function comments() { // TASK: add the code here for two-level relationship + return $this->hasManyThrough(Comment::class, Task::class, 'users_id'); } public function projects() diff --git a/resources/views/tasks/index.blade.php b/resources/views/tasks/index.blade.php index 8d229417..1c5602b7 100644 --- a/resources/views/tasks/index.blade.php +++ b/resources/views/tasks/index.blade.php @@ -1,5 +1,5 @@