Refactor Controllers

SettingsController.cs SearchController.cs QueryController.cs NotificationConnectorController.cs MetadataFetcherController.cs MangaConnectorController.cs FileLibraryController LibraryConnectors WorkerController
2025-07-03 17:34:17 +02:00 · 2025-07-02 19:54:44 +02:00
parent 57bb87120a
commit 91c91e4989
28 changed files with 527 additions and 753 deletions
--- a/API/Controllers/NotificationConnectorController.cs
+++ b/API/Controllers/NotificationConnectorController.cs
@ -3,9 +3,9 @@ using API.APIEndpointRecords;
 using API.Schema.NotificationsContext;
 using API.Schema.NotificationsContext.NotificationConnectors;
 using Asp.Versioning;
-using log4net;
 using Microsoft.AspNetCore.Mvc;
 using static Microsoft.AspNetCore.Http.StatusCodes;
+// ReSharper disable InconsistentNaming

 namespace API.Controllers;

@ -13,121 +13,103 @@ namespace API.Controllers;
 [ApiController]
 [Produces("application/json")]
 [Route("v{v:apiVersion}/[controller]")]
-public class NotificationConnectorController(NotificationsContext context, ILog Log) : Controller
+public class NotificationConnectorController(IServiceScope scope) : Controller
 {
    /// <summary>
-    /// Gets all configured Notification-Connectors
+    /// Gets all configured <see cref="NotificationConnector"/>
    /// </summary>
    /// <response code="200"></response>
    [HttpGet]
    [ProducesResponseType<NotificationConnector[]>(Status200OK, "application/json")]
    public IActionResult GetAllConnectors()
    {
-        NotificationConnector[] ret = context.NotificationConnectors.ToArray();
-        return Ok(ret);
+        NotificationsContext context = scope.ServiceProvider.GetRequiredService<NotificationsContext>();
+        
+        return Ok(context.NotificationConnectors.ToArray());
    }
    
    /// <summary>
-    /// Returns Notification-Connector with requested ID
+    /// Returns <see cref="NotificationConnector"/> with requested Name
    /// </summary>
-    /// <param name="NotificationConnectorId">Notification-Connector-ID</param>
+    /// <param name="Name"><see cref="NotificationConnector"/>.Name</param>
    /// <response code="200"></response>
-    /// <response code="404">NotificationConnector with ID not found</response>
-    [HttpGet("{NotificationConnectorId}")]
+    /// <response code="404"><see cref="NotificationConnector"/> with <paramref name="Name"/> not found</response>
+    [HttpGet("{Name}")]
    [ProducesResponseType<NotificationConnector>(Status200OK, "application/json")]
    [ProducesResponseType(Status404NotFound)]
-    public IActionResult GetConnector(string NotificationConnectorId)
+    public IActionResult GetConnector(string Name)
    {
-        NotificationConnector? ret = context.NotificationConnectors.Find(NotificationConnectorId);
-        return (ret is not null) switch
-        {
-            true => Ok(ret),
-            false => NotFound()
-        };
+        NotificationsContext context = scope.ServiceProvider.GetRequiredService<NotificationsContext>();
+        if(context.NotificationConnectors.Find(Name) is not { } connector)
+            return NotFound();
+        
+        return Ok(connector);
    }
    
    /// <summary>
-    /// Creates a new REST-Notification-Connector
+    /// Creates a new <see cref="NotificationConnector"/>
    /// </summary>
    /// <remarks>Formatting placeholders: "%title" and "%text" can be placed in url, header-values and body and will be replaced when notifications are sent</remarks>
-    /// <param name="notificationConnector">Notification-Connector</param>
-    /// <response code="201">ID of new connector</response>
-    /// <response code="409">A NotificationConnector with name already exists</response>
+    /// <response code="201"></response>
    /// <response code="500">Error during Database Operation</response>
    [HttpPut]
-    [ProducesResponseType<string>(Status201Created, "application/json")]
+    [ProducesResponseType(Status201Created)]
    [ProducesResponseType(Status409Conflict)]
    [ProducesResponseType<string>(Status500InternalServerError, "text/plain")]
    public IActionResult CreateConnector([FromBody]NotificationConnector notificationConnector)
    {
-        if (context.NotificationConnectors.Find(notificationConnector.Name) is not null)
-            return Conflict();
-        try
-        {
-            context.NotificationConnectors.Add(notificationConnector);
-            context.SaveChanges();
-            return Created(notificationConnector.Name, notificationConnector);
-        }
-        catch (Exception e)
-        {
-            Log.Error(e);
-            return StatusCode(500, e.Message);
-        }
+        NotificationsContext context = scope.ServiceProvider.GetRequiredService<NotificationsContext>();
+        
+        context.NotificationConnectors.Add(notificationConnector);
+        
+        if(context.Sync().Result is { } errorMessage)
+            return StatusCode(Status500InternalServerError, errorMessage);
+        return Created();
    }
    
    /// <summary>
-    /// Creates a new Gotify-Notification-Connector
+    /// Creates a new Gotify-<see cref="NotificationConnector"/>
    /// </summary>
    /// <remarks>Priority needs to be between 0 and 10</remarks>
-    /// <response code="201">ID of new connector</response>
-    /// <response code="400"></response>
-    /// <response code="409">A NotificationConnector with name already exists</response>
+    /// <response code="201"></response>
    /// <response code="500">Error during Database Operation</response>
    [HttpPut("Gotify")]
    [ProducesResponseType<string>(Status201Created, "application/json")]
-    [ProducesResponseType(Status400BadRequest)]
-    [ProducesResponseType(Status409Conflict)]
    [ProducesResponseType<string>(Status500InternalServerError, "text/plain")]
    public IActionResult CreateGotifyConnector([FromBody]GotifyRecord gotifyData)
    {
-        if(!gotifyData.Validate())
-            return BadRequest();
+        //TODO Validate Data
        
-        NotificationConnector gotifyConnector = new NotificationConnector(TokenGen.CreateToken("Gotify"),
-            gotifyData.endpoint, 
-            new Dictionary<string, string>() { { "X-Gotify-IDOnConnector", gotifyData.appToken } }, 
+        NotificationConnector gotifyConnector = new (gotifyData.Name,
+            gotifyData.Endpoint, 
+            new Dictionary<string, string>() { { "X-Gotify-IDOnConnector", gotifyData.AppToken } }, 
            "POST", 
-            $"{{\"message\": \"%text\", \"title\": \"%title\", \"priority\": {gotifyData.priority}}}");
+            $"{{\"message\": \"%text\", \"title\": \"%title\", \"Priority\": {gotifyData.Priority}}}");
        return CreateConnector(gotifyConnector);
    }
    
    /// <summary>
-    /// Creates a new Ntfy-Notification-Connector
+    /// Creates a new Ntfy-<see cref="NotificationConnector"/>
    /// </summary>
    /// <remarks>Priority needs to be between 1 and 5</remarks>
-    /// <response code="201">ID of new connector</response>
-    /// <response code="400"></response>
-    /// <response code="409">A NotificationConnector with name already exists</response>
+    /// <response code="201"></response>
    /// <response code="500">Error during Database Operation</response>
    [HttpPut("Ntfy")]
    [ProducesResponseType<string>(Status201Created, "application/json")]
-    [ProducesResponseType(Status400BadRequest)]
-    [ProducesResponseType(Status409Conflict)]
    [ProducesResponseType<string>(Status500InternalServerError, "text/plain")]
    public IActionResult CreateNtfyConnector([FromBody]NtfyRecord ntfyRecord)
    {
-        if(!ntfyRecord.Validate())
-            return BadRequest();
+        //TODO Validate Data
        
-        string authHeader = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{ntfyRecord.username}:{ntfyRecord.password}"));
+        string authHeader = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{ntfyRecord.Username}:{ntfyRecord.Password}"));
        string auth = Convert.ToBase64String(Encoding.UTF8.GetBytes(authHeader)).Replace("=","");
        
-        NotificationConnector ntfyConnector = new (TokenGen.CreateToken("Ntfy"),
-            $"{ntfyRecord.endpoint}?auth={auth}", 
+        NotificationConnector ntfyConnector = new (ntfyRecord.Name,
+            $"{ntfyRecord.Endpoint}/{ntfyRecord.Topic}?auth={auth}", 
            new Dictionary<string, string>()
            {
                {"Title", "%title"},
-                {"Priority", ntfyRecord.priority.ToString()},
+                {"Priority", ntfyRecord.Priority.ToString()},
            }, 
            "POST", 
            "%text");
@ -135,58 +117,47 @@ public class NotificationConnectorController(NotificationsContext context, ILog
    }
    
    /// <summary>
-    /// Creates a new Pushover-Notification-Connector
+    /// Creates a new Pushover-<see cref="NotificationConnector"/>
    /// </summary>
    /// <remarks>https://pushover.net/api</remarks>
    /// <response code="201">ID of new connector</response>
-    /// <response code="400"></response>
-    /// <response code="409">A NotificationConnector with name already exists</response>
    /// <response code="500">Error during Database Operation</response>
    [HttpPut("Pushover")]
    [ProducesResponseType<string>(Status201Created, "application/json")]
-    [ProducesResponseType(Status400BadRequest)]
-    [ProducesResponseType(Status409Conflict)]
    [ProducesResponseType<string>(Status500InternalServerError, "text/plain")]
    public IActionResult CreatePushoverConnector([FromBody]PushoverRecord pushoverRecord)
    {
-        if(!pushoverRecord.Validate())
-            return BadRequest();
+        //TODO Validate Data
        
-        NotificationConnector pushoverConnector = new  (TokenGen.CreateToken("Pushover"),
+        NotificationConnector pushoverConnector = new  (pushoverRecord.Name,
            $"https://api.pushover.net/1/messages.json", 
            new Dictionary<string, string>(),
            "POST", 
-            $"{{\"token\": \"{pushoverRecord.apptoken}\", \"user\": \"{pushoverRecord.user}\", \"message:\":\"%text\", \"%title\" }}");
+            $"{{\"token\": \"{pushoverRecord.AppToken}\", \"user\": \"{pushoverRecord.User}\", \"message:\":\"%text\", \"%title\" }}");
        return CreateConnector(pushoverConnector);
    }
    
    /// <summary>
-    /// Deletes the Notification-Connector with the requested ID
+    /// Deletes the <see cref="NotificationConnector"/> with the requested Name
    /// </summary>
-    /// <param name="NotificationConnectorId">Notification-Connector-ID</param>
+    /// <param name="Name"><see cref="NotificationConnector"/>.Name</param>
    /// <response code="200"></response>
-    /// <response code="404">NotificationConnector with ID not found</response>
+    /// <response code="404"><see cref="NotificationConnector"/> with Name not found</response>
    /// <response code="500">Error during Database Operation</response>
-    [HttpDelete("{NotificationConnectorId}")]
+    [HttpDelete("{Name}")]
    [ProducesResponseType(Status200OK)]
    [ProducesResponseType(Status404NotFound)]
    [ProducesResponseType<string>(Status500InternalServerError, "text/plain")]
-    public IActionResult DeleteConnector(string NotificationConnectorId)
+    public IActionResult DeleteConnector(string Name)
    {
-        try
-        {
-            NotificationConnector? ret = context.NotificationConnectors.Find(NotificationConnectorId);
-            if(ret is null)
-                return NotFound();
-            
-            context.Remove(ret);
-            context.SaveChanges();
-            return Ok();
-        }
-        catch (Exception e)
-        {
-            Log.Error(e);
-            return StatusCode(500, e.Message);
-        }
+        NotificationsContext context = scope.ServiceProvider.GetRequiredService<NotificationsContext>();
+        if(context.NotificationConnectors.Find(Name) is not { } connector)
+            return NotFound();
+        
+        context.NotificationConnectors.Remove(connector);
+        
+        if(context.Sync().Result is { } errorMessage)
+            return StatusCode(Status500InternalServerError, errorMessage);
+        return Created();
    }
 }