From 15b4cee75ef7f050f71ddd34a6b1afb51e31a0d1 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 2 Dec 2022 04:26:17 +0100 Subject: [PATCH] Refactor controllers --- Controllers/{PlaybackHistory => }/LogPlayback.cs | 2 +- Controllers/{PlaybackHistory => }/LogPlaybackRequest.cs | 2 +- Controllers/{well-known => }/Pronouns.cs | 2 +- Controllers/{Travelynx => }/Travelynx.cs | 4 ++-- .../TravelynxWebhookRequest.cs => TravelynxRequest.cs} | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename Controllers/{PlaybackHistory => }/LogPlayback.cs (96%) rename Controllers/{PlaybackHistory => }/LogPlaybackRequest.cs (83%) rename Controllers/{well-known => }/Pronouns.cs (80%) rename Controllers/{Travelynx => }/Travelynx.cs (88%) rename Controllers/{Travelynx/TravelynxWebhookRequest.cs => TravelynxRequest.cs} (94%) diff --git a/Controllers/PlaybackHistory/LogPlayback.cs b/Controllers/LogPlayback.cs similarity index 96% rename from Controllers/PlaybackHistory/LogPlayback.cs rename to Controllers/LogPlayback.cs index dde6028..106e690 100644 --- a/Controllers/PlaybackHistory/LogPlayback.cs +++ b/Controllers/LogPlayback.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using zotanpw.Backend.database; using zotanpw.Backend.database.Tables; -namespace zotanpw.Controllers.PlaybackHistory; +namespace zotanpw.Controllers; [ApiController, Route("/np/log")] public class LogPlayback : Controller { diff --git a/Controllers/PlaybackHistory/LogPlaybackRequest.cs b/Controllers/LogPlaybackRequest.cs similarity index 83% rename from Controllers/PlaybackHistory/LogPlaybackRequest.cs rename to Controllers/LogPlaybackRequest.cs index c35dc9d..1a78f32 100644 --- a/Controllers/PlaybackHistory/LogPlaybackRequest.cs +++ b/Controllers/LogPlaybackRequest.cs @@ -1,7 +1,7 @@ // Auto-generated JSON mapping // ReSharper disable All -namespace zotanpw.Controllers.PlaybackHistory; +namespace zotanpw.Controllers; public class LogPlaybackRequest { public string? Artist { get; set; } diff --git a/Controllers/well-known/Pronouns.cs b/Controllers/Pronouns.cs similarity index 80% rename from Controllers/well-known/Pronouns.cs rename to Controllers/Pronouns.cs index 8d34618..29be674 100644 --- a/Controllers/well-known/Pronouns.cs +++ b/Controllers/Pronouns.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace zotanpw.Controllers.well_known; +namespace zotanpw.Controllers; [ApiController, Route("/.well-known/pronouns")] public class Pronouns : Controller { diff --git a/Controllers/Travelynx/Travelynx.cs b/Controllers/Travelynx.cs similarity index 88% rename from Controllers/Travelynx/Travelynx.cs rename to Controllers/Travelynx.cs index 5e5f2ef..50f3beb 100644 --- a/Controllers/Travelynx/Travelynx.cs +++ b/Controllers/Travelynx.cs @@ -3,14 +3,14 @@ using Microsoft.AspNetCore.Mvc; using zotanpw.Backend.database; using zotanpw.Backend.database.Tables; -namespace zotanpw.Controllers.Travelynx; +namespace zotanpw.Controllers; [ApiController, Route("/travelynx")] public class Travelynx : Controller { private static readonly string TravelynxSecret = System.IO.File.ReadAllLines(".bearer_token")[0]; [HttpPost] - public TravelynxInfo Update([FromBody] TravelynxWebhookRequest rq) { + public TravelynxInfo Update([FromBody] TravelynxRequest rq) { var token = Request.Headers.Authorization; if (token == TravelynxSecret) { var db = new Database.DbConn(); diff --git a/Controllers/Travelynx/TravelynxWebhookRequest.cs b/Controllers/TravelynxRequest.cs similarity index 94% rename from Controllers/Travelynx/TravelynxWebhookRequest.cs rename to Controllers/TravelynxRequest.cs index 0092029..27499ca 100644 --- a/Controllers/Travelynx/TravelynxWebhookRequest.cs +++ b/Controllers/TravelynxRequest.cs @@ -1,9 +1,9 @@ // Auto-generated JSON mapping // ReSharper disable All -namespace zotanpw.Controllers.Travelynx; +namespace zotanpw.Controllers; -public class TravelynxWebhookRequest { +public class TravelynxRequest { public string? Reason { get; set; } public Status? Status { get; set; } }