diff --git a/Applications/AdminApi/src/AdminApi/Controllers/LogsController.cs b/Applications/AdminApi/src/AdminApi/Controllers/LogsController.cs deleted file mode 100644 index defb65557f..0000000000 --- a/Applications/AdminApi/src/AdminApi/Controllers/LogsController.cs +++ /dev/null @@ -1,76 +0,0 @@ -using Backbone.BuildingBlocks.API.Mvc; -using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes; -using Backbone.BuildingBlocks.Application.Abstractions.Exceptions; -using MediatR; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException; - -namespace Backbone.AdminApi.Controllers; - -[Route("api/v1/[controller]")] -[Authorize("ApiKey")] -public class LogsController : ApiControllerBase -{ - private readonly ILoggerFactory _loggerFactory; - - public LogsController( - IMediator mediator, ILoggerFactory logger) : base(mediator) - { - _loggerFactory = logger; - } - - [HttpPost] - [ProducesResponseType(StatusCodes.Status204NoContent)] - [ProducesError(StatusCodes.Status400BadRequest)] - public IActionResult CreateLog(LogRequest request) - { - var logger = _loggerFactory.CreateLogger(request.Category); - - switch (request.LogLevel) - { - case LogLevel.Trace: - logger.LogTrace(request.MessageTemplate, request.Arguments); - break; - case LogLevel.Debug: - logger.LogDebug(request.MessageTemplate, request.Arguments); - break; - case LogLevel.Information: - case LogLevel.Log: - logger.LogInformation(request.MessageTemplate, request.Arguments); - break; - case LogLevel.Warning: - logger.LogWarning(request.MessageTemplate, request.Arguments); - break; - case LogLevel.Error: - logger.LogError(request.MessageTemplate, request.Arguments); - break; - case LogLevel.Critical: - logger.LogCritical(request.MessageTemplate, request.Arguments); - break; - default: - throw new ApplicationException(GenericApplicationErrors.Validation.InvalidPropertyValue(nameof(request.LogLevel))); - } - - return NoContent(); - } -} - -public class LogRequest -{ - public required LogLevel LogLevel { get; set; } - public required string Category { get; set; } - public required string MessageTemplate { get; set; } - public object[] Arguments { get; set; } = []; -} - -public enum LogLevel -{ - Trace, - Debug, - Information, - Log, - Warning, - Error, - Critical -} diff --git a/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj b/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj index 5a77045ba3..e40ca2e8d0 100644 --- a/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj +++ b/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj @@ -36,5 +36,5 @@ Always - + diff --git a/Applications/AdminApi/test/AdminApi.Tests.Integration/Features/Logs/POST.feature b/Applications/AdminApi/test/AdminApi.Tests.Integration/Features/Logs/POST.feature deleted file mode 100644 index 59dd07a9c2..0000000000 --- a/Applications/AdminApi/test/AdminApi.Tests.Integration/Features/Logs/POST.feature +++ /dev/null @@ -1,13 +0,0 @@ -@Integration -Feature: POST Log - -UI Creates a Log - -Scenario: Creating a Log - When a POST request is sent to the /Logs endpoint - Then the response status code is 204 (No Content) - -Scenario: Creating a Log with an invalid Log Level fails - When a POST request is sent to the /Logs endpoint with an invalid Log Level - Then the response status code is 400 (Bad Request) - And the response content contains an error with the error code "error.platform.validation.invalidPropertyValue" diff --git a/Applications/AdminApi/test/AdminApi.Tests.Integration/StepDefinitions/LogsStepDefinitions.cs b/Applications/AdminApi/test/AdminApi.Tests.Integration/StepDefinitions/LogsStepDefinitions.cs deleted file mode 100644 index 783320df09..0000000000 --- a/Applications/AdminApi/test/AdminApi.Tests.Integration/StepDefinitions/LogsStepDefinitions.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Backbone.AdminApi.Sdk.Endpoints.Logs.Types.Requests; -using Backbone.AdminApi.Tests.Integration.Configuration; -using Backbone.BuildingBlocks.SDK.Endpoints.Common.Types; -using Microsoft.Extensions.Options; - -namespace Backbone.AdminApi.Tests.Integration.StepDefinitions; - -[Binding] -[Scope(Feature = "POST Log")] -internal class LogsStepDefinitions : BaseStepDefinitions -{ - private ApiResponse? _postResponse; - - public LogsStepDefinitions(HttpClientFactory factory, IOptions options) : base(factory, options) - { - } - - [When("a POST request is sent to the /Logs endpoint")] - public async Task WhenAPOSTRequestIsSentToTheLogsEndpoint() - { - _postResponse = await _client.Logs.CreateLog(new LogRequest - { - LogLevel = LogLevel.Trace, - Category = "Test Category", - MessageTemplate = "The log request {0} has the following description: {1}", - Arguments = ["Request Name", "Request Description"] - }); - } - - [When("a POST request is sent to the /Logs endpoint with an invalid Log Level")] - public async Task WhenAPOSTRequestIsSentToTheLogsEndpointWithAnInvalidLogLevel() - { - _postResponse = await _client.Logs.CreateLog(new LogRequest - { - LogLevel = (LogLevel)16, - Category = "Test Category", - MessageTemplate = "The log request {0} has the following description: {1}", - Arguments = ["Request Name", "Request Description"] - }); - } - - [Then(@"the response status code is (\d+) \(.+\)")] - public void ThenTheResponseStatusCodeIs(int expectedStatusCode) - { - if (_postResponse != null) - ((int)_postResponse!.Status).Should().Be(expectedStatusCode); - } - - [Then(@"the response content contains an error with the error code ""([^""]+)""")] - public void ThenTheResponseContentIncludesAnErrorWithTheErrorCode(string errorCode) - { - _postResponse!.Error.Should().NotBeNull(); - _postResponse.Error!.Code.Should().Be(errorCode); - } -} diff --git a/Sdks/AdminApi.Sdk/src/Client.cs b/Sdks/AdminApi.Sdk/src/Client.cs index c961e3a593..762d1d58e8 100644 --- a/Sdks/AdminApi.Sdk/src/Client.cs +++ b/Sdks/AdminApi.Sdk/src/Client.cs @@ -4,7 +4,6 @@ using Backbone.AdminApi.Sdk.Endpoints.Challenges; using Backbone.AdminApi.Sdk.Endpoints.Clients; using Backbone.AdminApi.Sdk.Endpoints.Identities; -using Backbone.AdminApi.Sdk.Endpoints.Logs; using Backbone.AdminApi.Sdk.Endpoints.Messages; using Backbone.AdminApi.Sdk.Endpoints.Metrics; using Backbone.AdminApi.Sdk.Endpoints.Relationships; @@ -28,7 +27,6 @@ private Client(HttpClient httpClient, string apiKey) ApiKeyValidation = new ApiKeyValidationEndpoint(endpointClient); Clients = new ClientsEndpoint(endpointClient); Identities = new IdentitiesEndpoint(endpointClient); - Logs = new LogsEndpoint(endpointClient); Metrics = new MetricsEndpoint(endpointClient); Relationships = new RelationshipsEndpoint(endpointClient); Tiers = new TiersEndpoint(endpointClient); @@ -39,7 +37,6 @@ private Client(HttpClient httpClient, string apiKey) public ApiKeyValidationEndpoint ApiKeyValidation { get; } public ClientsEndpoint Clients { get; } public IdentitiesEndpoint Identities { get; } - public LogsEndpoint Logs { get; } public MetricsEndpoint Metrics { get; } public RelationshipsEndpoint Relationships { get; } public TiersEndpoint Tiers { get; } diff --git a/Sdks/AdminApi.Sdk/src/Endpoints/Logs/LogsEndpoint.cs b/Sdks/AdminApi.Sdk/src/Endpoints/Logs/LogsEndpoint.cs deleted file mode 100644 index 734921ec31..0000000000 --- a/Sdks/AdminApi.Sdk/src/Endpoints/Logs/LogsEndpoint.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Backbone.AdminApi.Sdk.Endpoints.Logs.Types.Requests; -using Backbone.BuildingBlocks.SDK.Endpoints.Common; -using Backbone.BuildingBlocks.SDK.Endpoints.Common.Types; - -namespace Backbone.AdminApi.Sdk.Endpoints.Logs; - -public class LogsEndpoint(EndpointClient client) : AdminApiEndpoint(client) -{ - public async Task> CreateLog(LogRequest request) - { - return await _client.Post($"api/{API_VERSION}/Logs", request); - } -} diff --git a/Sdks/AdminApi.Sdk/src/Endpoints/Logs/Types/Requests/LogRequest.cs b/Sdks/AdminApi.Sdk/src/Endpoints/Logs/Types/Requests/LogRequest.cs deleted file mode 100644 index 566c3103df..0000000000 --- a/Sdks/AdminApi.Sdk/src/Endpoints/Logs/Types/Requests/LogRequest.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Backbone.AdminApi.Sdk.Endpoints.Logs.Types.Requests; - -public class LogRequest -{ - public required LogLevel LogLevel { get; set; } - public required string Category { get; set; } - public required string MessageTemplate { get; set; } - public object[] Arguments { get; set; } = []; -} - -public enum LogLevel -{ - Trace, - Debug, - Information, - Log, - Warning, - Error, - Critical -}