fix: update workflow and aggregate event

Author: tanhongit

src/Actions/WebhookAction.php

@@ -41,11 +41,8 @@ public function __invoke(): JsonResponse
 
         $message = view('github-project::md.comment', compact('payload'))->render();
 
-        $response = $this->githubService->handleComment((string) $payload['projects_v2_item']['content_node_id'], $message);
+        $this->githubService->handleComment((string) $payload['projects_v2_item']['content_node_id'], $message);
 
-        return response()->json([
-            'message' => __('github-project::github-project.success.message'),
-            'response' => $response,
-        ]);
+        return response()->json(['message' => __('github-project::github-project.success.message')]);
     }
 }

src/Jobs/ProcessAggregatedEvents.php

@@ -2,26 +2,57 @@
 
 namespace CSlant\GitHubProject\Jobs;
 
+use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Mail;
 
 class ProcessAggregatedEvents implements ShouldQueue
 {
+    use Dispatchable;
+    use InteractsWithQueue;
     use Queueable;
+    use SerializesModels;
+
+    protected string $nodeId;
 
     /**
      * Create a new job instance.
      */
-    public function __construct()
+    public function __construct(string $nodeId)
     {
-        //
+        $this->nodeId = $nodeId;
     }
 
     /**
      * Execute the job.
      */
     public function handle(): void
     {
-        //
+        $commentAggregationCacheKey = "comment_aggregation_{$this->nodeId}";
+        $events = Cache::pull($commentAggregationCacheKey, []);
+
+        if (!empty($events)) {
+            $message = $this->aggregateMessages($events);
+        }
+    }
+
+    /**
+     * Aggregate messages from events.
+     *
+     * @param  array  $events
+     *
+     * @return string
+     */
+    protected function aggregateMessages(array $events): string
+    {
+        $messages = array_map(function ($event) {
+            return $event['message'];
+        }, $events);
+
+        return implode("\n", $messages);
     }
 }

src/Jobs/ProcessWebhookEvent.php

@@ -31,15 +31,16 @@ public function __construct(array $eventData)
      */
     public function handle(): void
     {
-        $commentAggregationCacheKey = (string) config('github-project.comment_aggregation_cache_key');
+        $nodeId = $this->eventData['projects_v2_item']['content_node_id'];
+        $commentAggregationCacheKey = "comment_aggregation_{$nodeId}";
         $commentAggregationTime = (int) config('github-project.comment_aggregation_time');
 
         $events = Cache::get($commentAggregationCacheKey, []);
         $events[] = $this->eventData;
         Cache::put($commentAggregationCacheKey, $events, now()->addSeconds($commentAggregationTime));
 
         if (count($events) === 1) {
-            ProcessAggregatedEvents::dispatch()->delay(now()->addSeconds($commentAggregationTime));
+            ProcessAggregatedEvents::dispatch($nodeId)->delay(now()->addSeconds($commentAggregationTime));
         }
     }
 }

src/Services/GithubService.php

@@ -2,6 +2,7 @@
 
 namespace CSlant\GitHubProject\Services;
 
+use CSlant\GitHubProject\Jobs\ProcessWebhookEvent;
 use Github\Client;
 
 class GithubService
@@ -39,12 +40,12 @@ public function commentOnNode(string $contentNodeId, string $message): array
         return $client->graphql()->execute($query, $variables);
     }
 
-    public function handleComment(string $contentNodeId, string $message): array
+    public function handleComment(string $contentNodeId, string $message): void
     {
         if (config('github-project.is_queue_enabled')) {
-            //
+            ProcessWebhookEvent::dispatch($contentNodeId, $message);
         }
 
-        return $this->commentOnNode($contentNodeId, $message);
+        $this->commentOnNode($contentNodeId, $message);
     }
 }