moved webhook stuff into the namespace

Author: Skyfall1235

src/RandomAPI/APIServices/ServiceInterfaces/IWebhookService.cs

@@ -1,49 +1,51 @@
 using Microsoft.AspNetCore.Mvc;
 using RandomAPI.Models;
-using RandomAPI.Services.Webhooks;
-
-public interface IWebhookService
+namespace RandomAPI.Services.Webhooks
 {
-    // Basel class methods
-    /// <summary>
-    /// Sends a webhook notification to all registered listeners.
-    /// </summary>
-    Task BroadcastAsync<T>(T payload) where T : class;
+    public interface IWebhookService
+    {
+        // Basel class methods
+        /// <summary>
+        /// Sends a webhook notification to all registered listeners.
+        /// </summary>
+        Task BroadcastAsync<T>(T payload) where T : class;
 
-    /// <summary>
-    /// Registers a new webhook listener URL.
-    /// </summary>
-    /// <returns>True if added, false if it already existed.</returns>
-    Task AddListenerAsync(string url, WebhookType type = default);
+        /// <summary>
+        /// Registers a new webhook listener URL.
+        /// </summary>
+        /// <returns>True if added, false if it already existed.</returns>
+        Task AddListenerAsync(string url, WebhookType type = default);
 
-    /// <summary>
-    /// Removes a webhook listener URL.
-    /// </summary>
-    /// <returns>True if removed, false if not found.</returns>
-    Task<bool> RemoveListenerAsync(string url);
+        /// <summary>
+        /// Removes a webhook listener URL.
+        /// </summary>
+        /// <returns>True if removed, false if not found.</returns>
+        Task<bool> RemoveListenerAsync(string url);
 
-    /// <summary>
-    /// Returns a snapshot of all registered listener URLs.
-    /// </summary>
-    Task<IEnumerable<string>> GetListenersAsync();
+        /// <summary>
+        /// Returns a snapshot of all registered listener URLs.
+        /// </summary>
+        Task<IEnumerable<string>> GetListenersAsync();
 
-    /// <summary>
-    /// returns a snapshot of all registered listenrs of a given type
-    /// </summary>
-    /// <param name="type"> the type of url</param>
-    Task<IEnumerable<string>> GetListenersAsync(WebhookType type = WebhookType.Default);
+        /// <summary>
+        /// returns a snapshot of all registered listenrs of a given type
+        /// </summary>
+        /// <param name="type"> the type of url</param>
+        Task<IEnumerable<string>> GetListenersAsync(WebhookType type = WebhookType.Default);
 
-    // Controller Logic Methods (Implemented in the derived class)
-    public Task<IActionResult> HandleGetListenersActionAsync();
-    public Task<IActionResult> HandleGetListenersOfTypeAsync(WebhookType type);
-    public Task<IActionResult> HandleRegisterActionAsync(string url, WebhookType type = default);
-    public Task<IActionResult> HandleUnregisterActionAsync(string url);
-    public Task<IActionResult> HandleBroadcastActionAsync(IWebHookPayload payload);
+        // Controller Logic Methods (Implemented in the derived class)
+        public Task<IActionResult> HandleGetListenersActionAsync();
+        public Task<IActionResult> HandleGetListenersOfTypeAsync(WebhookType type);
+        public Task<IActionResult> HandleRegisterActionAsync(string url, WebhookType type = default);
+        public Task<IActionResult> HandleUnregisterActionAsync(string url);
+        public Task<IActionResult> HandleBroadcastActionAsync(IWebHookPayload payload);
 
-    public enum WebhookType
-    {
-        Default = 0, 
-        Discord = 1,
-        Logging = 2,
+        public enum WebhookType
+        {
+            Default = 0,
+            Discord = 1,
+            Logging = 2,
+        }
     }
 }
+

src/RandomAPI/APIServices/Services/BaseWebhookService.cs

@@ -1,5 +1,4 @@
 using RandomAPI.Repository;
-using static IWebhookService;
 
 namespace RandomAPI.Services.Webhooks
 {
@@ -21,13 +20,13 @@ public async Task<IEnumerable<string>> GetListenersAsync()
             return urls.Select(u => u.Url);
         }
 
-        public async Task<IEnumerable<string>> GetListenersAsync(WebhookType type = WebhookType.Default)
+        public async Task<IEnumerable<string>> GetListenersAsync(IWebhookService.WebhookType type = IWebhookService.WebhookType.Default)
         {
             var urls = await _repo.GetUrlsOfTypeAsync(type);
             return urls.Select(u => u.Url);
         }
 
-        public async Task AddListenerAsync(string url, WebhookType type = default)
+        public async Task AddListenerAsync(string url, IWebhookService.WebhookType type = default)
         {
             await _repo.AddUrlAsync(url, type);
         }

src/RandomAPI/APIServices/Services/WebhookActionService.cs

@@ -89,7 +89,7 @@ public async Task<IActionResult> HandleBroadcastActionAsync([FromBody] IWebHookP
         private static string SanitizeURL(ref string url)
         {
             url = url.Trim();
-            var safeUrlForLog = url.Replace("\r", "").Replace("\n", "");
+            string? safeUrlForLog = url.Replace("\r", "").Replace("\n", "");
             return safeUrlForLog;
         }
     }

src/RandomAPI/Controllers/WebhookController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using RandomAPI.Services.Webhooks;
-using static IWebhookService;
+
 
 namespace RandomAPI.Controllers
 {
@@ -43,7 +43,7 @@ public async Task<IActionResult> RegisterUrl([FromBody] string url)
         [HttpPost("register-discord")]
         public async Task<IActionResult> RegisterDiscordUrl([FromBody] string url)
         {
-            return await _webhookService.HandleRegisterActionAsync(url, WebhookType.Discord);
+            return await _webhookService.HandleRegisterActionAsync(url, IWebhookService.WebhookType.Discord);
         }
 
         /// <summary>

src/RandomAPI/Models/WebhookUrl.cs

@@ -1,5 +1,5 @@
 
-namespace RandomAPI.Models
+namespace RandomAPI.Services.Webhooks
 {
     /// <summary>
     /// Represents a registered webhook listener URL stored in the database.

src/RandomAPI/Repository/IWebhookRepository.cs

@@ -1,4 +1,5 @@
 using RandomAPI.Models;
+using RandomAPI.Services.Webhooks;
 
 namespace RandomAPI.Repository
 {

src/RandomAPI/Repository/WebhookRepository.cs

@@ -2,6 +2,7 @@
 using Microsoft.Data.Sqlite;
 using RandomAPI.Models;
 using System.Data;
+using RandomAPI.Services.Webhooks;
 
 namespace RandomAPI.Repository
 {