Merge pull request #12461 from eileenmcnaughton/domain_id

Make domain_id optional in membership_type api.
civicrm · Jul 14, 2018 · 0deadf1 · 0deadf1
2 parents c08d63f + fb38ab8
commit 0deadf1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/api/v3/MembershipType.php b/api/v3/MembershipType.php
@@ -59,8 +59,7 @@ function civicrm_api3_membership_type_create($params) {
  *   Array of parameters determined by getfields.
  */
 function _civicrm_api3_membership_type_create_spec(&$params) {
-  // todo could set default here probably
-  $params['domain_id']['api.required'] = 1;
+  $params['domain_id']['api.default'] = CRM_Core_Config::domainID();
   $params['member_of_contact_id']['api.required'] = 1;
   $params['financial_type_id']['api.required'] = 1;
   $params['name']['api.required'] = 1;

diff --git a/tests/phpunit/api/v3/MembershipTypeTest.php b/tests/phpunit/api/v3/MembershipTypeTest.php
@@ -126,9 +126,9 @@ public function testCreate() {
   }
 
   /**
-   * Test update fails with no ID.
+   * Domain ID can be intuited..
    */
-  public function testUpdateWithoutId() {
+  public function testCreateWithoutDomainId() {
     $params = array(
       'name' => '60+ Membership',
       'description' => 'people above 60 are given health instructions',
@@ -141,8 +141,18 @@ public function testUpdateWithoutId() {
       'visibility' => 'public',
     );
 
-    $membershipType = $this->callAPIFailure('membership_type', 'create', $params);
-    $this->assertEquals($membershipType['error_message'], 'Mandatory key(s) missing from params array: domain_id');
+    $membershipType = $this->callAPISuccess('membership_type', 'create', $params);
+    $domainID = $this->callAPISuccessGetValue('MembershipType', ['return' => 'domain_id', 'id' => $membershipType['id']]);
+    $this->assertEquals(CRM_Core_Config::domainID(), $domainID);
+
+    $this->callAPISuccess('membership_type', 'create', ['domain_id' => 2, 'id' => $membershipType['id']]);
+    $domainID = $this->callAPISuccessGetValue('MembershipType', ['return' => 'domain_id', 'id' => $membershipType['id']]);
+    $this->assertEquals(2, $domainID);
+
+    $this->callAPISuccess('membership_type', 'create', ['id' => $membershipType['id'], 'description' => 'Cool member']);
+    $domainID = $this->callAPISuccessGetValue('MembershipType', ['return' => 'domain_id', 'id' => $membershipType['id']]);
+    $this->assertEquals(2, $domainID);
+
   }
 
   /**