Merge pull request #31 from ingrammicro/bug-fix-message-send

BugFix:

* Usage Acceptance and Reject is consistent with all the other exceptions for transitioning usage file over workflow
* Moved away from strings to json_encode

Author: marcserrat

src/FulfillmentAutomation.php

@@ -59,14 +59,14 @@ protected function dispatchTierConfig($tierConfigRequest)
                 $this->tierConfiguration->sendRequest(
                     'POST',
                     '/tier/config-requests/' . $tierConfigRequest->id . '/approve',
-                    '{"template": {"id": "' . $msg->templateid . '"}}'
+                    json_encode(['template' => ['id' => $msg->templateid ]])
                 );
                 $processingResult = 'succeed (Activated using template ' . $msg->templateid . ')';
             } else {
                 $this->tierConfiguration->sendRequest(
                     'POST',
                     '/tier/config-requests/' . $tierConfigRequest->id . '/approve',
-                    '{"template": {"representation": "' . $msg->activationTile . '"}}'
+                    json_encode(['template' => ['representation' => $msg->activationTile ]])
                 );
                 $processingResult = 'succeed (' . $msg->activationTile . ')';
             }
@@ -84,7 +84,7 @@ protected function dispatchTierConfig($tierConfigRequest)
             $this->tierConfiguration->sendRequest(
                 'POST',
                 '/tier/config-requests/' . $tierConfigRequest->id . '/fail',
-                '{"reason": "' . $e->getMessage() . '"}'
+                json_encode(['reason' => $e->getMessage()])
             );
             $processingResult = 'fail';
         } catch (Skip $e) {
@@ -120,7 +120,7 @@ protected function dispatch($request)
                 $this->fulfillment->sendRequest(
                     'POST',
                     '/requests/' . $request->id . '/approve',
-                    '{"template_id": "' . $msg->templateid . '"}'
+                    json_encode(['template_id' => $msg->templateid])
                 );
                 try {
                     $request->conversation()->addMessage('Activated using template ' . $msg->templateid);
@@ -132,7 +132,7 @@ protected function dispatch($request)
                 $this->fulfillment->sendRequest(
                     'POST',
                     '/requests/' . $request->id . '/approve',
-                    '{"activation_tile": "' . $msg->activationTile . '"}'
+                    json_encode(['activation_tile' => $msg->activationTile])
                 );
                 try {
                     $request->conversation()->addMessage('Activated using Custom ActivationTile');
@@ -156,7 +156,7 @@ protected function dispatch($request)
             $this->fulfillment->sendRequest(
                 'POST',
                 '/requests/' . $request->id . '/fail',
-                '{"reason": "' . $e->getMessage() . '"}'
+                json_encode(['reason' => $e->getMessage()])
             );
             try {
                 $request->conversation()->addMessage($e->getMessage());

src/Usage/Accept.php

@@ -14,15 +14,12 @@
  */
 class Accept extends \Connect\Message
 {
-    public $response;
-
     /**
-     * Accept constructor
-     * @param AcceptResponse $response
+     * Accept constructor.
+     * @param $message
      */
-    public function __construct($response)
+    public function __construct($message = null)
     {
-        $this->response = $response;
-        parent::__construct('Accept Response is required', 'response');
+        parent::__construct($message ? $message : 'Usage data is correct', "accept");
     }
 }

src/Usage/AcceptResponse.php

@@ -34,10 +34,10 @@ class File extends \Connect\Model
      */
 
     public $note;
-    
-     /**
-     * @var 
-     */
+
+    /**
+    * @var
+    */
     public $status;
 
     /**

src/Usage/File.php

@@ -14,15 +14,8 @@
  */
 class Reject extends \Connect\Message
 {
-    public $response;
-
-    /**
-     * Accept constructor
-     * @param RejectResponse $response
-     */
-    public function __construct($response)
+    public function __construct($message = null)
     {
-        $this->response = $response;
-        parent::__construct('Accept Response is required', 'rejectresponse');
+        parent::__construct($message ? $message : 'Usage data is not correct', "reject");
     }
 }

src/Usage/Reject.php

@@ -70,7 +70,7 @@ protected function dispatchUsageFileProcessing($usageFile)
             $this->usage->sendRequest(
                 'POST',
                 '/usage/files/' . $usageFile->id . '/accept/',
-                '{"acceptance_note": "' . $e->getMessage() . '""}'
+                json_encode(['acceptance_note' => $e->getMessage()])
             );
             $processingResult = 'accept';
         } catch (Close $e) {
@@ -91,7 +91,7 @@ protected function dispatchUsageFileProcessing($usageFile)
             $this->usage->sendRequest(
                 'POST',
                 '/usage/files/' . $usageFile->id . '/reject/',
-                '{"rejection_note": "' . $e->getMessage() . '""}'
+                json_encode(['rejection_note' => $e->getMessage()])
             );
             $processingResult = 'reject';
         } catch (Submit $e) {

src/Usage/RejectResponse.php

@@ -26,7 +26,7 @@ public function testUsageInstantiation()
 
         $this->assertInstanceOf('\Connect\Usage\Accept', $responseAccept);
 
-        $this->assertEquals("TD-123", $responseAccept->response);
+        $this->assertEquals("TD-123", $responseAccept->getMessage());
         return $responseAccept;
     }
 }