Merge pull request #18 from IIISpikerIII/master

Add multiple send topics with &&

Author: kbielenberg

.gitignore

@@ -1,4 +1,4 @@
 vendor
 .project
 .buildpath
-.settings
+.settings

.travis.yml

@@ -7,7 +7,7 @@ php:
   - nightly
 
 before_script:
-  composer install
+  composer up
 
 script: 
   - mkdir -p build/logs

README.md

@@ -75,6 +75,8 @@ $client->injectHttpClient(new \GuzzleHttp\Client());
 
 $message = new Message();
 $message->addRecipient(new Topic('your-topic'));
+//select devices where has 'your-topic1' && 'your-topic2' topics
+$message->addRecipient(new Topic(['your-topic1', 'your-topic2']));
 $message->setNotification(new Notification('test title', 'testing body'))
     ->setData(array('someId' => 111));
 

src/Message.php

@@ -177,13 +177,25 @@ private function createTo(array &$jsonData)
     {
         switch ($this->recipientType) {
             case Topic::class:
-                if (count($this->recipients) > 1) {
+                if (count($this->recipients) > 1 || is_array(current($this->recipients)->getIdentifier())) {
                     $topics = array_map(
-                        function (Topic $topic) { return sprintf("'%s' in topics", $topic->getIdentifier()); },
+                        function (Topic $topic) {
+                            $identity = $topic->getIdentifier();
+
+                            if (is_array($identity)) {
+                                $conditions = array_map(function ($condition) {
+                                    return sprintf("'%s' in topics", $condition);
+                                }, $identity);
+
+                                return '(' . implode(' && ', $conditions) . ')';
+                            } else {
+                                return sprintf("'%s' in topics", $topic->getIdentifier());
+                            }
+                        },
                         $this->recipients
                     );
                     $jsonData['condition'] = implode(' || ', $topics);
-                    break;
+                    return;
                 }
                 $jsonData['to'] = sprintf('/topics/%s', current($this->recipients)->getIdentifier());
                 break;

tests/MessageTest.php

@@ -44,6 +44,19 @@ public function testWorksCorrectlyWithMultipleTopics()
         );
     }
 
+    public function testWorksCorrectlyWithMultipleTopicsAnd()
+    {
+        $body = '{"condition":"(\'topic1\' in topics && \'topic2\' in topics)","data":{"foo":"bar"},"priority":"high"}';
+
+        $this->fixture->addRecipient(new Topic(['topic1','topic2']))
+            ->setData(['foo' => 'bar']);
+
+        $this->assertSame(
+            $body,
+            json_encode($this->fixture)
+        );
+    }
+
     public function testJsonEncodeWorksOnTopicRecipients()
     {
         $body = '{"to":"\/topics\/breaking-news","priority":"high","notification":{"title":"test","body":"a nice testing notification"}}';