31 removing contract data from admin page

src/Application/Contracts/ContractService.cs

@@ -32,4 +32,10 @@ public void Add(Contract contract)
 
         _repo.Add(contract);
     }
+
+    /// <inheritdoc />
+    public bool Remove(Guid id)
+    {
+        return _repo.Remove(id);
+    }
 }

src/Application/Contracts/IContractRepository.cs

@@ -18,4 +18,11 @@ public interface IContractRepository
     /// </summary>
     /// <param name="contract">The new contract instance.</param>
     void Add(Contract contract);
+
+    /// <summary>
+    /// Removes the contract with the given ID.
+    /// </summary>
+    /// <param name="id">The id of the contract to be removed.</param>
+    /// <returns>If the removal was successful.</returns>
+    public bool Remove(Guid id);
 }

src/Application/Contracts/IContractService.cs

@@ -18,4 +18,11 @@ public interface IContractService
     /// </summary>
     /// <param name="contract">The new contract.</param>
     void Add(Contract contract);
+
+    /// <summary>
+    /// Removes the specified contract.
+    /// </summary>
+    /// <param name="id">The id of the contract to be removed.</param>
+    /// <returns>Whether the removal was successful.</returns>
+    bool Remove(Guid id);
 }

src/Client/Pages/Admin/AdminPage.razor

@@ -15,5 +15,4 @@
     {
         _contractList.Add(contract);
     }
-
 }

src/Client/Pages/Admin/ContractList.razor

@@ -12,7 +12,7 @@ else
     <div class="list-group">
         @foreach (var contract in _contracts)
         {
-            <ContractListItem Name=@contract.Name/>
+            <ContractListItem Contract=@contract OnContractRemoved=@OnContractRemoved/>
         }
     </div>
 }
@@ -39,6 +39,16 @@ else
         InvokeAsync(StateHasChanged);
     }
 
-
+    /// <summary>
+    /// Removes a contract from the list.
+    /// </summary>
+    /// <param name="contract">The contract to remove.</param>
+    private void OnContractRemoved(Contract contract)
+    {
+        // Using null forgiving operator because because _contracts
+        // can not be null when remove button is pressed.
+        _contracts!.Remove(contract);
+        InvokeAsync(StateHasChanged);
+    }
 }
 

src/Client/Pages/Admin/ContractListItem.razor

@@ -1,12 +1,35 @@
-<div id="@Name" class="list-group-item" style="max-width: 50%"> @Name </div>
+@using Domain.Contracts
+@inject HttpClient _http
+
+<div id="@Contract.Name" class="list-group-item d-flex justify-content-between" style="max-width: 50%">
+     @Contract.Name
+
+     <button type="button" class="btn btn-danger" @onclick="RemoveContract">
+        <span class="oi oi-trash"></span>
+     </button>
+</div>
 
 
 @code {
+    /// <summary>
+    /// Called when a contract has been removed successfully.
+    /// </summary>
+    [Parameter]
+    public EventCallback<Contract> OnContractRemoved { get; set; } = EventCallback<Contract>.Empty;
+
 
     /// <summary>
-    /// Name of the company.
+    /// The contract.
     /// </summary>
     [Parameter, EditorRequired,]
-    public string? Name { get; set; }
+    public Contract Contract { get; set; } = new();
 
+    private async Task RemoveContract()
+    {
+        HttpResponseMessage response = await _http.DeleteAsync($"api/v1/Contracts/{Contract.Id}");
+        if (response.IsSuccessStatusCode)
+        {
+            await OnContractRemoved.InvokeAsync(Contract);
+        }
+    }
 }

src/Domain/Contracts/Contract.cs

@@ -8,7 +8,7 @@ public class Contract
     /// <summary>
     /// Gets the unique identifier.
     /// </summary>
-    public Guid Id { get; } = Guid.NewGuid();
+    public Guid Id { get; init; } = Guid.NewGuid();
 
     /// <summary>
     ///     Gets or sets the name of the contract supplier.

src/Infrastructure/Contracts/FakeContractRepository.cs

@@ -9,7 +9,7 @@ namespace Infrastructure.Contracts;
 /// </summary>
 public class FakeContractRepository : IContractRepository
 {
-    private readonly ICollection<Contract> _contracts;
+    private readonly List<Contract> _contracts;
 
     /// <summary>
     /// Creates a fake contract for SJ.
@@ -27,4 +27,10 @@ public void Add(Contract contract)
     {
         _contracts.Add(contract);
     }
+
+    /// <inheritdoc />
+    public bool Remove(Guid id)
+    {
+        return _contracts.RemoveAll(o => o.Id == id) > 0;
+    }
 }

src/Server/Controllers/ContractsController.cs

@@ -59,4 +59,17 @@ public IActionResult CreateContract(Contract contract)
 
         return Ok();
     }
+
+    /// <summary>
+    /// Removes the specified contract.
+    /// </summary>
+    /// <param name="id">Id of the contract to be removed.</param>
+    /// <returns>If the contract was successfully removed.</returns>
+    [HttpDelete("{id:guid}")]
+    public IActionResult Remove(Guid id)
+    {
+        return _contracts.Remove(id) ?
+            Ok() :
+            NotFound();
+    }
 }

tests/Application.Tests/Contracts/ContractServiceTests.cs

@@ -59,4 +59,33 @@ public void AddingContract_DoesNotThrow_IfIDIsUnique()
         // Assert
         add.Should().NotThrow();
     }
+
+    [Fact]
+    public void RemovingContract_DoesReturnTrue_WhenAContractExists()
+    {
+        // Arrange
+        var contract = new Contract();
+        _mockRepo.Setup(repository => repository.Remove(contract.Id)).Returns(true);
+
+        // Act
+        bool actual = _cut.Remove(contract.Id);
+
+        // // Assert
+        actual.Should().BeTrue();
+    }
+
+    [Fact]
+    public void RemovingContract_DoesReturnFalse_WhenNoContractsExists()
+    {
+        // Arrange
+        _mockRepo.Setup(repository => repository.All).Returns(new List<Contract>());
+
+        var id = Guid.NewGuid();
+
+        // Act
+        bool actual = _cut.Remove(id);
+
+        // Assert
+        actual.Should().BeFalse();
+    }
 }

tests/Infrastructure.Tests/Contracts/FakeContractRepositoryTests.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Linq;
+using Infrastructure.Contracts;
+
+namespace Infrastructure.Tests.Contracts;
+public class FakeContractRepositoryTests
+{
+    private readonly FakeContractRepository _cut;
+
+    public FakeContractRepositoryTests()
+    {
+        _cut = new FakeContractRepository();
+    }
+
+    [Fact]
+    public void RemoveContract_ReturnsFalse_WhenContractDoesNotExist()
+    {
+        // Arrange
+        var id = Guid.NewGuid();
+
+        // Act
+        bool actual = _cut.Remove(id);
+
+        // Assert
+        actual.Should().BeFalse();
+    }
+
+    [Fact]
+    public void RemoveContract_ReturnTrue_WhenContractExists()
+    {
+        // Arrange
+        Guid id = _cut.All.First().Id;
+
+        // Act
+        bool actual = _cut.Remove(id);
+
+        // Assert
+        actual.Should().BeTrue();
+    }
+}

tests/Presentation.Tests/Client/Pages/Admin/ContractListItemTests.cs

@@ -1,4 +1,5 @@
 using Client.Pages.Admin;
+using Domain.Contracts;
 
 namespace Presentation.Tests.Client.Pages.Admin;
 
@@ -21,15 +22,16 @@ public void ContractListItem_ContainsTitle()
     {
         // Arrange
         const string name = "SJ";
+        var contract = new Contract() { Name = name };
 
-        static void ParameterBuilder(ComponentParameterCollectionBuilder<ContractListItem> parameters) =>
-            parameters.Add(property => property.Name, name);
+        void ParameterBuilder(ComponentParameterCollectionBuilder<ContractListItem> parameters) =>
+            parameters.Add(property => property.Contract, contract);
 
         // Act
         IRenderedComponent<ContractListItem> cut =
             _context.RenderComponent<ContractListItem>(ParameterBuilder);
 
         // Assert
-        cut.Find($"#{name}").TextContent.Should().Contain(name);
+        cut.Find($"#{contract.Name}").TextContent.Should().Contain(name);
     }
 }

tests/Presentation.Tests/Client/Pages/Admin/ContractListTests.cs

@@ -8,6 +8,7 @@
 using Client.Pages.Admin;
 
 using Domain.Contracts;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Presentation.Tests.Client.Pages.Admin;
 
@@ -58,4 +59,27 @@ public void AddingContract_DoesNotThrow_BeforeContractsAreFetched()
         // Assert
         add.Should().NotThrow();
     }
+
+    [Fact]
+    public async Task RemovingContract_RendersWithoutTheContractAsync()
+    {
+        // Arrange
+        var firstContract = new Contract() { Name = "first", };
+        Contract[] contracts = { firstContract, new Contract() { Name = "Second", }, };
+        MockHttp.When("/api/v1/Contracts/All").RespondJson(contracts);
+        MockHttp.When(HttpMethod.Delete, $"/api/v1/Contracts/{firstContract.Id}").Respond(req => new HttpResponseMessage(HttpStatusCode.OK));
+
+        IRenderedComponent<ContractList> cut = Context.RenderComponent<ContractList>();
+        const string removeButton = ".btn.btn-danger";
+        cut.WaitForElement(removeButton);
+
+        // Act
+        await cut.Find(removeButton).ClickAsync(new MouseEventArgs()).ConfigureAwait(false);
+        cut.WaitForState(() => cut.FindAll(removeButton).Count == 1);
+
+        // Assert
+        Expression<Func<IElement, bool>>
+            elementWithNewName = contract => contract.TextContent.Contains(firstContract.Name);
+        cut.FindAll(".list-group-item").Should().NotContain(elementWithNewName);
+    }
 }

tests/Presentation.Tests/Server/Controllers/ContractsControllerTests.cs

@@ -1,6 +1,7 @@
 using Application.Contracts;
 
 using Domain.Contracts;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Presentation.Tests.Server.Controllers;
 
@@ -28,4 +29,46 @@ public void Get_AllContracts()
         // Assert
         actualWeather.Should().BeEquivalentTo(fakeContracts);
     }
+
+    [Fact]
+    public void Remove_ReturnsOk_WhenIDExists()
+    {
+        // Arrange
+        var id = Guid.NewGuid();
+        _mockContracts.Setup(service => service.Remove(id)).Returns(true);
+
+        // Act
+        IActionResult actual = _cut.Remove(id);
+
+        // Assert
+        actual.Should().BeOfType<OkResult>();
+    }
+
+    [Fact]
+    public void Remove_CallsContractService_WhenIDExists()
+    {
+        // Arrange
+        var id = Guid.NewGuid();
+        _mockContracts.Setup(service => service.Remove(id)).Returns(true);
+
+        // Act
+        IActionResult actual = _cut.Remove(id);
+
+        // Assert
+        _mockContracts.Verify(o => o.Remove(id), Times.Once);
+    }
+
+    [Fact]
+    public void Remove_ReturnsNotFound_WhenIDDoesNotExist()
+    {
+        // Arrange
+        var id = Guid.NewGuid();
+        _mockContracts.Setup(service => service.Remove(id)).Returns(false);
+
+        // Act
+        IActionResult actual = _cut.Remove(id);
+
+        // Assert
+        actual.Should().BeOfType<NotFoundResult>();
+    }
 }