Merge pull request #1252 from eileenmcnaughton/CRM-13072-testfixes

[civicrm-core.git] / api / v3 / Relationship.php

diff --git a/api/v3/Relationship.php b/api/v3/Relationship.php
index 1b6c3cb94ac132d61212e93eb5aef06ab6894a6e..e6ba8153f529b191dd0468c9b2a4439bd2cbdbda 100644 (file)
--- a/api/v3/Relationship.php
+++ b/api/v3/Relationship.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -56,31 +55,30 @@ function civicrm_api3_relationship_create($params) {
   $values = array();
   _civicrm_api3_relationship_format_params($params, $values);
   $ids = array();
-  $action = CRM_Core_Action::ADD;
 
   if (CRM_Utils_Array::value('id', $params)) {
-    $ids['relationship'] = $params['id'];
     $ids['contactTarget'] = $values['contact_id_b'];
-    $action = CRM_Core_Action::UPDATE;
   }
 
   $values['relationship_type_id'] = $values['relationship_type_id'] . '_a_b';
-  $values['contact_check'] = array($params['contact_id_b'] => $params['contact_id_b']);
-  $ids['contact'] = $values['contact_id_a'];
+  if(!empty($params['contact_id_b'])){
+    $values['contact_check'] = array($params['contact_id_b'] => $params['contact_id_b']);
+  }
+  if(!empty($values['contact_id_a'])){
+    $ids['contact'] = $values['contact_id_a'];
+  }
   $relationshipBAO = CRM_Contact_BAO_Relationship::create($values, $ids);
 
   if ($relationshipBAO[1]) {
-    return civicrm_api3_create_error('Relationship is not valid');
+    throw new API_Exception('Relationship is not valid');
   }
   elseif ($relationshipBAO[2]) {
-    return civicrm_api3_create_error('Relationship already exists');
+    throw new API_Exception('Relationship already exists');
   }
-  CRM_Contact_BAO_Relationship::relatedMemberships($params['contact_id_a'], $values, $ids, $action);
-  $relationID = $relationshipBAO[4][0];
-  return civicrm_api3_create_success(array(
-    $relationID => array('id' => $relationID,
-        'moreIDs' => implode(',', $relationshipBAO[4]),
-      )));
+  $id = $relationshipBAO[4][0];
+  $values = array();
+  _civicrm_api3_object_to_array($relationshipBAO[5][$id], $values[$id]);
+  return civicrm_api3_create_success($values, $params, 'relationship', 'create');
 }
 
 /**
@@ -109,7 +107,6 @@ function _civicrm_api3_relationship_create_spec(&$params) {
  */
 function civicrm_api3_relationship_delete($params) {
 
-  require_once 'CRM/Utils/Rule.php';
   if (!CRM_Utils_Rule::integer($params['id'])) {
     return civicrm_api3_create_error('Invalid value for relationship ID');
   }
@@ -208,7 +205,6 @@ function _civicrm_api3_relationship_format_params($params, &$values) {
 
   foreach ($params as $key => $value) {
     // ignore empty values or empty arrays etc
-    require_once 'CRM/Utils/System.php';
     if (CRM_Utils_System::isNull($value)) {
       continue;
     }
@@ -216,7 +212,6 @@ function _civicrm_api3_relationship_format_params($params, &$values) {
     switch ($key) {
       case 'contact_id_a':
       case 'contact_id_b':
-        require_once 'CRM/Utils/Rule.php';
         if (!CRM_Utils_Rule::integer($value)) {
           throw new Exception("contact_id not valid: $value");
         }