Merge pull request #27 from DevExcelerate/feature/updates

#25 Improve logging and error handling in services

Author: Calin Lupas

src/DevExcelerateApi/Services/DevExPullRequestEventProcessorService.cs

@@ -35,6 +35,7 @@ public async Task SaveAndProcessPullRequestEventAsync(WebhookHeaders headers, Pu
 
                 default:
                     _logger.LogInformation("Not supported action for processing the pull request.");
+                    break;
             }
 
             _logger.LogInformation("GitHub Webhook event saved to database and processed for PR# {number} with action - {action}...", (pullRequestEvent?.PullRequest.Number), pullRequestEvent?.Action);
@@ -44,18 +45,19 @@ private async Task ValidatePullRequestApproval(PullRequestEvent pullRequestEvent
         {
             var prNumber = (pullRequestEvent?.PullRequest.Number).GetValueOrDefault();
 
+            _logger.LogInformation("Pull request #{prNumber} is {State} with merge commit SHA {MergeCommitSha}.", prNumber, pullRequestEvent?.PullRequest.State, pullRequestEvent?.PullRequest.MergeCommitSha);
+
             // Closed & Merged
             if (pullRequestEvent?.PullRequest.State == PullRequestState.Closed 
-                && pullRequestEvent?.PullRequest.MergedAt != null
                 && pullRequestEvent?.PullRequest.MergeCommitSha != null)
             {
-                _logger.LogInformation("Pull request #{number} is closed and merged.", prNumber);
+                _logger.LogInformation("Pull request #{prNumber} is closed and merged.", prNumber);
 
                 await _repositoryService.SaveRepository(pullRequestEvent!);
             }
             else
             {
-                _logger.LogInformation("Pull request #{number} is still in review.", prNumber);
+                _logger.LogInformation("Pull request #{prNumber} is still in review.", prNumber);
             }
         }
     }

src/DevExcelerateApi/Services/DevExWebhookEventProcessorService.cs

@@ -54,19 +54,27 @@ public class DevExWebhookEventProcessorService(
 
         public override Task ProcessWebhookAsync(IDictionary<string, StringValues> headers, string body)
         {
-            ArgumentNullException.ThrowIfNull(headers);
-            ArgumentNullException.ThrowIfNull(body);
+            try
+            {
+                ArgumentNullException.ThrowIfNull(headers);
+                ArgumentNullException.ThrowIfNull(body);
+
+                var webhookHeaders = WebhookHeaders.Parse(headers);
 
-            var webhookHeaders = WebhookHeaders.Parse(headers);
+                // Bypass if not an implemented event
+                if (!_allowedWebhookEvents.Contains(webhookHeaders?.Event!))
+                {
+                    _logger.LogInformation("--> Bypassing GitHub Webhook event {Event}", webhookHeaders?.Event);
+                    return Task.CompletedTask;
+                }
 
-            // Bypass if not an implemented event
-            if (!_allowedWebhookEvents.Contains(webhookHeaders?.Event!))
+                return base.ProcessWebhookAsync(headers, body);
+            }
+            catch (Exception ex)
             {
-                _logger.LogInformation("--> Bypassing GitHub Webhook event {Event}", webhookHeaders?.Event);
+                _logger.LogError(ex, "Error processing GitHub webhook event.");
                 return Task.CompletedTask;
             }
-
-            return base.ProcessWebhookAsync(headers, body);
         }
 
         protected override Task ProcessIssuesWebhookAsync(WebhookHeaders headers, IssuesEvent issuesEvent, IssuesAction action)