87 show personalized favorites

src/Application/Contracts/ContractService.cs

@@ -74,12 +74,6 @@ public IEnumerable<ContractPreviewDto> SearchUnauthorized(string query)
         return ConvertToPreviews(results);
     }
 
-    /// <inheritdoc />
-    public IEnumerable<Contract> FetchFavorites()
-    {
-        return _repo.Favorites;
-    }
-
     /// <inheritdoc />
     public void UpdateContract(Contract contract)
     {

src/Application/Contracts/IContractRepository.cs

@@ -18,12 +18,6 @@ public interface IContractRepository
     /// </summary>
     IEnumerable<Contract> Recent { get; }
 
-    /// <summary>
-    /// Gets all contracts marked as favorites.
-    /// </summary>
-    /// <returns>The contract with a favorite mark.</returns>
-    IEnumerable<Contract> Favorites { get; }
-
     /// <summary>
     /// Adds a new contract to store.
     /// </summary>

src/Application/Contracts/IContractService.cs

@@ -38,12 +38,6 @@ public interface IContractService
     /// <returns>Whether the removal was successful.</returns>
     bool Remove(Guid id);
 
-    /// <summary>
-    /// Gets contracts marked as favorites.
-    /// </summary>
-    /// <returns>All favorite marked contracts.</returns>
-    IEnumerable<Contract> FetchFavorites();
-
     /// <summary>
     /// Updates the contract in the repository.
     /// </summary>

src/Application/Favorites/FavoriteContractService.cs

@@ -0,0 +1,42 @@
+using Domain.Contracts;
+
+namespace Application.FavoriteContracts;
+
+/// <inheritdoc />
+public class FavoriteContractService : IFavoriteContractService
+{
+    private readonly IFavoriteContractRepository _repo;
+
+    /// <summary>
+    /// Constructs favorite service.
+    /// </summary>
+    /// <param name="repo">Where to store and fetch favorites from.</param>
+    public FavoriteContractService(IFavoriteContractRepository repo)
+    {
+        _repo = repo;
+    }
+
+    /// <inheritdoc />
+    public void Add(string userName, Guid contractId)
+    {
+        _repo.Add(userName, contractId);
+    }
+
+    /// <inheritdoc />
+    public bool CheckIfFavorite(string userName, Guid contractId)
+    {
+        return _repo.CheckIfFavorite(userName, contractId);
+    }
+
+    /// <inheritdoc/>
+    public IEnumerable<Contract> FetchAllFavorites(string userName)
+    {
+        return _repo.FetchAllFavorites(userName);
+    }
+
+    /// <inheritdoc/>
+    public bool Remove(string userName, Guid contractId)
+    {
+        return _repo.Remove(userName, contractId);
+    }
+}

src/Application/Favorites/IFavoriteContractRepository.cs

@@ -0,0 +1,39 @@
+using Domain.Contracts;
+
+namespace Application.FavoriteContracts;
+
+/// <summary>
+/// Logic for fetching and storing favorites.
+/// </summary>
+public interface IFavoriteContractRepository
+{
+    /// <summary>
+    /// Checks if the contract is marked as favorite by the user.
+    /// </summary>
+    /// <param name="userName">The name of the user.</param>
+    /// <param name="contractId">The id of the contract.</param>
+    /// <returns>Whether the contract was marked as favorite.</returns>
+    bool CheckIfFavorite(string userName, Guid contractId);
+
+    /// <summary>
+    /// Fetches all contracts marked as favorite by a certain user.
+    /// </summary>
+    /// <param name="userName">The name of the user.</param>
+    /// <returns>All contracts marked as favorite by the user.</returns>
+    IEnumerable<Contract> FetchAllFavorites(string userName);
+
+    /// <summary>
+    /// Adds a favorite contract to store, for a certain user.
+    /// </summary>
+    /// <param name="userName">The name of the user.</param>
+    /// <param name="contractId">The id of the contract.</param>
+    void Add(string userName, Guid contractId);
+
+    /// <summary>
+    /// Removes a stored favorite contract, for a certain user.
+    /// </summary>
+    /// <param name="userName">The name of the user.</param>
+    /// <param name="contractId">The id of the contract.</param>
+    /// <returns>If the removal was successful.</returns>
+    bool Remove(string userName, Guid contractId);
+}

src/Application/Favorites/IFavoriteContractService.cs

@@ -0,0 +1,39 @@
+using Domain.Contracts;
+
+namespace Application.FavoriteContracts;
+
+/// <summary>
+/// Used for interacting with favorite logic.
+/// </summary>
+public interface IFavoriteContractService
+{
+    /// <summary>
+    /// Gets all contracts marked as favorite by a certain user.
+    /// </summary>
+    /// <param name="userName">The name of the user.</param>
+    /// <returns>All contracts marked as favorite by the user.</returns>
+    IEnumerable<Contract> FetchAllFavorites(string userName);
+
+    /// <summary>
+    /// Checks if the contract is marked as favorite by the user.
+    /// </summary>
+    /// <param name="userName">The name of the user.</param>
+    /// <param name="contractId">The id of the contract.</param>
+    /// <returns>Whether the contract was marked as favorite.</returns>
+    bool CheckIfFavorite(string userName, Guid contractId);
+
+    /// <summary>
+    /// Adds a favorite contract for a certain user.
+    /// </summary>
+    /// <param name="userName">The name of the user.</param>
+    /// <param name="contractId">The id of the contract.</param>
+    void Add(string userName, Guid contractId);
+
+    /// <summary>
+    /// Removes a favorite contract for a certain user.
+    /// </summary>
+    /// <param name="userName">The name of the user.</param>
+    /// <param name="contractId">The id of the contract.</param>
+    /// <returns>Whether the removal was successful.</returns>
+    bool Remove(string userName, Guid contractId);
+}

src/Application/InjectionExtensions.cs

@@ -1,4 +1,5 @@
 using Application.Contracts;
+using Application.FavoriteContracts;
 using Application.Search;
 using Application.StatusUpdates;
 using Application.Users;
@@ -19,6 +20,7 @@ public static class InjectionExtensions
     public static IServiceCollection AddApplication(this IServiceCollection services)
     {
         return services.AddTransient<IContractService, ContractService>()
+                       .AddTransient<IFavoriteContractService, FavoriteContractService>()
                        .AddTransient<IStatusUpdateService, NotificationService>()
                        .AddTransient<IUserService, UserService>()
                        .AddScoped(typeof(SearchEngine<>))

src/Application/MessagePassing/SetFavoriteContract.cs

@@ -0,0 +1,22 @@
+namespace Application.MessagePassing;
+
+/// <summary>
+/// Used to send information about making a Contract a users favorite.
+/// </summary>
+public class SetFavoriteContract
+{
+    /// <summary>
+    ///     Gets the id of the user.
+    /// </summary>
+    public string UserName { get; init; } = string.Empty;
+
+    /// <summary>
+    ///     Gets the id of the contract.
+    /// </summary>
+    public Guid ContractId { get; init; }
+
+    /// <summary>
+    ///     Gets a value indicating whether gets if the Contract should be a favorite or not.
+    /// </summary>
+    public bool IsFavorite { get; init; }
+}

src/Client/Pages/Contracts/ContractCard.razor

@@ -10,7 +10,7 @@
     <img id="contract-thumbnail" src="@Contract.SupplierLogoImagePath" class="img-thumbnail img-fluid" data-bs-toggle="modal" data-bs-target="#@("id_" + Contract.Id)" @onclick="AddToRecentlyViewed"/>
     <div class="card-body d-flex bd-highlight mb-3 d-flex align-items-center">
         <h3 class="p-2 bd-highlight flex-grow-1" id="contract-name">@Contract.Name</h3>
-        <FavoriteButton @ref="_favoriteButton" Contract="@Contract" OnFavoriteChange="@FavoriteChange"></FavoriteButton>
+        <FavoriteButton @ref="_favoriteButton" Contract="@Contract" OnFavoriteChange="@((args)=> FavoriteChange(((Guid, bool))args))"></FavoriteButton>
     </div>
 
 </div>
@@ -37,7 +37,7 @@
     /// Called when a contract has its favorite status changed.
     /// </summary>
     [Parameter]
-    public EventCallback<Contract> OnFavoriteChange { get; set; } = EventCallback<Contract>.Empty;
+    public EventCallback<(Guid, bool)> OnFavoriteChange { get; set; } = EventCallback<(Guid, bool)>.Empty;
 
     private async Task AddToRecentlyViewed()
     {
@@ -48,10 +48,9 @@
         }
     }
 
-    private async Task FavoriteChange(Contract contract)
+    private async Task FavoriteChange((Guid Id, bool IsFavorite)args)
     {
-        Contract = contract;
-        await OnFavoriteChange.InvokeAsync(contract);
+        await OnFavoriteChange.InvokeAsync(args);
     }
 
 }

src/Client/Pages/Contracts/FavoriteButton.razor

@@ -1,11 +1,12 @@
-@using Microsoft.AspNetCore.JsonPatch
+@using Application.MessagePassing
+@using Microsoft.AspNetCore.JsonPatch
 @using Newtonsoft.Json
 @using Domain.Contracts
 @using System.Text
 @inject HttpClient _http
 
-<button class="btn ms-auto p-2 flex-shrink-0" @onclick="ChangeFavorite">
-    @if (Contract.IsFavorite)
+<button class="btn ms-auto p-2 flex-shrink-0" id="Favorite-button" @onclick="ChangeFavorite">
+    @if (isFavorite)
     {
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-heart-fill" viewBox="0 0 16 16">
             <path fill-rule="evenodd" d="M8 1.314C12.438-3.248 23.534 4.735 8 15-7.534 4.736 3.562-3.248 8 1.314z"/>
@@ -31,23 +32,44 @@
     /// Called when a contract has its favorite status changed.
     /// </summary>
     [Parameter]
-    public EventCallback<Contract> OnFavoriteChange { get; set; } = EventCallback<Contract>.Empty;
+    public EventCallback<(Guid, bool)> OnFavoriteChange { get; set; } = EventCallback<(Guid, bool)>.Empty;
+
+    /// <summary>
+    /// The name of the currently logged in user.
+    /// </summary>
+    [CascadingParameter(Name = nameof(LoggedInUser))]
+    public string? LoggedInUser { get; set; }
+
+    /// <summary>
+    /// Whether the contract is marked as favorite.
+    /// </summary>
+    private bool isFavorite { get; set; }
+
+    protected override async void OnInitialized()
+    {
+        HttpResponseMessage response = await _http.GetAsync($"/api/v1/favorites/{LoggedInUser}/{Contract.Id}");
+        if (response.IsSuccessStatusCode)
+        {
+            isFavorite = true;
+        }
+        else
+        {
+            isFavorite = false;
+        }
+        await InvokeAsync(StateHasChanged);
+        base.OnInitialized();
+    }
 
     private async Task ChangeFavorite()
     {
-        var patchDocument = new JsonPatchDocument<Contract>();
-        patchDocument.Replace(contract => contract.IsFavorite, !Contract.IsFavorite);
-        var serializedDocument = JsonConvert.SerializeObject(patchDocument);
-        var content = new StringContent(serializedDocument, Encoding.UTF8, "application/json-patch+json");
+        SetFavoriteContract setFavorite = new() { UserName = LoggedInUser!, ContractId = Contract.Id, IsFavorite = !isFavorite };
 
-        var response = await _http.PatchAsync($"/api/v1/Contracts/{Contract.Id}", content);
+        HttpResponseMessage response = await _http.PostAsJsonAsync($"/api/v1/favorites", setFavorite);
         if (response.IsSuccessStatusCode)
         {
-            var contract = await response.Content.ReadFromJsonAsync<Contract>();
-            if (contract != null) Contract = contract;
+            isFavorite = !isFavorite;
             await InvokeAsync(StateHasChanged);
-            await OnFavoriteChange.InvokeAsync(Contract);
+            await OnFavoriteChange.InvokeAsync((Contract.Id, isFavorite));
         }
     }
-
 }

src/Client/Pages/Dashboard/FavoriteCards.razor

@@ -6,7 +6,7 @@
     <h3>Favoriter</h3>
     <FetchData @ref="_dataFetcher"
                TData="List<Contract>"
-               Url="/api/v1/Contracts/favorites"
+               Url=@($"/api/v1/favorites/{LoggedInUser}")
                Context="contracts">
         @{
             var contractsList = contracts.ToList();
@@ -16,7 +16,7 @@
             <div id="favorite-cards-container" class="d-flex flex-row justify-content-around flex-wrap">
                 @foreach (var contract in contractsList)
                 {
-                    <ContractCard Contract=@contract OnFavoriteChange="OnFavoriteChange"/>
+                    <ContractCard Contract=@contract OnFavoriteChange="@((args)=> OnFavoriteChange(((Guid, bool))args))"/>
                 }
             </div>
         }
@@ -34,10 +34,16 @@
 @code {
     private FetchData<List<Contract>> _dataFetcher = null!;
 
-    private async Task OnFavoriteChange(Contract contract)
+    /// <summary>
+    /// The name of the currently logged in user.
+    /// </summary>
+    [CascadingParameter(Name = nameof(LoggedInUser))]
+    public string? LoggedInUser { get; set; }
+
+    private async Task OnFavoriteChange((Guid Id, bool IsFavorite)args)
     {
-        if (contract.IsFavorite) return;
-        _dataFetcher.Data?.RemoveAll(other => other.Id == contract.Id);
+        if (args.IsFavorite) return;
+        _dataFetcher.Data?.RemoveAll(other => other.Id == args.Id);
         await InvokeAsync(StateHasChanged);
     }
 

src/Domain/Contracts/Contract.cs

@@ -1,4 +1,6 @@
-namespace Domain.Contracts;
+using Domain.Users;
+
+namespace Domain.Contracts;
 
 /// <summary>
 ///     A document containing negotiated discounts and benefits.
@@ -10,11 +12,6 @@ public class Contract
     /// </summary>
     public Guid Id { get; init; } = Guid.NewGuid();
 
-    /// <summary>
-    /// Gets or sets a value indicating whether the contract is a favorite or not.
-    /// </summary>
-    public bool IsFavorite { get; set; }
-
     /// <summary>
     ///     Gets or sets the name of the contract.
     /// </summary>
@@ -69,4 +66,11 @@ public class Contract
     ///     Gets or sets the contact information for the supplier.
     /// </summary>
     public string SupplierContactInfo { get; set; } = "Kontaktinformation till leverantör saknas.";
+
+    /// <summary>
+    /// Gets or sets users that has marked this as favorite.
+    /// </summary>
+#pragma warning disable CA2227 // Collection properties should be read only
+    public ICollection<User> Users { get; set; } = new List<User>();
+#pragma warning restore CA2227 // Collection properties should be read only
 }

src/Domain/Users/User.cs

@@ -1,3 +1,5 @@
+using Domain.Contracts;
+
 namespace Domain.Users;
 
 /// <summary>
@@ -34,4 +36,9 @@ public class User
     /// Gets or sets the date of the latest payment by the user. It is set to 1/1/0001 12:00:00 AM by default.
     /// </summary>
     public DateTime LatestPaymentDate { get; set; } = DateTime.MinValue;
+
+    /// <summary>
+    /// Gets favorite contracts.
+    /// </summary>
+    public ICollection<Contract> Contracts { get; init; } = new List<Contract>();
 }

src/Infrastructure/Databases/EFContractRepository.cs

@@ -37,9 +37,6 @@ public EFContractRepository(EFDatabaseContext context, ILogger<EFContractReposit
     /// <inheritdoc />
     public IEnumerable<Contract> Recent => _recent.FetchRecentContracts();
 
-    /// <inheritdoc />
-    public IEnumerable<Contract> Favorites => Contracts.Where(contract => contract.IsFavorite);
-
     private DbSet<Contract> Contracts => _context.Contracts;
 
     /// <inheritdoc />