CRM-16036 replace basic_get innids with sql builder

api/v3/Activity.php

@@ -242,7 +242,25 @@ function civicrm_api3_activity_get($params) {
     }
   }
   else {
-    $activities = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, FALSE, 'Activity');
+    $extraSql = array();
+    $options = civicrm_api3('ActivityContact', 'getoptions', array('field' => 'record_type_id'));
+    $options = $options['values'];
+    $activityContactOptions = array(
+      'target_contact_id' => array_search('Activity Targets', $options),
+      'source_contact_id' => array_search('Activity Source', $options),
+      'assignee_contact_id' => array_search('Activity Assignees', $options),
+    );
+    foreach ($activityContactOptions as $activityContactName => $activityContactValue) {
+      if (!empty($params[$activityContactName])) {
+        $extraSql['join'][] = array(
+          'activity_' . $activityContactName => '
+          LEFT JOIN civicrm_activity_contact ac ON a.id = ac.activity_id AND ac.record_type_id = ' . $activityContactValue,
+        );
+        // Note that if we later need to change the int to an array we would need sql escaping.
+        $extraSql['where'] = array('activity_' . $activityContactName => 'ac.contact_id = ' . (int) $params[$activityContactName]);
+      }
+    }
+    $activities = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, FALSE, 'Activity', $extraSql);
   }
   $options = _civicrm_api3_get_options_from_params($params, FALSE, 'Activity', 'get');
   if ($options['is_count']) {
@@ -280,6 +298,7 @@ function _civicrm_api3_activity_get_formatResult($params, $activities) {
       $returns[$returnkey] = $v;
     }
   }
+
   $returns['source_contact_id'] = 1;
   foreach ($returns as $n => $v) {
     switch ($n) {

api/v3/Dashboard.php

@@ -72,6 +72,7 @@ function _civicrm_api3_dashboard_create_spec(&$params) {
  * @return array
  */
 function civicrm_api3_dashboard_get($params) {
+  // NEVER COPY THIS. No idea why a newish api would not use basic_get.
   $bao = new CRM_Core_BAO_Dashboard();
   _civicrm_api3_dao_set_filter($bao, $params, TRUE);
   $dashlets = _civicrm_api3_dao_to_array($bao, $params, TRUE, 'Dashboard');

api/v3/Event.php

@@ -125,34 +125,27 @@ function civicrm_api3_event_get($params) {
     unset($params['return.max_results']);
   }
 
-  $eventDAO = new CRM_Event_BAO_Event();
-  _civicrm_api3_dao_set_filter($eventDAO, $params, TRUE);
-
+  $extraSql = array();
   if (!empty($params['isCurrent'])) {
-    $eventDAO->whereAdd('(start_date >= CURDATE() || end_date >= CURDATE())');
+    $extraSql['where'] = array('civicrm_event' => '(start_date >= CURDATE() || end_date >= CURDATE())');
   }
 
-  // @todo should replace all this with _civicrm_api3_dao_to_array($bao, $params, FALSE, $entity) - but we still have
-  // the return.is_full to deal with.
-  // NB the std dao_to_array function should only return custom if required.
-  $event = array();
+  $events = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, FALSE, 'Event', $extraSql, TRUE);
   $options = _civicrm_api3_get_options_from_params($params);
-
-  $eventDAO->find();
-  while ($eventDAO->fetch()) {
-    $event[$eventDAO->id] = array();
-    CRM_Core_DAO::storeValues($eventDAO, $event[$eventDAO->id]);
+  if ($options['is_count']) {
+    return civicrm_api3_create_success($events, $params, 'Event', 'get');
+  }
+  foreach ($events as $id => $event) {
     if (!empty($params['return.is_full'])) {
-      _civicrm_api3_event_getisfull($event, $eventDAO->id);
+      _civicrm_api3_event_getisfull($events, $id);
     }
-    _civicrm_api3_event_get_legacy_support_42($event, $eventDAO->id);
-    _civicrm_api3_custom_data_get($event[$eventDAO->id], 'Event', $eventDAO->id, NULL, $eventDAO->event_type_id);
+    _civicrm_api3_event_get_legacy_support_42($events, $id);
     if (!empty($options['return'])) {
-      $event[$eventDAO->id]['price_set_id'] = CRM_Price_BAO_PriceSet::getFor('civicrm_event', $eventDAO->id);
+      $events[$id]['price_set_id'] = CRM_Price_BAO_PriceSet::getFor('civicrm_event', $id);
     }
   }
 
-  return civicrm_api3_create_success($event, $params, 'Event', 'get', $eventDAO);
+  return civicrm_api3_create_success($events, $params, 'Event', 'get');
 }
 
 /**

api/v3/MailingGroup.php

@@ -130,30 +130,3 @@ function civicrm_api3_mailing_group_get($params) {
 function civicrm_api3_mailing_group_delete($params) {
   return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
-
-/**
- * Get metadata for mailing group functions.
- *
- * @param array $params
- *
- * @return array
- */
-function civicrm_api3_mailing_group_getfields($params) {
-  $dao = _civicrm_api3_get_DAO('Subscribe');
-  $d = new $dao();
-  $fields = $d->fields();
-  $d->free();
-
-  $dao = _civicrm_api3_get_DAO('Unsubscribe');
-  $d = new $dao();
-  $fields = $fields + $d->fields();
-  $d->free();
-
-  // CRM-13830 - prevent the api wrapper from helping out with pseudoconstants
-  // Since these fields don't belong to this entity it will fail
-  foreach ($fields as &$field) {
-    unset($field['pseudoconstant']);
-  }
-
-  return civicrm_api3_create_success($fields, $params, 'MailingGroup', 'getfields');
-}

api/v3/WordReplacement.php

@@ -43,6 +43,7 @@
  * @throws \API_Exception
  */
 function civicrm_api3_word_replacement_get($params) {
+  // NEVER COPY THIS. No idea why a newish api would not use basic_get.
   $bao = new CRM_Core_BAO_WordReplacement();
   _civicrm_api3_dao_set_filter($bao, $params, TRUE);
   $wordReplacements = _civicrm_api3_dao_to_array($bao, $params, TRUE, 'WordReplacement');