From f0b1e8ebb9ed26def25544cc1cea733dcfee0eb7 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sun, 28 Mar 2021 18:33:24 +0800 Subject: [PATCH] Change entities from FamilyMemberConnection to FamilyConnection --- ...lyMemberConnection.php => FamilyConnection.php} | 2 +- app/Http/Controllers/FamilyActionsController.php | 34 +++++++++---------- .../Users/FamilyConnectionRequestController.php | 6 ++-- ..._28_091809_create_family_connections_table.php} | 4 +-- tests/Feature/FamilyConnectionRequestTest.php | 4 +-- tests/Feature/ManageUserFamiliesTest.php | 38 +++++++++++----------- 6 files changed, 44 insertions(+), 44 deletions(-) rename app/{FamilyMemberConnection.php => FamilyConnection.php} (87%) rename database/migrations/{2021_03_28_091809_create_family_member_connections_table.php => 2021_03_28_091809_create_family_connections_table.php} (83%) diff --git a/app/FamilyMemberConnection.php b/app/FamilyConnection.php similarity index 87% rename from app/FamilyMemberConnection.php rename to app/FamilyConnection.php index 10876b5..6763c19 100644 --- a/app/FamilyMemberConnection.php +++ b/app/FamilyConnection.php @@ -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; diff --git a/app/Http/Controllers/FamilyActionsController.php b/app/Http/Controllers/FamilyActionsController.php index 822b0a9..a7bf7d8 100644 --- a/app/Http/Controllers/FamilyActionsController.php +++ b/app/Http/Controllers/FamilyActionsController.php @@ -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(); diff --git a/app/Http/Controllers/Users/FamilyConnectionRequestController.php b/app/Http/Controllers/Users/FamilyConnectionRequestController.php index cfb8f9f..5cf654a 100644 --- a/app/Http/Controllers/Users/FamilyConnectionRequestController.php +++ b/app/Http/Controllers/Users/FamilyConnectionRequestController.php @@ -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(); diff --git a/database/migrations/2021_03_28_091809_create_family_member_connections_table.php b/database/migrations/2021_03_28_091809_create_family_connections_table.php similarity index 83% rename from database/migrations/2021_03_28_091809_create_family_member_connections_table.php rename to database/migrations/2021_03_28_091809_create_family_connections_table.php index 275cbff..ff26a90 100644 --- a/database/migrations/2021_03_28_091809_create_family_member_connections_table.php +++ b/database/migrations/2021_03_28_091809_create_family_connections_table.php @@ -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'); diff --git a/tests/Feature/FamilyConnectionRequestTest.php b/tests/Feature/FamilyConnectionRequestTest.php index a0d754c..8f32e84 100644 --- a/tests/Feature/FamilyConnectionRequestTest.php +++ b/tests/Feature/FamilyConnectionRequestTest.php @@ -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, ]); diff --git a/tests/Feature/ManageUserFamiliesTest.php b/tests/Feature/ManageUserFamiliesTest.php index 8e3940b..c038c69 100644 --- a/tests/Feature/ManageUserFamiliesTest.php +++ b/tests/Feature/ManageUserFamiliesTest.php @@ -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, ]); }