Fix errors in bulk api calls

frankkessler · Sep 14, 2016 · 195d609 · 195d609
1 parent 90dcacf
commit 195d609
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/src/Bulk.php b/src/Bulk.php
@@ -34,7 +34,7 @@ public function runBatch($operation, $objectType, $data, $options = [])
             'externalIdFieldName' => null,
             'batchSize'           => 2000,
             'batchTimeout'        => 600,
-            'contentType'         => 'json',
+            'contentType'         => 'JSON',
             'pollIntervalSeconds' => 5,
         ];
 
@@ -48,6 +48,8 @@ public function runBatch($operation, $objectType, $data, $options = [])
             for ($i = 1; $i <= $totalNumberOfBatches; $i++) {
                 $batches[] = $this->addBatch($job->id, array_splice($data, ($i - 1) * $options['batchSize'], $options['batchSize']));
             }
+        }else{
+            $this->log('error', 'Job Failed: '.json_encode($job->toArrayAll()));
         }
 
         $time = time();
@@ -115,7 +117,7 @@ public function createJob($operation, $objectType, $externalIdFieldName = null,
             'json' => $json_array,
         ]);
 
-        if ($result && isset($result['id']) && $result['id']) {
+        if ($result && is_array($result)) {
             return new BulkJobResponse($result);
         }
 
@@ -128,7 +130,7 @@ public function jobDetails($jobId)
 
         $result = $this->call_api('get', $url);
 
-        if ($result && isset($result['id']) && $result['id']) {
+        if ($result && is_array($result)) {
             return new BulkJobResponse($result);
         } else {
             //throw exception
@@ -151,10 +153,10 @@ public function closeJob($jobId)
         ];
 
         $result = $this->call_api('post', $url, [
-            'json' => json_encode($json_array),
+            'json' => $json_array,
         ]);
 
-        if ($result && isset($result['id']) && $result['id']) {
+        if ($result && is_array($result)) {
             return new BulkJobResponse($result);
         }
 
@@ -183,7 +185,7 @@ public function addBatch($jobId, $data)
             ],
         ]);
 
-        if ($result) {
+        if ($result && is_array($result)) {
             return new BulkBatchResponse($result);
         }
 
@@ -202,7 +204,7 @@ public function batchDetails($jobId, $batchId)
 
         $result = $this->call_api('get', $url);
 
-        if ($result && isset($result['id']) && $result['id']) {
+        if ($result && is_array($result)) {
             return new BulkBatchResponse($result);
         } else {
             //throw exception

diff --git a/src/Responses/BaseResponse.php b/src/Responses/BaseResponse.php
@@ -31,6 +31,18 @@ public function toArray()
         return $return;
     }
 
+    /**
+     * Get the instance as an array.
+     *
+     * @return array
+     */
+    public function toArrayAll()
+    {
+        $return = get_object_vars($this);
+
+        return $return;
+    }
+
     /**
      * __toString implementation for this class.
      *

diff --git a/src/Salesforce.php b/src/Salesforce.php
@@ -432,7 +432,9 @@ public function call_api($method, $url, $options = [], $debug_info = [])
                 }
             } else {
                 $full_data = json_decode((string) $response->getBody(), true);
-                if (count($full_data) > 1) {
+                if(!is_array($full_data)){
+                    $data = array_merge($data, ['message' => $full_data]);
+                } elseif (count($full_data) > 1) {
                     $data = array_merge($data, $full_data);
                 } else {
                     $data = array_merge($data, current($full_data));