Add tags + macroable to HandlerGroup class

nutgram · Jul 4, 2023 · e2abe0b · e2abe0b
1 parent 8a06d05
commit e2abe0b
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 8 deletions.
diff --git a/src/Handlers/HandlerGroup.php b/src/Handlers/HandlerGroup.php
@@ -3,10 +3,14 @@
 namespace SergiX44\Nutgram\Handlers;
 
 use Closure;
+use Illuminate\Support\Traits\Macroable;
+use SergiX44\Nutgram\Support\Taggable;
 use SergiX44\Nutgram\Telegram\Types\Command\BotCommandScope;
 
 class HandlerGroup
 {
+    use Taggable, Macroable;
+
     protected array $middlewares = [];
 
     protected array $scopes = [];

diff --git a/src/Handlers/ResolveHandlers.php b/src/Handlers/ResolveHandlers.php
@@ -250,23 +250,29 @@ protected function resolveGroups(): void
      * @param array $currentScopes
      * @return void
      */
-    private function resolveNestedGroups(array $groups, array $currentMiddlewares = [], array $currentScopes = [])
-    {
+    private function resolveNestedGroups(
+        array $groups,
+        array $currentMiddlewares = [],
+        array $currentScopes = [],
+        array $currentTags = []
+    ) {
         foreach ($groups as $group) {
             $middlewares = [...$group->getMiddlewares(), ...$currentMiddlewares,];
             $scopes = [...$currentScopes, ...$group->getScopes()];
+            $tags = [...$currentTags, ...$group->getTags()];
             $this->groupHandlers = [];
             ($group->groupCallable)($this);
 
             // apply the middleware stack to the current registered group handlers
-            array_walk_recursive($this->groupHandlers, function ($leaf) use ($middlewares, $scopes) {
+            array_walk_recursive($this->groupHandlers, function ($leaf) use ($tags, $middlewares, $scopes) {
                 if ($leaf instanceof Handler) {
                     foreach ($middlewares as $middleware) {
                         $leaf->middleware($middleware);
                     }
                     if ($leaf instanceof Command && !empty($scopes)) {
                         $leaf->scope($scopes);
                     }
+                    $leaf->tags([...$leaf->getTags(), ...$tags]);
                 }
             });
 
@@ -275,7 +281,7 @@ private function resolveNestedGroups(array $groups, array $currentMiddlewares =
             if (!empty($this->groups)) {
                 $groups = $this->groups;
                 $this->groups = [];
-                $this->resolveNestedGroups($groups, $middlewares, $scopes);
+                $this->resolveNestedGroups($groups, $middlewares, $scopes, $tags);
             }
         }
     }

diff --git a/tests/Feature/TaggableHandlersTest.php b/tests/Feature/TaggableHandlersTest.php
@@ -1,10 +1,11 @@
 <?php
 
 use SergiX44\Nutgram\Handlers\Handler;
+use SergiX44\Nutgram\Handlers\HandlerGroup;
 use SergiX44\Nutgram\Handlers\Type\Command;
 use SergiX44\Nutgram\Nutgram;
 
-test('setMeta + getMeta + hasMeta', function () {
+test('setTag + getTag + hasTag', function () {
     $bot = Nutgram::fake();
 
     $bot->middleware(function (Nutgram $bot, $next) {
@@ -22,7 +23,7 @@
     $bot->hearText('/start')->reply();
 });
 
-test('setMetas + removeMeta', function () {
+test('setTags + removeTag', function () {
     $bot = Nutgram::fake();
 
     $bot->middleware(function (Nutgram $bot, $next) {
@@ -42,7 +43,7 @@
     $bot->hearText('/start')->reply();
 });
 
-test('clearMetas', function () {
+test('clearTags', function () {
     $bot = Nutgram::fake();
 
     $bot->middleware(function (Nutgram $bot, $next) {
@@ -88,7 +89,7 @@ public function handle(Nutgram $bot): void
     $bot->hearText('/start')->reply();
 });
 
-test('use meta + macroable', function () {
+test('use tag + macroable', function () {
     Handler::macro('emotions', function (int $happiness, int $sadness) {
         return $this
             ->tag('happiness', $happiness)
@@ -111,3 +112,48 @@ public function handle(Nutgram $bot): void
 
     $bot->hearText('/start')->reply();
 });
+
+
+test('set tags using group', function () {
+    $bot = Nutgram::fake();
+
+    $bot->middleware(function (Nutgram $bot, $next) {
+        expect($bot->currentHandler())
+            ->getTag('tag1')->toBe('foo')
+            ->getTag('tag2')->toBe('bar');
+
+        $next($bot);
+    });
+
+    $bot->group(function (Nutgram $bot) {
+        $bot->onCommand('start', function (Nutgram $bot) {
+            $bot->sendMessage('Hello!');
+        })->tag('tag2', 'bar');
+    })->tag('tag1', 'foo');
+
+    $bot->hearText('/start')->reply();
+});
+
+test('set tags + macroable using group', function () {
+    HandlerGroup::macro('emotions', function (int $happiness, int $sadness) {
+        return $this->tag('happiness', $happiness)->tag('sadness', $sadness);
+    });
+
+    $bot = Nutgram::fake();
+
+    $bot->middleware(function (Nutgram $bot, $next) {
+        expect($bot->currentHandler())
+            ->getTag('happiness')->toBe(80)
+            ->getTag('sadness')->toBe(20)
+            ->getTag('tag1')->toBe('foo');
+
+        $next($bot);
+    });
+    $bot->group(function (Nutgram $bot) {
+        $bot->onCommand('start', function (Nutgram $bot) {
+            $bot->sendMessage('Hello');
+        })->tag('tag1', 'foo');
+    })->emotions(80, 20);
+
+    $bot->hearText('/start')->reply();
+});