Browse Source

Change user marriages relation to user couples

pull/3/head
Nafies Luthfi 8 years ago
parent
commit
22d0a753c1
  1. 2
      app/Http/Controllers/HomeController.php
  2. 2
      app/Http/Controllers/UsersController.php
  3. 4
      app/User.php
  4. 4
      tests/Unit/UserTest.php

2
app/Http/Controllers/HomeController.php

@ -27,7 +27,7 @@ class HomeController extends Controller
$user = auth()->user();
$usersMariageList = [];
foreach ($user->marriages as $spouse) {
foreach ($user->couples as $spouse) {
$usersMariageList[$spouse->pivot->id] = $user->name.' & '.$spouse->name;
}

2
app/Http/Controllers/UsersController.php

@ -39,7 +39,7 @@ class UsersController extends Controller
public function show(User $user)
{
$usersMariageList = [];
foreach ($user->marriages as $spouse) {
foreach ($user->couples as $spouse) {
$usersMariageList[$spouse->pivot->id] = $user->name.' & '.$spouse->name;
}

4
app/User.php

@ -138,10 +138,10 @@ class User extends Authenticatable
public function hasBeenMarriedTo(User $user)
{
return $this->marriages->contains($user);
return $this->couples->contains($user);
}
public function marriages()
public function couples()
{
if ($this->gender_id == 1)
return $this->belongsToMany(User::class, 'couples', 'husband_id', 'wife_id')->withPivot(['id'])->withTimestamps();

4
tests/Unit/UserTest.php

@ -18,7 +18,7 @@ class UserTest extends TestCase
}
/** @test */
public function user_can_have_marriages()
public function user_can_have_couples()
{
$husband = factory(User::class)->states('male')->create();
$wife = factory(User::class)->states('female')->create();
@ -27,7 +27,7 @@ class UserTest extends TestCase
$husband = $husband->fresh();
$this->assertCount(1, $husband->wifes);
$this->assertCount(1, $wife->husbands);
$this->assertCount(1, $husband->marriages);
$this->assertCount(1, $husband->couples);
}
/** @test */

Loading…
Cancel
Save