diff --git a/src/AzureOpenAIProxy.ApiApp/Extensions/ServiceCollectionExtensions.cs b/src/AzureOpenAIProxy.ApiApp/Extensions/ServiceCollectionExtensions.cs index 00783177..965f119d 100644 --- a/src/AzureOpenAIProxy.ApiApp/Extensions/ServiceCollectionExtensions.cs +++ b/src/AzureOpenAIProxy.ApiApp/Extensions/ServiceCollectionExtensions.cs @@ -145,7 +145,7 @@ public static IServiceCollection AddTableStorageService(this IServiceCollection { services.AddSingleton(sp => { var configuration = sp.GetService() - ?? throw new InvalidOperationException($"{nameof(IConfiguration)} service is not registerd."); + ?? throw new InvalidOperationException($"{nameof(IConfiguration)} service is not registered."); var settings = configuration.GetSection(AzureSettings.Name).GetSection(KeyVaultSettings.Name).Get() ?? throw new InvalidOperationException($"{nameof(KeyVaultSettings)} could not be retrieved from the configuration."); diff --git a/src/AzureOpenAIProxy.ApiApp/Repositories/AdminEventRepository.cs b/src/AzureOpenAIProxy.ApiApp/Repositories/AdminEventRepository.cs index 1ef0dfcb..f72ec2db 100644 --- a/src/AzureOpenAIProxy.ApiApp/Repositories/AdminEventRepository.cs +++ b/src/AzureOpenAIProxy.ApiApp/Repositories/AdminEventRepository.cs @@ -1,4 +1,7 @@ -using Azure.Data.Tables; +using System.Collections.Specialized; +using System.Text.Json; + +using Azure.Data.Tables; using AzureOpenAIProxy.ApiApp.Configurations; using AzureOpenAIProxy.ApiApp.Extensions; @@ -38,6 +41,13 @@ public interface IAdminEventRepository /// Event details instance. /// Returns the updated record of the event details. Task UpdateEvent(Guid eventId, AdminEventDetails eventDetails); + + /// + /// Deletes the event details. + /// + /// Event details instance. + /// Removed EventID of event details instance. + Task DeleteEvent(AdminEventDetails eventDetails); } /// @@ -51,13 +61,25 @@ public class AdminEventRepository(TableServiceClient tableServiceClient, Storage /// public async Task CreateEvent(AdminEventDetails eventDetails) { - throw new NotImplementedException(); + var tableClient = _tableServiceClient.GetTableClient(_storageAccountSettings.TableStorage.TableName); + + await tableClient.AddEntityAsync(eventDetails); + + return eventDetails; } /// public async Task> GetEvents() { - throw new NotImplementedException(); + var tableClient = await GetTableClientAsync(); + var eventDetailsList = new List(); + + await foreach (var entity in tableClient.QueryAsync()) + { + eventDetailsList.Add(entity); + } + + return eventDetailsList; } /// @@ -76,7 +98,22 @@ public async Task GetEvent(Guid eventId) /// public async Task UpdateEvent(Guid eventId, AdminEventDetails eventDetails) { - throw new NotImplementedException(); + var tableClient = await GetTableClientAsync(); + + eventDetails.EventId = eventId; + + await tableClient.UpdateEntityAsync(eventDetails, eventDetails.ETag, TableUpdateMode.Replace); + + return eventDetails; + } + + public async Task DeleteEvent(AdminEventDetails eventDetails) + { + var tableClient = await GetTableClientAsync(); + + await tableClient.DeleteEntityAsync(eventDetails.PartitionKey, eventDetails.RowKey); + + return eventDetails.EventId; } private async Task GetTableClientAsync() diff --git a/src/AzureOpenAIProxy.ApiApp/Services/AdminEventService.cs b/src/AzureOpenAIProxy.ApiApp/Services/AdminEventService.cs index 09f21797..d4e0746c 100644 --- a/src/AzureOpenAIProxy.ApiApp/Services/AdminEventService.cs +++ b/src/AzureOpenAIProxy.ApiApp/Services/AdminEventService.cs @@ -35,6 +35,13 @@ public interface IAdminEventService /// Event details to update. /// Returns the updated event details. Task UpdateEvent(Guid eventId, AdminEventDetails eventDetails); + + /// + /// Deletes the event details. + /// + /// Event details to update. + /// Removed EventID of event details instance. + Task DeleteEvent(AdminEventDetails eventDetails); } /// @@ -75,6 +82,14 @@ public async Task UpdateEvent(Guid eventId, AdminEventDetails return result; } + + /// + public async Task DeleteEvent(AdminEventDetails eventDetails) + { + var result = await this._repository.DeleteEvent(eventDetails).ConfigureAwait(false); + + return result; + } } /// diff --git a/test/AzureOpenAIProxy.ApiApp.Tests/Repositories/AdminEventRepositoryTests.cs b/test/AzureOpenAIProxy.ApiApp.Tests/Repositories/AdminEventRepositoryTests.cs index ddc0facd..bba20443 100644 --- a/test/AzureOpenAIProxy.ApiApp.Tests/Repositories/AdminEventRepositoryTests.cs +++ b/test/AzureOpenAIProxy.ApiApp.Tests/Repositories/AdminEventRepositoryTests.cs @@ -16,6 +16,19 @@ namespace AzureOpenAIProxy.ApiApp.Tests.Repositories; public class AdminEventRepositoryTests { + private readonly StorageAccountSettings mockSettings; + private readonly TableServiceClient mockTableServiceClient; + private readonly TableClient mockTableClient; + + public AdminEventRepositoryTests() + { + mockSettings = Substitute.For(); + mockTableServiceClient = Substitute.For(); + mockTableClient = Substitute.For(); + + mockTableServiceClient.GetTableClient(Arg.Any()).Returns(mockTableClient); + } + [Fact] public void Given_ServiceCollection_When_AddAdminEventRepository_Invoked_Then_It_Should_Contain_AdminEventRepository() { @@ -33,11 +46,10 @@ public void Given_ServiceCollection_When_AddAdminEventRepository_Invoked_Then_It public void Given_Null_TableServiceClient_When_Creating_AdminEventRepository_Then_It_Should_Throw_Exception() { // Arrange - var settings = Substitute.For(); var tableServiceClient = default(TableServiceClient); // Act - Action action = () => new AdminEventRepository(tableServiceClient, settings); + Action action = () => new AdminEventRepository(tableServiceClient, mockSettings); // Assert action.Should().Throw(); @@ -48,44 +60,39 @@ public void Given_Null_StorageAccountSettings_When_Creating_AdminEventRepository { // Arrange var settings = default(StorageAccountSettings); - var tableServiceClient = Substitute.For(); // Act - Action action = () => new AdminEventRepository(tableServiceClient, settings); + Action action = () => new AdminEventRepository(mockTableServiceClient, settings); // Assert action.Should().Throw(); } [Fact] - public void Given_Instance_When_CreateEvent_Invoked_Then_It_Should_Throw_Exception() + public async Task Given_Instance_When_CreateEvent_Invoked_Then_It_Should_Return_Created_Event() { // Arrange - var settings = Substitute.For(); - var tableServiceClient = Substitute.For(); var eventDetails = new AdminEventDetails(); - var repository = new AdminEventRepository(tableServiceClient, settings); + var repository = new AdminEventRepository(mockTableServiceClient, mockSettings); // Act - Func func = async () => await repository.CreateEvent(eventDetails); + await repository.CreateEvent(eventDetails); // Assert - func.Should().ThrowAsync(); + await mockTableClient.Received(1).AddEntityAsync(eventDetails, default); } [Fact] - public void Given_Instance_When_GetEvents_Invoked_Then_It_Should_Throw_Exception() + public async Task Given_Instance_When_GetEvents_Invoked_Then_It_Should_Invoke_QueryAsync_Method() { // Arrange - var settings = Substitute.For(); - var tableServiceClient = Substitute.For(); - var repository = new AdminEventRepository(tableServiceClient, settings); + var repository = new AdminEventRepository(mockTableServiceClient, mockSettings); // Act - Func func = async () => await repository.GetEvents(); + await repository.GetEvents(); // Assert - func.Should().ThrowAsync(); + mockTableClient.Received(1).QueryAsync(); } [Theory] @@ -94,16 +101,12 @@ public void Given_Instance_When_GetEvents_Invoked_Then_It_Should_Throw_Exception public async Task Given_Failure_In_Get_Entity_When_GetEvent_Invoked_Then_It_Should_Throw_Exception(int statusCode) { // Arrange - var settings = Substitute.For(); - var tableServiceClient = Substitute.For(); var eventId = Guid.NewGuid(); - var repository = new AdminEventRepository(tableServiceClient, settings); + var repository = new AdminEventRepository(mockTableServiceClient, mockSettings); var exception = new RequestFailedException(statusCode, "Request Error", default, default); - var tableClient = Substitute.For(); - tableServiceClient.GetTableClient(Arg.Any()).Returns(tableClient); - tableClient.GetEntityAsync(Arg.Any(), Arg.Any()) + mockTableClient.GetEntityAsync(Arg.Any(), Arg.Any()) .ThrowsAsync(exception); // Act @@ -119,9 +122,7 @@ public async Task Given_Failure_In_Get_Entity_When_GetEvent_Invoked_Then_It_Shou public async Task Given_Exist_EventId_When_GetEvent_Invoked_Then_It_Should_Return_AdminEventDetails(string eventId, string partitionKey) { // Arrange - var settings = Substitute.For(); - var tableServiceClient = Substitute.For(); - var repository = new AdminEventRepository(tableServiceClient, settings); + var repository = new AdminEventRepository(mockTableServiceClient, mockSettings); var eventDetails = new AdminEventDetails { @@ -131,9 +132,7 @@ public async Task Given_Exist_EventId_When_GetEvent_Invoked_Then_It_Should_Retur var response = Response.FromValue(eventDetails, Substitute.For()); - var tableClient = Substitute.For(); - tableServiceClient.GetTableClient(Arg.Any()).Returns(tableClient); - tableClient.GetEntityAsync(partitionKey, eventId) + mockTableClient.GetEntityAsync(partitionKey, eventId) .Returns(Task.FromResult(response)); // Act @@ -144,19 +143,39 @@ public async Task Given_Exist_EventId_When_GetEvent_Invoked_Then_It_Should_Retur } [Fact] - public void Given_Instance_When_UpdateEvent_Invoked_Then_It_Should_Throw_Exception() + public async Task Given_Instance_When_UpdateEvent_Invoked_Then_It_Should_Invoke_UpdateEntityAsync_Method() { // Arrange - var settings = Substitute.For(); - var tableServiceClient = Substitute.For(); var eventId = Guid.NewGuid(); var eventDetails = new AdminEventDetails(); - var repository = new AdminEventRepository(tableServiceClient, settings); + var repository = new AdminEventRepository(mockTableServiceClient, mockSettings); + + // Act + await repository.UpdateEvent(eventId, eventDetails); + + // Assert + await mockTableClient.Received(1) + .UpdateEntityAsync(Arg.Any(), + Arg.Any(), + TableUpdateMode.Replace); + } + + [Fact] + public async Task Given_Instance_When_DeleteEvent_Invoked_Then_It_Should_Invoke_DeleteEntityAsync_Method() + { + // Arrange + var eventDetails = new AdminEventDetails(); + var repository = new AdminEventRepository(mockTableServiceClient, mockSettings); + var eventId = Guid.NewGuid(); + + eventDetails.EventId = eventId; // Act - Func func = async () => await repository.UpdateEvent(eventId, eventDetails); + Guid deletedEventId = await repository.DeleteEvent(eventDetails); // Assert - func.Should().ThrowAsync(); + deletedEventId.Should().Be(eventId); + await mockTableClient.Received(1) + .DeleteEntityAsync(Arg.Any(), Arg.Any()); } } diff --git a/test/AzureOpenAIProxy.ApiApp.Tests/Services/AdminEventServiceTests.cs b/test/AzureOpenAIProxy.ApiApp.Tests/Services/AdminEventServiceTests.cs index f0442c76..a1f4bd23 100644 --- a/test/AzureOpenAIProxy.ApiApp.Tests/Services/AdminEventServiceTests.cs +++ b/test/AzureOpenAIProxy.ApiApp.Tests/Services/AdminEventServiceTests.cs @@ -15,6 +15,13 @@ namespace AzureOpenAIProxy.ApiApp.Tests.Services; public class AdminEventServiceTests { + private readonly IAdminEventRepository mockRepository; + + public AdminEventServiceTests() + { + mockRepository = Substitute.For(); + } + [Fact] public void Given_ServiceCollection_When_AddAdminEventService_Invoked_Then_It_Should_Contain_AdminEventService() { @@ -33,8 +40,7 @@ public void Given_Instance_When_CreateEvent_Invoked_Then_It_Should_Throw_Excepti { // Arrange var eventDetails = new AdminEventDetails(); - var repository = Substitute.For(); - var service = new AdminEventService(repository); + var service = new AdminEventService(mockRepository); // Act Func func = async () => await service.CreateEvent(eventDetails); @@ -47,8 +53,7 @@ public void Given_Instance_When_CreateEvent_Invoked_Then_It_Should_Throw_Excepti public void Given_Instance_When_GetEvents_Invoked_Then_It_Should_Throw_Exception() { // Arrange - var repository = Substitute.For(); - var service = new AdminEventService(repository); + var service = new AdminEventService(mockRepository); // Act Func func = async () => await service.GetEvents(); @@ -65,12 +70,11 @@ public async Task Given_Failure_In_Get_Entity_When_GetEvent_Invoked_Then_It_Shou { // Arrange var eventId = Guid.NewGuid(); - var repository = Substitute.For(); - var service = new AdminEventService(repository); + var service = new AdminEventService(mockRepository); var exception = new RequestFailedException(statusCode, "Request Failed", default, default); - repository.GetEvent(Arg.Any()).ThrowsAsync(exception); + mockRepository.GetEvent(Arg.Any()).ThrowsAsync(exception); // Act Func func = () => service.GetEvent(eventId); @@ -85,8 +89,7 @@ public async Task Given_Failure_In_Get_Entity_When_GetEvent_Invoked_Then_It_Shou public async Task Given_Exist_EventId_When_GetEvent_Invoked_Then_It_Should_Return_AdminEventDetails(string eventId) { // Arrange - var repository = Substitute.For(); - var service = new AdminEventService(repository); + var service = new AdminEventService(mockRepository); var eventDetails = new AdminEventDetails { @@ -95,7 +98,7 @@ public async Task Given_Exist_EventId_When_GetEvent_Invoked_Then_It_Should_Retur var guid = Guid.Parse(eventId); - repository.GetEvent(guid).Returns(Task.FromResult(eventDetails)); + mockRepository.GetEvent(guid).Returns(Task.FromResult(eventDetails)); // Act var result = await service.GetEvent(guid); @@ -105,18 +108,37 @@ public async Task Given_Exist_EventId_When_GetEvent_Invoked_Then_It_Should_Retur } [Fact] - public void Given_Instance_When_UpdateEvent_Invoked_Then_It_Should_Throw_Exception() + public async Task Given_Instance_When_UpdateEvent_Invoked_Then_It_Should_Return_Updated_Event_Details() { // Arrange var eventId = Guid.NewGuid(); var eventDetails = new AdminEventDetails(); - var repository = Substitute.For(); - var service = new AdminEventService(repository); + var service = new AdminEventService(mockRepository); + + mockRepository.UpdateEvent(eventId, eventDetails).Returns(eventDetails); // Act - Func func = async () => await service.UpdateEvent(eventId, eventDetails); + var updatedEventDetails = await service.UpdateEvent(eventId, eventDetails); // Assert - func.Should().ThrowAsync(); + updatedEventDetails.Should().BeEquivalentTo(eventDetails); + } + + [Fact] + public async Task Given_Instance_When_DeleteEvent_Invoked_Then_It_Should_Return_Deleted_Event_Id() + { + // Arrange + var eventId = Guid.NewGuid(); + var eventDetails = new AdminEventDetails(); + var service = new AdminEventService(mockRepository); + + eventDetails.EventId = eventId; + mockRepository.DeleteEvent(eventDetails).Returns(eventDetails.EventId); + + // Act + var deletedEventId = await service.DeleteEvent(eventDetails); + + // Assert + deletedEventId.Should().Be(eventId); } }