Update wit middleware. botman#1186 (botman#1195)

* Update wit middleware.

The actual system doesn't seems to be compatible with the actual response format from wit.

* Update WitTest.php

Update the tests with the new response format from wit.ai

* Update WitTest.php

* Update WitTest.php

Author: Tanariel

src/Middleware/Wit.php

@@ -87,6 +87,7 @@ public function received(IncomingMessage $message, $next, BotMan $bot)
 
         $responseData = Collection::make(json_decode($response->getContent(), true));
         $message->addExtras('entities', $responseData->get('entities'));
+        $message->addExtras('intents', $responseData->get('intents'));
 
         return $next($message);
     }
@@ -99,16 +100,12 @@ public function received(IncomingMessage $message, $next, BotMan $bot)
      */
     public function matching(IncomingMessage $message, $pattern, $regexMatched)
     {
-        $entities = Collection::make($message->getExtras())->get('entities', []);
-
-        if (! empty($entities)) {
-            foreach ($entities as $name => $entity) {
-                if ($name === 'intent') {
-                    foreach ($entity as $item) {
-                        if ($item['value'] === $pattern && $item['confidence'] >= $this->minimumConfidence) {
-                            return true;
-                        }
-                    }
+        $intents = Collection::make($message->getExtras())->get('intents', []);
+
+        if (!empty($intents)) {
+            foreach ($intents as $intent) {
+                if (($intent['name'] === $pattern || $intent['id'] === $pattern) && $intent['confidence'] >= $this->minimumConfidence) {
+                    return true;
                 }
             }
         }

tests/Middleware/WitTest.php

@@ -27,7 +27,7 @@ public function it_adds_entities_to_the_message()
         $messageText = 'This will be my message text!';
         $message = new IncomingMessage($messageText, '', '');
 
-        $response = new Response(json_encode(['entities' => ['foo' => 'bar']]));
+        $response = new Response(json_encode(['entities' => ['foo' => 'bar'], 'intents' => []]));
 
         $http = m::mock(Curl::class);
         $http->shouldReceive('get')
@@ -46,6 +46,7 @@ public function it_adds_entities_to_the_message()
 
         $this->assertSame([
             'entities' => ['foo' => 'bar'],
+            'intents' => []
         ], $message->getExtras());
     }
 
@@ -58,19 +59,20 @@ public function it_matches_intents()
         $response = new Response('{
           "msg_id": "eb458be1-43e0-47c0-88b2-efbc9fa3240a",
           "_text": "I am happy",
+          "intents": [
+            {
+              "id": "123456",
+              "name": "emotion",
+              "confidence": 0.7343395827157483
+            }
+          ],
           "entities": {
             "emotion": [
               {
                 "confidence": 0.9775576413827303,
                 "type": "value",
                 "value": "happy"
               }
-            ],
-            "intent": [
-              {
-                "confidence": 0.7343395827157483,
-                "value": "emotion"
-              }
             ]
           }
         }
@@ -102,19 +104,20 @@ public function it_does_not_match_intents_with_lower_confidence()
         $response = new Response('{
           "msg_id": "eb458be1-43e0-47c0-88b2-efbc9fa3240a",
           "_text": "I am happy",
+          "intents": [
+            {
+              "id": "123456",
+              "name": "emotion",
+              "confidence": 0.343395827157483,
+            }
+          ],
           "entities": {
             "emotion": [
               {
                 "confidence": 0.9775576413827303,
                 "type": "value",
                 "value": "happy"
               }
-            ],
-            "intent": [
-              {
-                "confidence": 0.343395827157483,
-                "value": "emotion"
-              }
             ]
           }
         }