Fix #1

Author: Rich Lott / Artful Robot

README.md

@@ -54,3 +54,8 @@ discuss any improvements. Please also note that a more general nuts-and-bolts
 solution to your problem may be found in using CiviRules instead.
 
 Enjoy :-)
+
+## Version 1.1
+
+This used to just work when adding Individuals, but now works for Households and
+Organisations (Issue #1)

autogroup.php

@@ -127,7 +127,7 @@ function autogroup_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
  * Ensure newly created contacts are added to the same groups as the creator.
  */
 function autogroup_civicrm_post($op, $objectName, $objectId, &$objectRef) {
-  if ($op == 'create' && $objectName == 'Individual') {
+  if ($op === 'create' && in_array($objectName, ['Individual', 'Organization', 'Household'])) {
 
     // Which groups do we consider for adding?
     $groups = Civi::settings()->get('autogroup_groups_to_copy');

info.xml

@@ -18,10 +18,12 @@
     <url desc="Licensing">http://www.gnu.org/licenses/gpl-3.0.html</url>
   </urls>
   <releaseDate>2017-11-30</releaseDate>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>4.7</ver>
+    <ver>5.0</ver>
+    <ver>5.13</ver>
   </compatibility>
   <comments></comments>
   <civix>

tests/phpunit/AutoGroupTest.php

@@ -32,6 +32,14 @@ class AutoGroupTest extends \PHPUnit_Framework_TestCase implements HeadlessInter
         'last_name' => 'Added',
         'contact_type' => 'Individual',
       ],
+      'new_org' => [
+        'display_name' => 'Caves and Stones Ltd.',
+        'contact_type' => 'Individual',
+      ],
+      'new_household' => [
+        'display_name' => 'The Rubble-Flintstones',
+        'contact_type' => 'Individual',
+      ],
     ],
     'groups' => [
       'addable1' => [
@@ -104,6 +112,52 @@ public function testAddingIndividualCopiesCorrectGroups() {
     }
   }
 
+  /**
+   * Test that the correct groups are copied.
+   */
+  public function testAddingOrganizationCopiesCorrectGroups() {
+
+    // Configure the extension.
+    $groups = Civi::settings()->set('autogroup_groups_to_copy', [
+      $this->fixtures['groups']['addable1']['group_id'],
+      $this->fixtures['groups']['addable2']['group_id'],
+    ]);
+
+
+    $result = civicrm_api3('Contact', 'create', $this->fixtures['contacts']['new_org']);
+    $this->fixtures['contacts']['new_org']['contact_id'] = $result['id'];
+
+    foreach (['addable1', 'addable2'] as $_) {
+      $this->assertContactInGroup($result['id'], $this->fixtures['groups'][$_]['group_id']);
+    }
+    foreach (['notaddable'] as $_) {
+      $this->assertContactNotInGroup($result['id'], $this->fixtures['groups'][$_]['group_id']);
+    }
+  }
+
+  /**
+   * Test that the correct groups are copied.
+   */
+  public function testAddingHouseholdCopiesCorrectGroups() {
+
+    // Configure the extension.
+    $groups = Civi::settings()->set('autogroup_groups_to_copy', [
+      $this->fixtures['groups']['addable1']['group_id'],
+      $this->fixtures['groups']['addable2']['group_id'],
+    ]);
+
+
+    $result = civicrm_api3('Contact', 'create', $this->fixtures['contacts']['new_household']);
+    $this->fixtures['contacts']['new_household']['contact_id'] = $result['id'];
+
+    foreach (['addable1', 'addable2'] as $_) {
+      $this->assertContactInGroup($result['id'], $this->fixtures['groups'][$_]['group_id']);
+    }
+    foreach (['notaddable'] as $_) {
+      $this->assertContactNotInGroup($result['id'], $this->fixtures['groups'][$_]['group_id']);
+    }
+  }
+
   /**
    * Example: Test that no groups are added when unconfigured.
    */