Skip to content
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.

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

submission #222

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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(); //this query will join the teams table and get the size column

return view('countries.index', compact('countries'));
}
Expand Down
7 changes: 7 additions & 0 deletions app/Http/Controllers/ProjectController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,21 @@

namespace App\Http\Controllers;

use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;

class ProjectController extends Controller
{
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, //this is the same as ['project_id' => $request->project_id]
['start_date' => $request->start_date]
);
//attach method inserts a new record

return 'Success';
}
Expand Down
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::has('projects')->get();

return view('users.index', compact('users'));
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Attachment.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ class Attachment extends Model

public function attachable()
{
// TASK: fill in the code to make it work
return $this->morphTo();
}
}
3 changes: 2 additions & 1 deletion app/Models/Role.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ 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');
}
}
2 changes: 1 addition & 1 deletion app/Models/Task.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ class Task extends Model

public function user()
{
return $this->belongsTo(User::class, 'users_id');
return $this->belongsTo(User::class, 'users_id')->withDefault(); //withDefault() is used to avoid errors when there is no user
}
}
2 changes: 1 addition & 1 deletion app/Models/Team.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)->withPivot('position', 'created_at');
}

}
7 changes: 4 additions & 3 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Laravel\Sanctum\HasApiTokens;
Expand Down Expand Up @@ -42,15 +43,15 @@ 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()
Expand Down
Loading