Merge pull request #66 from rubensebrango/Messages_appear_duplicate_in_conversation

Messages appear duplicate in conversation

Author: marcserrat

src/FulfillmentAutomation.php

@@ -124,34 +124,21 @@ protected function dispatch($request)
                     Constants::REQUESTS_PATH . $request->id . Constants::APPROVE_SUFFIX,
                     json_encode(['template_id' => $msg->templateid])
                 );
-                try {
-                    $request->conversation()->addMessage('Activated using template ' . $msg->templateid);
-                } catch (\Exception $e) {
-                    $this->logger->error(Constants::GENERIC_CONVERSATION_ERROR_MESSAGE . $request->id);
-                }
                 $processingResult = 'succeed (Activated using template ' . $msg->templateid . ')';
             } else {
                 $this->fulfillment->sendRequest(
                     'POST',
                     Constants::REQUESTS_PATH . $request->id . Constants::APPROVE_SUFFIX,
                     json_encode(['activation_tile' => $msg->activationTile])
                 );
-                try {
-                    $request->conversation()->addMessage('Activated using Custom ActivationTile');
-                } catch (GuzzleException $e) {
-                    $this->logger->error(Constants::GENERIC_CONVERSATION_ERROR_MESSAGE . $request->id);
-                }
+
                 $processingResult = 'succeed (' . $msg->activationTile . ')';
             }
         } catch (Inquire $e) {
             // update parameters and move to inquire
             $this->fulfillment->updateParameters($request, $e->params);
             $this->fulfillment->sendRequest('POST', Constants::REQUESTS_PATH . $request->id . Constants::INQUIRE_SUFFIX, ($e->templateId != null) ? json_encode(['template_id' => $msg->templateId]) : '{}');
-            try {
-                $request->conversation()->addMessage($e->getMessage());
-            } catch (GuzzleException $e) {
-                $this->logger->error(Constants::GENERIC_CONVERSATION_ERROR_MESSAGE . $request->id);
-            }
+
             $processingResult = 'inquire';
         } catch (Fail $e) {
             // fail request
@@ -160,11 +147,6 @@ protected function dispatch($request)
                 Constants::REQUESTS_PATH . $request->id . Constants::FAIL_SUFFIX,
                 json_encode(['reason' => $e->getMessage()])
             );
-            try {
-                $request->conversation()->addMessage($e->getMessage());
-            } catch (\Exception $e) {
-                $this->logger->error(Constants::GENERIC_CONVERSATION_ERROR_MESSAGE . $request->id);
-            }
             $processingResult = 'fail';
         } catch (Skip $e) {
             try {

tests/Unit/Runtime/Providers/HttpServiceProvider.php

@@ -16,7 +16,7 @@ public function register(Container $container)
         $body = \Mockery::mock('\Psr\Http\Message\StreamInterface');
 
         $body->shouldReceive('getContents')
-            ->times(23)
+            ->times(17)
             ->andReturn(
                 trim(file_get_contents(__DIR__ . '/request.valid.TierConfig.json')),
                 trim(file_get_contents(__DIR__ . '/request.valid.TierConfig.json')),