Skip to content

Commit

Permalink
all test passed
Browse files Browse the repository at this point in the history
  • Loading branch information
Md. Saifur Rahman committed Apr 19, 2024
1 parent f9345a8 commit 52b9287
Show file tree
Hide file tree
Showing 12 changed files with 1,220 additions and 887 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/CountryController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}
Expand Down
2 changes: 2 additions & 0 deletions app/Http/Controllers/ProjectController.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ 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';
}
}
2 changes: 1 addition & 1 deletion app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class UserController extends Controller
{
public function index()
{
$users = User::all();
$users = User::whereHas('projects')->get();

return view('users.index', compact('users'));
}
Expand Down
1 change: 1 addition & 0 deletions app/Models/Attachment.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ class Attachment extends Model
public function attachable()
{
// TASK: fill in the code to make it work
return $this->morphTo();
}
}
4 changes: 4 additions & 0 deletions app/Models/Comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@ public function task()
{
return $this->belongsTo(Task::class);
}

public function attach(){
return $this->morphOne(Comment::class, 'attachable');
}
}
1 change: 1 addition & 0 deletions app/Models/Country.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ public function teams()
{
return $this->hasMany(Team::class);
}

}
2 changes: 1 addition & 1 deletion app/Models/Role.php
Original file line number Diff line number Diff line change
Expand Up @@ -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', 'role_id', 'user_id');
}
}
6 changes: 5 additions & 1 deletion app/Models/Task.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ class Task extends Model

public function user()
{
return $this->belongsTo(User::class, 'users_id');
return $this->belongsTo(User::class, 'users_id', 'id')->withDefault(['name' => 'Some task']);
}

public function attach(){
return $this->morphOne(Task::class, 'attachable');
}
}
4 changes: 3 additions & 1 deletion app/Models/Team.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ 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', 'user_id', 'team_id')
->withTimestamps()
->withPivot(['position']);
}

}
4 changes: 2 additions & 2 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ class User extends Authenticatable
public function tasks()
{
// TASK: fix this by adding a parameter
return $this->hasMany(Task::class);
return $this->hasMany(Task::class, 'users_id', 'id');
}

public function comments()
{
// TASK: add the code here for two-level relationship
return $this->hasManyThrough(Comment::class, Task::class, 'users_id', 'task_id');
}

public function projects()
Expand Down
Loading

0 comments on commit 52b9287

Please sign in to comment.