tests

app/Account.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Carbon\Carbon;
+use App\RelationshipType;
 use Laravel\Cashier\Billable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -458,12 +459,12 @@ public function timezone()
      * Populates the Contact Field Types table right after an account is
      * created.
      */
-    public function populateContactFieldTypeTable($ignoreMigratedTable = false)
+    public function populateContactFieldTypeTable($ignoreTableAlreadyMigrated = false)
     {
         $defaultContactFieldTypes = DB::table('default_contact_field_types')->get();
 
         foreach ($defaultContactFieldTypes as $defaultContactFieldType) {
-            if (! $ignoreMigratedTable || $defaultContactFieldType->migrated == 0) {
+            if (! $ignoreTableAlreadyMigrated || $defaultContactFieldType->migrated == 0) {
                 ContactFieldType::create([
                     'account_id' => $this->id,
                     'name' => $defaultContactFieldType->name,
@@ -504,32 +505,46 @@ public function populateDefaultReminderRulesTable()
      *
      * @return void
      */
-    public function populateRelationshipTypesTable($ignoreMigratedTable = false)
+    public function populateRelationshipTypeGroupsTable($ignoreTableAlreadyMigrated = false)
     {
         $defaultRelationshipTypeGroups = DB::table('default_relationship_type_groups')->get();
         foreach ($defaultRelationshipTypeGroups as $defaultRelationshipTypeGroup) {
-            if (! $ignoreMigratedTable || $defaultRelationshipTypeGroups->migrated == 0) {
+            if (! $ignoreTableAlreadyMigrated || $defaultRelationshipTypeGroup->migrated == 0) {
                 $id = DB::table('relationship_type_groups')->insertGetId([
                     'account_id' => $this->id,
                     'name' => $defaultRelationshipTypeGroup->name,
                     'delible' => $defaultRelationshipTypeGroup->delible,
                 ]);
+            }
+        }
+    }
+
+    /**
+     * Populate the relationship types table based on the default ones.
+     *
+     * @param  bool $ignoreTableAlreadyMigrated
+     * @return void
+     */
+    public function populateRelationshipTypesTable($ignoreTableAlreadyMigrated = false)
+    {
+        $defaultRelationshipTypes = DB::table('default_relationship_types')->get();
+
+        foreach ($defaultRelationshipTypes as $defaultRelationshipType) {
+
+            if (! $ignoreTableAlreadyMigrated || $defaultRelationshipType->migrated == 0) {
+                $defaultRelationshipTypeGroup = DB::table('default_relationship_type_groups')
+                                        ->where('id', $defaultRelationshipType->relationship_type_group_id)
+                                        ->first();
 
-                $defaultRelationshipTypes = DB::table('default_relationship_types')
-                                            ->where('relationship_type_group_id', $defaultRelationshipTypeGroup->id)
-                                            ->get();
-
-                foreach ($defaultRelationshipTypes as $defaultRelationshipType) {
-                    if (! $ignoreMigratedTable || $defaultRelationshipType->migrated == 0) {
-                        RelationshipType::create([
-                            'account_id' => $this->id,
-                            'name' => $defaultRelationshipType->name,
-                            'name_reverse_relationship' => $defaultRelationshipType->name_reverse_relationship,
-                            'relationship_type_group_id' => $id,
-                            'delible' => $defaultRelationshipType->delible,
-                        ]);
-                    }
-                }
+                $relationshipTypeGroup = $this->getRelationshipTypeGroupByType($defaultRelationshipTypeGroup->name);
+
+                RelationshipType::create([
+                    'account_id' => $this->id,
+                    'name' => $defaultRelationshipType->name,
+                    'name_reverse_relationship' => $defaultRelationshipType->name_reverse_relationship,
+                    'relationship_type_group_id' => $relationshipTypeGroup->id,
+                    'delible' => $defaultRelationshipType->delible,
+                ]);
             }
         }
     }
@@ -637,6 +652,7 @@ public static function populateDefaultFields($account)
         $account->populateContactFieldTypeTable();
         $account->populateDefaultGendersTable();
         $account->populateDefaultReminderRulesTable();
+        $account->populateRelationshipTypeGroupsTable();
         $account->populateRelationshipTypesTable();
     }
 

app/Http/Controllers/Contacts/RelationshipsController.php

@@ -171,7 +171,7 @@ public function edit(Contact $contact, Contact $otherContact)
         foreach (auth()->user()->account->relationshipTypes as $relationshipType) {
             $arrayRelationshipTypes->push([
                 'id' => $relationshipType->id,
-                'name' => $relationshipType->getLocalizedName(),
+                'name' => $relationshipType->getLocalizedName($contact, true),
             ]);
         }
 

app/RelationshipType.php

@@ -50,10 +50,12 @@ public function relationshipTypeGroup()
      *
      * @return string
      */
-    public function getLocalizedName(Contact $contact = null, bool $includeReverse = false, string $gender = 'man')
+    public function getLocalizedName(Contact $contact = null, bool $includeOpposite = false, string $gender = 'man')
     {
         // include the reverse of the relation in the string (masculine/feminine)
-        if (! is_null($contact) && $includeReverse) {
+        // this is used in the dropdown of the relationship types when creating
+        // or deleting a relationship.
+        if (! is_null($contact) && $includeOpposite) {
             // in some language, masculine and feminine version of a relationship type is the same.
             // we need to keep just one version in that case.
             $femaleVersion = trans('app.relationship_type_'.$this->name.'_female');
@@ -63,7 +65,7 @@ public function getLocalizedName(Contact $contact = null, bool $includeReverse =
                 return trans('app.relationship_type_'.$this->name.'_with_name', ["name" => $contact->getCompleteName()]);
             }
 
-            // `Regis Freyd's uncle/aunt`
+            // otherwise `Regis Freyd's uncle/aunt`
             return trans(
                 'app.relationship_type_'.$this->name.'_with_name',
                 ["name" => $contact->getCompleteName()]
@@ -79,16 +81,12 @@ public function getLocalizedName(Contact $contact = null, bool $includeReverse =
             return trans('app.relationship_type_'.$this->name.'_with_name', ["name" => $contact->getCompleteName()]);
         }
 
-        // `uncle`
+        // `aunt`
         if (strtolower($gender) == 'woman') {
             return trans('app.relationship_type_'.$this->name.'_female');
         }
 
+        // `uncle`
         return trans('app.relationship_type_'.$this->name);
     }
-
-    public function getReverse()
-    {
-        return $this->account->getRelationshipTypeByType($this->name);
-    }
 }

database/factories/ModelFactory.php

@@ -117,6 +117,12 @@
     ];
 });
 
+$factory->define(App\RelationshipTypeGroup::class, function (Faker\Generator $faker) {
+    return [
+        'account_id' => 1,
+    ];
+});
+
 $factory->define(App\Offspring::class, function (Faker\Generator $faker) {
     return [
         'account_id' => 1,

database/migrations/2018_03_18_090209_populate_relationship_type_tables_with_default_values.php

@@ -17,6 +17,7 @@ public function up()
     {
         Account::chunk(200, function ($accounts) {
             foreach ($accounts as $account) {
+                $account->populateRelationshipTypeGroupsTable();
                 $account->populateRelationshipTypesTable();
             }
         });

database/migrations/2018_03_24_083258_migrate_offsprings.php

@@ -25,15 +25,15 @@ public function up()
                     DB::table('relationships')->insert([
                         [
                             'account_id' => $account->id,
-                            'contact_id_main' => $offspring->contact_id,
-                            'contact_id_secondary' => $offspring->is_the_child_of,
+                            'contact_id_main' => $offspring->is_the_child_of,
+                            'contact_id_secondary' => $offspring->contact_id,
                             'relationship_type_id' => $relationshipChildTypeId,
                             'relationship_type_name' => 'child',
                         ],
                         [
                             'account_id' => $account->id,
-                            'contact_id_main' => $offspring->is_the_child_of,
-                            'contact_id_secondary' => $offspring->contact_id,
+                            'contact_id_main' => $offspring->contact_id,
+                            'contact_id_secondary' => $offspring->is_the_child_of,
                             'relationship_type_id' => $relationshipParentTypeId,
                             'relationship_type_name' => 'parent',
                         ]

resources/lang/en/people.php

@@ -149,6 +149,7 @@
 
     // relationships
     'relationship_form_add' => 'Add a new relationship',
+    'relationship_form_edit' => 'Edit an existing relationship',
     'relationship_form_is_with' => 'This person is...',
     'relationship_form_add_choice' => 'Who is the relationship with?',
     'relationship_form_create_contact' => 'Add a new person',
@@ -160,10 +161,6 @@
     'relationship_delete_confirmation' => 'Are you sure you want to delete this relationship? Deletion is permanent.',
     'relationship_unlink_confirmation' => 'Are you sure you want to delete this relationship? This person will not be deleted - only the relationship between the two.',
 
-    // significant other
-    'significant_other_sidebar_title' => 'Significant other',
-    'significant_other_cta' => 'Add significant other',
-
     // tasks
     'tasks_blank_title' => 'You don\'t have any tasks yet.',
     'tasks_form_title' => 'Title',

resources/views/people/relationship/_relationship.blade.php

@@ -1,5 +1,5 @@
 @foreach ($relationships as $relationship)
-  <div>
+  <div class="sidebar-box-paragraph">
     <span class="silver fw3 ba br2 ph1">{{ $relationship->relationshipType->getLocalizedName(null, false, $relationship->withContact->gender->name) }}</span>
 
     {{-- NAME --}}

tests/Unit/AccountTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Unit;
 
+use DB;
 use App\User;
 use App\Account;
 use App\Reminder;
@@ -430,22 +431,6 @@ public function test_it_populates_the_account_with_the_right_default_reminder_ru
         );
     }
 
-    public function test_it_populates_the_account_with_the_right_default_relationship_types()
-    {
-        $account = factory(Account::class)->create([]);
-        $account->populateDefaultRelationshipTypesTable();
-
-        $this->assertEquals(
-            1,
-            $account->relationshipTypes->count()
-        );
-
-        $this->assertDatabaseHas(
-            'relationship_types',
-            ['name' => 'partner']
-        );
-    }
-
     public function test_it_gets_the_relationship_type_object_matching_a_given_name()
     {
         $account = factory('App\Account')->create([]);
@@ -467,4 +452,76 @@ public function test_it_gets_the_relationship_type_group_object_matching_a_given
 
         $this->assertInstanceOf('App\RelationshipTypeGroup', $account->getRelationshipTypeGroupByType('love'));
     }
+
+    public function test_it_populates_default_relationship_type_groups_table_if_tables_havent_been_migrated_yet()
+    {
+        $account = factory('App\Account')->create([]);
+
+        // Love type
+        $id = DB::table('default_relationship_type_groups')->insertGetId([
+            'name' => 'friend_and_family',
+        ]);
+
+        $account->populateRelationshipTypeGroupsTable();
+
+        $this->assertDatabaseHas('relationship_type_groups', [
+            'name' => 'friend_and_family',
+        ]);
+    }
+
+    public function test_it_skips_default_relationship_type_groups_table_for_types_already_migrated()
+    {
+        $account = factory('App\Account')->create([]);
+        $id = DB::table('default_relationship_type_groups')->insertGetId([
+            'name' => 'friend_and_family',
+            'migrated' => 1,
+        ]);
+
+        $account->populateRelationshipTypeGroupsTable(true);
+
+        $this->assertDatabaseMissing('relationship_type_groups', [
+            'name' => 'friend_and_family',
+        ]);
+    }
+
+    public function test_it_populates_default_relationship_types_table_if_tables_havent_been_migrated_yet()
+    {
+        $account = factory('App\Account')->create([]);
+        $id = DB::table('default_relationship_type_groups')->insertGetId([
+            'name' => 'friend_and_family',
+        ]);
+
+        DB::table('default_relationship_types')->insert([
+            'name' => 'fuckfriend',
+            'relationship_type_group_id' => $id,
+        ]);
+
+        $account->populateRelationshipTypeGroupsTable();
+        $account->populateRelationshipTypesTable();
+
+        $this->assertDatabaseHas('relationship_types', [
+            'name' => 'fuckfriend',
+        ]);
+    }
+
+    public function test_it_skips_default_relationship_types_table_for_types_already_migrated()
+    {
+        $account = factory('App\Account')->create([]);
+        $id = DB::table('default_relationship_type_groups')->insertGetId([
+            'name' => 'friend_and_family',
+        ]);
+
+        DB::table('default_relationship_types')->insert([
+            'name' => 'fuckfriend',
+            'relationship_type_group_id' => $id,
+            'migrated' => 1,
+        ]);
+
+        $account->populateRelationshipTypeGroupsTable();
+        $account->populateRelationshipTypesTable(true);
+
+        $this->assertDatabaseMissing('relationship_types', [
+            'name' => 'fuckfriend',
+        ]);
+    }
 }