Enhance webhook and issue request handling

- Updated `GitHubWebhookRepository` to save issue numbers and retrieve webhooks by issue.
- Modified `IssueRequestRepository` to interact with webhooks and include an optional issue URL.
- Improved `DevExIssuesEventProcessorService` to save webhooks with issue numbers and create issue requests as needed.
- Adjusted `DevExPullRequestEventProcessorService` to extract and save issue numbers from pull request titles.
- Added `IssueRequestRepository` dependency to `RepositoryService` and `TeamService` for better issue request management.
- Enhanced `GitHubWebhookEntity` and `IssueRequestEntity` models with new properties for issue URL and number.

Author: calin-lupas_dsamcaps

src/DevExcelerateApi/Data/GitHubWebhookRepository.cs

@@ -1,5 +1,6 @@
 using DevExcelerateApi.Models;
 using Octokit.Webhooks;
+using Octokit.Webhooks.Events;
 using System.Text.Json;
 
 namespace DevExcelerateApi.Data
@@ -10,8 +11,9 @@ namespace DevExcelerateApi.Data
     /// <param name="storageContext"></param>
     public class GitHubWebhookRepository(IStorageContext<GitHubWebhookEntity> storageContext) 
         : Repository<GitHubWebhookEntity>(storageContext)
-    {
-        public Task SaveWebhookAsync(WebhookHeaders headers, WebhookEvent webhookEvent)
+    {        
+
+        public Task SaveWebhookAsync(WebhookHeaders headers, WebhookEvent webhookEvent, long? issueNumber)
         {
             var webhookEntity = new GitHubWebhookEntity
             {
@@ -20,10 +22,23 @@ public Task SaveWebhookAsync(WebhookHeaders headers, WebhookEvent webhookEvent)
                 GitHubEvent = $"{headers?.Event}.{webhookEvent?.Action}",
                 SenderLogin = webhookEvent?.Sender?.Login,
                 Headers = JsonSerializer.Serialize(headers),
-                Payload = JsonSerializer.Serialize(webhookEvent)
+                Payload = JsonSerializer.Serialize(webhookEvent),
+                RepositoryName = webhookEvent?.Repository?.Name,
+                IssueNumber = issueNumber
             };
 
             return CreateAsync(webhookEntity);
+        } 
+        
+        /// <summary>
+        /// Gets all webhooks associated with a specific issue request.
+        /// </summary>
+        /// <param name="repositoryName">The repository name</param>
+        /// <param name="issueNumber">The issue number</param>
+        /// <returns>Collection of webhooks for the issue</returns>
+        public async Task<IEnumerable<GitHubWebhookEntity>> GetWebhooksByIssueAsync(string repositoryName, long issueNumber)
+        {
+            return await StorageContext.QueryEntitiesAsync(w => w.RepositoryName == repositoryName && w.IssueNumber == issueNumber);
         }
     }
 }

src/DevExcelerateApi/Data/IssueRequestRepository.cs

@@ -7,9 +7,13 @@ namespace DevExcelerateApi.Data
     /// Demonstrates how easy it is to create repositories for new entity types.
     /// </summary>
     /// <param name="storageContext">The storage context for IssueRequestEntity</param>
-    public class IssueRequestRepository(IStorageContext<IssueRequestEntity> storageContext) 
+    public class IssueRequestRepository(
+        IStorageContext<IssueRequestEntity> storageContext,
+        GitHubWebhookRepository? webhookRepository = null) 
         : Repository<IssueRequestEntity>(storageContext)
     {
+        private readonly GitHubWebhookRepository? _webhookRepository = webhookRepository;
+
         /// <summary>
         /// Saves an issue request with additional business logic.
         /// </summary>
@@ -22,14 +26,16 @@ public class IssueRequestRepository(IStorageContext<IssueRequestEntity> storageC
         public async Task<IssueRequestEntity> CreateIssueRequestAsync(
             string repositoryName,
             long issueNumber,
-            string title,
+            string? issueUrl,
+            string? title,
             string? body = null,
             string? createdBy = null)
         {
             var issueRequest = new IssueRequestEntity
             {
                 RepositoryName = repositoryName,
                 IssueNumber = issueNumber,
+                IssueUrl = issueUrl,
                 Title = title,
                 Body = body,
                 CreatedBy = createdBy,
@@ -88,5 +94,19 @@ public async Task<IEnumerable<IssueRequestEntity>> FindByDateRangeAsync(DateTime
             return await StorageContext.QueryEntitiesAsync(entity => 
                 entity.CreatedOn >= startDate && entity.CreatedOn <= endDate);
         }
+
+        /// <summary>
+        /// Gets webhooks for an issue request by repository name and issue number.
+        /// </summary>
+        /// <param name="repositoryName">The repository name</param>
+        /// <param name="issueNumber">The issue number</param>
+        /// <returns>Collection of webhooks for the issue</returns>
+        public async Task<IEnumerable<GitHubWebhookEntity>> GetWebhooksByIssueAsync(string repositoryName, long issueNumber)
+        {
+            if (_webhookRepository == null)
+                return Enumerable.Empty<GitHubWebhookEntity>();
+                
+            return await _webhookRepository.GetWebhooksByIssueAsync(repositoryName, issueNumber);
+        }
     }
 }

src/DevExcelerateApi/Models/GitHubWebhookEntity.cs

@@ -67,11 +67,21 @@ public class GitHubWebhookEntity : IStorageEntity
         /// <summary>
         /// The Webhook request headers.
         /// </summary>
-        public string? Headers { get; set; }
-
+        public string? Headers { get; set; }        
+        
         /// <summary>
         /// The Webhook request body.
         /// </summary>
         public string? Payload { get; set; }
+
+        /// <summary>
+        /// The repository name associated with this webhook.
+        /// </summary>
+        public string? RepositoryName { get; set; }
+
+        /// <summary>
+        /// The issue number associated with this webhook (for issue-related events).
+        /// </summary>
+        public long? IssueNumber { get; set; }
     }
 }

src/DevExcelerateApi/Models/IssueRequestEntity.cs

@@ -41,6 +41,11 @@ public class IssueRequestEntity : IStorageEntity
         /// </summary>
         public long IssueNumber { get; set; }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public string? IssueUrl { get; set; }
+
         /// <summary>
         /// The title of the issue.
         /// </summary>

src/DevExcelerateApi/Services/DevExIssuesEventProcessorService.cs

@@ -1,6 +1,7 @@
 using DevExcelerateApi.Core.Extensions;
 using DevExcelerateApi.Data;
 using DevExcelerateApi.Models;
+using Microsoft.Azure.Cosmos.Linq;
 using Microsoft.FeatureManagement;
 using Octokit.Webhooks;
 using Octokit.Webhooks.Events;
@@ -10,13 +11,14 @@
 using static DevExcelerateApi.Parsers.GitHubIssueFormParser;
 
 namespace DevExcelerateApi.Services
-{
+{    
     public class DevExIssuesEventProcessorService(
         ILogger<DevExIssuesEventProcessorService> logger,
         IRepositoryService repositoryService,
         ITeamService teamService,
         IIssueService issueService,
         GitHubWebhookRepository gitHubWebhookRepository,
+        IssueRequestRepository issueRequestRepository,
         ILocalizationService localizationService,
         IVariantFeatureManager featureManager) 
         : IDevExIssuesEventProcessorService
@@ -26,15 +28,21 @@ public class DevExIssuesEventProcessorService(
         private readonly ITeamService _teamService = teamService;
         private readonly IIssueService _issueService = issueService;
         private readonly GitHubWebhookRepository _gitHubWebhookRepository = gitHubWebhookRepository;
+        private readonly IssueRequestRepository _issueRequestRepository = issueRequestRepository;
         private readonly ILocalizationService _localizationService = localizationService;
-        private readonly IVariantFeatureManager _featureManager = featureManager;
-
+        private readonly IVariantFeatureManager _featureManager = featureManager;        
+        
         public async Task SaveAndProcessIssueEventAsync(WebhookHeaders headers, IssuesEvent issuesEvent, IssuesAction action)
         {
             _logger.LogInformation("Starting the process of the Issues event for Issue# {number} with action - {action}...", issuesEvent?.Issue.Number, issuesEvent?.Action);
 
-            await _gitHubWebhookRepository.SaveWebhookAsync(headers, issuesEvent!).ConfigureAwait(false);
+            // 1. Create issue request to group all webhooks related to an IssueNumber#
+            await CreateIssueRequestIfNeeded(issuesEvent!).ConfigureAwait(false);
+
+            // 2. Save the webhook
+            await _gitHubWebhookRepository.SaveWebhookAsync(headers, issuesEvent!, issuesEvent?.Issue.Number).ConfigureAwait(false);
 
+            // 3. Validate issue
             switch (action)
             {
                 case IssuesActionValue.Opened:
@@ -204,10 +212,58 @@ private async Task ValidateIssueCommentApproval(string data, IssueCommentEvent i
                 await _issueService.ChangeIssueLabel([_localizationService.GetLocalizedString(nameof(TicketStatus.APPROVED))], issueCommentEvent!);
             }
             // Opened -> Rejected
-            else if ((data?.IsIssueRejected()).GetValueOrDefault() && !(issueCommentEvent?.Issue?.Labels?.Any(i => i.Name.IsIssueRejected())).GetValueOrDefault())
-            {
+            else if ((data?.IsIssueRejected()).GetValueOrDefault() && !(issueCommentEvent?.Issue?.Labels?.Any(i => i.Name.IsIssueRejected())).GetValueOrDefault())            {
                 await _issueService.ChangeIssueLabel([_localizationService.GetLocalizedString(nameof(TicketStatus.REJECTED))], issueCommentEvent!);
             }
         }
+
+        /// <summary>
+        /// Creates an issue request entity for tracking purposes and links it to related webhooks.
+        /// This establishes the 1:N relationship between IssueRequestEntity and GitHubWebhookEntity.
+        /// </summary>
+        /// <param name="issuesEvent">The GitHub issues event</param>
+        private async Task CreateIssueRequestIfNeeded(IssuesEvent issuesEvent)
+        {
+            try
+            {
+                var repositoryName = issuesEvent?.Repository?.Name;
+                var issueNumber = issuesEvent?.Issue?.Number;
+                var issueUrl = issuesEvent?.Issue?.HtmlUrl;
+                var title = issuesEvent?.Issue?.Title;
+                var body = issuesEvent?.Issue?.Body;
+                var createdBy = issuesEvent?.Issue?.User?.Login;
+
+                if (string.IsNullOrEmpty(repositoryName) || !issueNumber.HasValue || string.IsNullOrEmpty(title))
+                {
+                    _logger.LogWarning("Cannot create issue request - missing required data: Repository={Repository}, Issue={Issue}, Title={Title}", repositoryName, issueNumber, title);
+                    return;
+                }
+
+                // Check if issue request already exists to avoid duplicates
+                var existingRequests = await _issueRequestRepository.FindByRepositoryAsync(repositoryName);
+                var existingRequest = existingRequests.FirstOrDefault(r => r.IssueNumber == issueNumber.Value);
+
+                if (existingRequest != null)
+                {
+                    _logger.LogInformation("Issue request already exists for Repository={Repository}, Issue={Issue}", repositoryName, issueNumber);
+                    return;
+                }
+
+                // Create new issue request
+                var issueRequest = await _issueRequestRepository.CreateIssueRequestAsync(
+                    repositoryName,
+                    issueNumber.Value,
+                    issueUrl,
+                    title,
+                    body,
+                    createdBy);
+
+                _logger.LogInformation("Created issue request {IssueRequestId} for Repository={Repository}, Issue={Issue}", issueRequest.Id, repositoryName, issueNumber);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to create issue request for Repository={Repository}, Issue={Issue}", issuesEvent?.Repository?.Name, issuesEvent?.Issue?.Number);
+            }
+        }
     }
 }

src/DevExcelerateApi/Services/DevExPullRequestEventProcessorService.cs

@@ -23,8 +23,13 @@ public async Task SaveAndProcessPullRequestEventAsync(WebhookHeaders headers, Pu
         {
             _logger.LogInformation("Starting the process of the PullRequest event for PR# {number} with action - {action}...", pullRequestEvent?.PullRequest.Number, pullRequestEvent?.Action);
 
-            await _gitHubWebhookRepository.SaveWebhookAsync(headers, pullRequestEvent!).ConfigureAwait(false);
-            
+            // 1. Get the issue number from the PR
+            _ = long.TryParse(pullRequestEvent?.PullRequest?.Title?.Split(Constants.GitHubPullRequestTitleIssueNumber)?.LastOrDefault(), out long issueNumber);
+
+            // 2. Save the webhook
+            await _gitHubWebhookRepository.SaveWebhookAsync(headers, pullRequestEvent!, issueNumber).ConfigureAwait(false);
+
+            // 3. Validate PR
             switch (action)
             {
                 case PullRequestActionValue.Opened:

src/DevExcelerateApi/Services/RepositoryService.cs

@@ -1,5 +1,6 @@
 using DevExcelerateApi.Core.Extensions;
 using DevExcelerateApi.Core.Options;
+using DevExcelerateApi.Data;
 using DevExcelerateApi.Helpers;
 using DevExcelerateApi.Models;
 using Microsoft.Extensions.Options;
@@ -9,14 +10,15 @@
 using static DevExcelerateApi.Parsers.GitHubIssueFormParser;
 
 namespace DevExcelerateApi.Services
-{
+{    
     public class RepositoryService(
         ILogger<RepositoryService> logger,
         IGitHubClientFactory gitHubClientFactory,
         IIssueService issueService,
         IPolicyService policyService,
         IOptions<GitHubOptions> gitHubOptions,
-        ILocalizationService localizationService)
+        ILocalizationService localizationService,
+        IssueRequestRepository issueRequestRepository)
         : IRepositoryService
     {
         private readonly ILogger<RepositoryService> _logger = logger;
@@ -25,6 +27,7 @@ public class RepositoryService(
         private readonly IPolicyService _policyService = policyService;
         private readonly GitHubOptions _gitHubOptions = gitHubOptions.Value;
         private readonly ILocalizationService _localizationService = localizationService;
+        private readonly IssueRequestRepository _issueRequestRepository = issueRequestRepository;
 
         public async Task ValidateRepository(IssuesEvent issuesEvent, bool createPullRequest)
         {

src/DevExcelerateApi/Services/TeamService.cs

@@ -1,5 +1,6 @@
 using DevExcelerateApi.Core.Extensions;
 using DevExcelerateApi.Core.Options;
+using DevExcelerateApi.Data;
 using DevExcelerateApi.Helpers;
 using DevExcelerateApi.Models;
 using Microsoft.Extensions.Options;
@@ -9,14 +10,15 @@
 using static DevExcelerateApi.Parsers.GitHubIssueFormParser;
 
 namespace DevExcelerateApi.Services
-{
+{    
     public class TeamService(
         ILogger<TeamService> logger,
         IGitHubClientFactory gitHubClientFactory,
         IIssueService issueService,
         IPolicyService policyService,
         IOptions<GitHubOptions> gitHubOptions,
-        ILocalizationService localizationService)
+        ILocalizationService localizationService,
+        IssueRequestRepository issueRequestRepository)
         : ITeamService
     {
         private readonly ILogger<TeamService> _logger = logger;
@@ -25,6 +27,7 @@ public class TeamService(
         private readonly IPolicyService _policyService = policyService;
         private readonly GitHubOptions _gitHubOptions = gitHubOptions.Value;
         private readonly ILocalizationService _localizationService = localizationService;
+        private readonly IssueRequestRepository _issueRequestRepository = issueRequestRepository;
 
         public async Task ValidateTeam(IssuesEvent issuesEvent, bool createPullRequest)
         {

src/DevExcelerateApi/appsettings.json

@@ -31,7 +31,8 @@
     "Type": "",
     "FileSystem": {
       "FilePath": ""
-    },      "CosmosDb": {
+    },      
+    "CosmosDb": {
       "Database": "",
       // dotnet user-secrets set "DataStore:CosmosDb:ConnectionString" "MY_COSMOS_CONNECTION_STRING"
       "ConnectionString": ""