odon
/
silsilah
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Change entities from FamilyMemberConnection to FamilyConnection

family_member_connections
Nafies Luthfi 5 years ago
parent
be6eac814b
commit
f0b1e8ebb9
6 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/FamilyConnection.php
  2. 34
      app/Http/Controllers/FamilyActionsController.php
  3. 6
      app/Http/Controllers/Users/FamilyConnectionRequestController.php
  4. 4
      database/migrations/2021_03_28_091809_create_family_connections_table.php
  5. 4
      tests/Feature/FamilyConnectionRequestTest.php
  6. 38
      tests/Feature/ManageUserFamiliesTest.php

2
app/FamilyMemberConnection.php → app/FamilyConnection.php
View File

@ -4,7 +4,7 @@ namespace App;
use Illuminate\Database\Eloquent\Model;
class FamilyMemberConnection extends Model
class FamilyConnection extends Model
{
const STATUS_WAITING = 0;
const STATUS_APPROVED = 1;

34
app/Http/Controllers/FamilyActionsController.php
View File

@ -3,7 +3,7 @@
namespace App\Http\Controllers;
use App\Couple;
use App\FamilyMemberConnection;
use App\FamilyConnection;
use App\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
@ -29,11 +29,11 @@ class FamilyActionsController extends Controller
$user->father_id = $request->get('set_father_id');
$user->save();
FamilyMemberConnection::create([
FamilyConnection::create([
'id' => Uuid::uuid4()->toString(),
'requester_id' => $user->id,
'requested_id' => $request->get('set_father_id'),
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
} else {
$father = new User;
@ -45,11 +45,11 @@ class FamilyActionsController extends Controller
$user->setFather($father);
FamilyMemberConnection::create([
FamilyConnection::create([
'id' => Uuid::uuid4()->toString(),
'requester_id' => $user->id,
'requested_id' => $father->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -74,11 +74,11 @@ class FamilyActionsController extends Controller
$user->mother_id = $request->get('set_mother_id');
$user->save();
FamilyMemberConnection::create([
FamilyConnection::create([
'id' => Uuid::uuid4()->toString(),
'requester_id' => $user->id,
'requested_id' => $request->get('set_mother_id'),
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
} else {
$mother = new User;
@ -90,11 +90,11 @@ class FamilyActionsController extends Controller
$user->setMother($mother);
FamilyMemberConnection::create([
FamilyConnection::create([
'id' => Uuid::uuid4()->toString(),
'requester_id' => $user->id,
'requested_id' => $mother->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -138,20 +138,20 @@ class FamilyActionsController extends Controller
if ($user->gender_id == 1) {
$child->setFather($user);
FamilyMemberConnection::create([
FamilyConnection::create([
'id' => Uuid::uuid4()->toString(),
'requester_id' => $user->id,
'requested_id' => $child->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
} else {
$child->setMother($user);
FamilyMemberConnection::create([
FamilyConnection::create([
'id' => Uuid::uuid4()->toString(),
'requester_id' => $user->id,
'requested_id' => $child->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -190,11 +190,11 @@ class FamilyActionsController extends Controller
$user->addWife($wife, $request->get('marriage_date'));
FamilyMemberConnection::create([
FamilyConnection::create([
'id' => Uuid::uuid4()->toString(),
'requester_id' => $user->id,
'requested_id' => $wife->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
return back();
@ -228,11 +228,11 @@ class FamilyActionsController extends Controller
$user->addHusband($husband, $request->get('marriage_date'));
FamilyMemberConnection::create([
FamilyConnection::create([
'id' => Uuid::uuid4()->toString(),
'requester_id' => $user->id,
'requested_id' => $husband->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
return back();

6
app/Http/Controllers/Users/FamilyConnectionRequestController.php
View File

@ -2,7 +2,7 @@
namespace App\Http\Controllers\Users;
use App\FamilyMemberConnection;
use App\FamilyConnection;
use App\Http\Controllers\Controller;
use App\User;
use Illuminate\Http\Request;
@ -12,11 +12,11 @@ class FamilyConnectionRequestController extends Controller
{
public function store(Request $request, User $user)
{
FamilyMemberConnection::create([
FamilyConnection::create([
'id' => Uuid::uuid4()->toString(),
'requester_id' => auth()->id(),
'requested_id' => $user->id,
'status_id' => FamilyMemberConnection::STATUS_WAITING,
'status_id' => FamilyConnection::STATUS_WAITING,
]);
return back();

4
database/migrations/2021_03_28_091809_create_family_member_connections_table.php → database/migrations/2021_03_28_091809_create_family_connections_table.php
View File

@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateFamilyMemberConnectionsTable extends Migration
class CreateFamilyConnectionsTable extends Migration
{
/**
* Run the migrations.
@ -13,7 +13,7 @@ class CreateFamilyMemberConnectionsTable extends Migration
*/
public function up()
{
Schema::create('family_member_connections', function (Blueprint $table) {
Schema::create('family_connections', function (Blueprint $table) {
$table->uuid('id')->primary();
$table->uuid('requester_id');
$table->uuid('requested_id');

4
tests/Feature/FamilyConnectionRequestTest.php
View File

@ -16,7 +16,7 @@ class FamilyConnectionRequestTest extends TestCase
$user = $this->loginAsUser();
$otherPerson = factory(User::class)->create();
$this->dontSeeInDatabase('family_member_connections', [
$this->dontSeeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $otherPerson->id,
]);
@ -26,7 +26,7 @@ class FamilyConnectionRequestTest extends TestCase
$this->press('send_family_connection_request');
$this->seeRouteIs('users.show', $otherPerson);
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $otherPerson->id,
]);

38
tests/Feature/ManageUserFamiliesTest.php
View File

@ -2,7 +2,7 @@
namespace Tests\Feature;
use App\FamilyMemberConnection;
use App\FamilyConnection;
use App\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
@ -32,10 +32,10 @@ class ManageUserFamiliesTest extends TestCase
$this->assertEquals('Nama Ayah', $user->fresh()->father->nickname);
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $user->fresh()->father->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -61,10 +61,10 @@ class ManageUserFamiliesTest extends TestCase
$this->assertEquals('Nama Ibu', $user->fresh()->mother->nickname);
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $user->fresh()->mother->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -95,10 +95,10 @@ class ManageUserFamiliesTest extends TestCase
]);
$child = User::where('name', 'Nama Anak 1')->first();
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $child->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -191,10 +191,10 @@ class ManageUserFamiliesTest extends TestCase
'manager_id' => $user->id,
]);
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $wife->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -230,10 +230,10 @@ class ManageUserFamiliesTest extends TestCase
'manager_id' => $user->id,
]);
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $husband->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -258,10 +258,10 @@ class ManageUserFamiliesTest extends TestCase
$this->assertEquals($father->nickname, $user->fresh()->father->nickname);
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $father->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -286,10 +286,10 @@ class ManageUserFamiliesTest extends TestCase
$this->assertEquals($mother->nickname, $user->fresh()->mother->nickname);
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $mother->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -318,10 +318,10 @@ class ManageUserFamiliesTest extends TestCase
'manager_id' => $user->id,
]);
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $wife->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}
@ -350,10 +350,10 @@ class ManageUserFamiliesTest extends TestCase
'manager_id' => $user->id,
]);
$this->seeInDatabase('family_member_connections', [
$this->seeInDatabase('family_connections', [
'requester_id' => $user->id,
'requested_id' => $husband->id,
'status_id' => FamilyMemberConnection::STATUS_APPROVED,
'status_id' => FamilyConnection::STATUS_APPROVED,
]);
}

Write Preview
Loading…
Cancel
Save