adds params and shallow load logic back in

Author: chloealee

lib/modules/dosomething/dosomething_api/resources/reportback_item_resource.inc

@@ -75,6 +75,14 @@ function _reportback_item_resource_definition() {
             'source' => array('param' => 'page'),
             'default value' => 1,
           ),
+         array(
+            'name' => 'load_user',
+            'description' => 'Flag to indicate whether to make call to northstar to retrieve full user data.',
+            'optional' => TRUE,
+            'type' => 'boolean',
+            'source' => array('param' => 'load_user'),
+            'default value' => FALSE,
+          ),
         ),
         'access callback' => '_reportback_item_resource_access',
         'access arguments' => array('index'),
@@ -108,13 +116,14 @@ function _reportback_item_resource_access($op) {
 }
 
 
-function _reportback_item_resource_index($campaigns, $status, $count, $random, $page) {
+function _reportback_item_resource_index($campaigns, $status, $count, $random, $page, $load_user) {
   $parameters = array(
     'campaigns' => $campaigns,
     'status' => $status,
     'count' => $count,
     'random' => $random,
     'page' => $page,
+    'load_user' => $load_user,
   );
 
   $reportbackItems = new ReportbackItemTransformer;

lib/modules/dosomething/dosomething_api/resources/reportback_resource.inc

@@ -75,6 +75,14 @@ function _reportback_resource_definition() {
             'source' => array('param' => 'page'),
             'default value' => 1,
           ),
+          array(
+            'name' => 'load_user',
+            'description' => 'Flag to indicate whether to make call to northstar to retrieve full user data.',
+            'optional' => TRUE,
+            'type' => 'boolean',
+            'source' => array('param' => 'load_user'),
+            'default value' => FALSE,
+          ),
         ),
         'access callback' => '_reportback_resource_access',
         'access arguments' => array('index'),
@@ -108,13 +116,14 @@ function _reportback_resource_access($op) {
 }
 
 
-function _reportback_resource_index($campaigns, $status, $count, $random, $page) {
+function _reportback_resource_index($campaigns, $status, $count, $random, $page, $load_user) {
   $parameters =  array(
     'campaigns' => $campaigns,
     'status' => $status,
     'count' => $count,
     'random' => $random,
     'page' => $page,
+    'load_user' => $load_user,
   );
 
   $reportbacks = new ReportbackTransformer;

lib/modules/dosomething/dosomething_northstar/dosomething_northstar.module

@@ -128,21 +128,33 @@ function dosomething_northstar_update_user($form_state) {
 }
 
 /**
- *Get user data from northstar.
+ * Get user data from northstar.
+ *
+ * @param  int  $id Drupal user id.
+ * @return object
  */
 function dosomething_northstar_get_northstar_user($id) {
-  if (!empty($northstar_user_info)) {
-    $northstar_user_info = cache_get('northstar_user_info_' . $id, 'cache_northstar_user_info');
-  } else {
+  $northstar_user_info = cache_get('northstar_user_info_' . $id, 'cache_northstar_user_info');
+  $northstar_user_info = $northstar_user_info->data;
+
+  if (empty($northstar_user_info)) {
     $client = _dosomething_northstar_build_http_client();
 
     $northstar_user_info = drupal_http_request($client['base_url'] . '/users/drupal_id/' . $id, array(
       'headers' => $client['headers'],
       'method' => 'GET',
       ));
 
-    cache_set('northstar_user_info_' . $id, $northstar_user_info, 'cache_northstar_user_info', REQUEST_TIME + 60*60*24);
+    $northstar_user_info = $northstar_user_info->data;
+
+      if (!empty($northstar_user_info->error)) {
+        $error = sprintf("Error fetching Northstar user data, uid=%d: '%s'", $id, $northstar_user_info->error);
+        watchdog_exception('northstar', new Exception($error));
+      } else {
+        cache_set('northstar_user_info_' . $id, $northstar_user_info, 'cache_northstar_user_info', REQUEST_TIME + 60*60*24);
+      }
   }
+
   return $northstar_user_info;
 }
 

lib/modules/dosomething/dosomething_reportback/includes/Reportback.php

@@ -169,6 +169,15 @@ private function build($data, $full = false) {
       }
     }
 
+    // $this->user = [
+    //   'drupal_id' => $data->uid,
+    //   'id' => dosomething_helpers_isset($northstar_user->_id),
+    //   'first_name' => dosomething_helpers_isset($northstar_user->first_name),
+    //   'last_name' => dosomething_helpers_isset($northstar_user->last_name),
+    //   'photo' => dosomething_helpers_isset($northstar_user->photo),
+    //   'country' => dosomething_helpers_isset($northstar_user->country),
+    // ];
+
     $this->user = [
       'drupal_id' => $data->uid,
       'id' => (empty($northstar_user->_id)) ? NULL : $northstar_user->_id,

lib/modules/dosomething/dosomething_reportback/includes/ReportbackItem.php

@@ -80,7 +80,7 @@ public static function find(array $filters = []) {
       $reportbackItem = new static(['ignore' => true]);
       $reportbackItem->build($item, $load_user);
 
-      $reportbacks[] = $reportback;
+      $reportbackItems[] = $reportbackItem;
     }
 
     return $reportbackItems;
@@ -127,6 +127,15 @@ private function build($data, $full = false) {
       }
     }
 
+    // $this->user = [
+    //   'drupal_id' => $data->uid,
+    //   'id' => dosomething_helpers_isset($northstar_user->_id),
+    //   'first_name' => dosomething_helpers_isset($northstar_user->first_name),
+    //   'last_name' => dosomething_helpers_isset($northstar_user->last_name),
+    //   'photo' => dosomething_helpers_isset($northstar_user->photo),
+    //   'country' => dosomething_helpers_isset($northstar_user->country),
+    // ];
+
     $this->user = [
       'drupal_id' => $data->uid,
       'id' => (empty($northstar_user->_id)) ? NULL : $northstar_user->_id,

lib/modules/dosomething/dosomething_reportback/includes/ReportbackItemTransformer.php

@@ -20,6 +20,7 @@ public function index($parameters) {
     // Not ideal that this is NULL instead of FALSE but due to how logic happens in original query function. It should be updated!
     // Logic currently checks for isset() instead of just boolean, so won't change until endpoints switched.
     $filters['random'] = $parameters['random'] === 'true' ? TRUE : NULL;
+    $filters['load_user'] = $parameters['load_user'] === 'true' ? TRUE : NULL;
 
     try {
       $reportbackItems = ReportbackItem::find($filters);

lib/modules/dosomething/dosomething_reportback/includes/ReportbackTransformer.php

@@ -43,6 +43,7 @@ public function index($parameters) {
     // Not ideal that this is NULL instead of FALSE but due to how logic happens in original query function. It should be updated!
     // Logic currently checks for isset() instead of just boolean, so won't change until endpoints switched.
     $filters['random'] = $parameters['random'] === 'true' ? TRUE : NULL;
+    $filters['load_user'] = $parameters['load_user'] === 'true' ? TRUE : NULL;
 
     try {
       $reportbacks = Reportback::find($filters);