Feature/JA-122 AdSearchForm component

Tests/TutorLizard.Web.Tests/Models/AdSearchCriteriaViewModelTests.cs → Tests/TutorLizard.Blazor.Tests/Models/AdSearchCriteriaViewModelTests.cs

@@ -1,4 +1,4 @@
-using TutorLizard.Web.Models;
+using TutorLizard.Blazor.Models;
 
 namespace TutorLizard.Web.Tests.Models;
 public class AdSearchCriteriaViewModelTests

Tests/TutorLizard.Blazor.Tests/TutorLizard.Blazor.Tests.csproj

@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net8.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+
+ <IsPackable>false</IsPackable>
+ <IsTestProject>true</IsTestProject>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="AutoFixture" Version="4.18.1" />
+ <PackageReference Include="coverlet.collector" Version="6.0.2">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ </PackageReference>
+ <PackageReference Include="FluentAssertions" Version="6.12.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.5" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+ <PackageReference Include="Moq" Version="4.20.70" />
+ <PackageReference Include="xunit" Version="2.8.0" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ </PackageReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\TutorLizard.Blazor\TutorLizard.Blazor.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Using Include="Xunit" />
+ </ItemGroup>
+
+</Project>

Tests/TutorLizard.Web.Tests/Controllers/Browse/BrowseControllerSearchTests.cs

@@ -1,6 +1,7 @@
 using AutoFixture;
 using Microsoft.AspNetCore.Mvc;
-using TutorLizard.Web.Models;
+using TutorLizard.Blazor.Extensions;
+using TutorLizard.Blazor.Models;
 using TutorLizard.Web.Extensions;
 
 namespace TutorLizard.Web.Tests.Controllers.Browse;
@@ -11,10 +12,11 @@ public void Search_WhenCalled_ShouldCorrectlyRedirectToAdsAction()
  {
  // Arrange
  AdSearchCriteriaViewModel searchCriteria = Fixture.Create<AdSearchCriteriaViewModel>();
+ string searchJson = searchCriteria.Serialize();
  string expectedSearchString = searchCriteria.ToDto().ToBase64String();
 
  // Act
- var result = BrowseController.Search(searchCriteria);
+ var result = BrowseController.Search(searchJson);
 
  // Assert
  Assert.IsType<RedirectToActionResult>(result);

Tests/TutorLizard.Web.Tests/Extensions/AdSearchCriteriaDtoExtensionsTests.cs

@@ -1,7 +1,7 @@
 using AutoFixture;
+using TutorLizard.Blazor.Models;
 using TutorLizard.Shared.Models.DTOs;
 using TutorLizard.Web.Extensions;
-using TutorLizard.Web.Models;
 
 namespace TutorLizard.Web.Tests.Extensions;
 public class AdSearchCriteriaDtoExtensionsTests

Tests/TutorLizard.Web.Tests/TutorLizard.Web.Tests.csproj

@@ -33,4 +33,8 @@
  <Using Include="Xunit" />
  </ItemGroup>
 
+ <ItemGroup>
+ <Folder Include="Models\" />
+ </ItemGroup>
+
 </Project>

TutorLizard.Blazor/Components/AdSearchForm.razor

@@ -0,0 +1,109 @@
+@using TutorLizard.Blazor.Extensions
+@using TutorLizard.Blazor.Models
+@using TutorLizard.Shared.Models.DTOs
+
+<div>
+ <div class="d-flex flex-row">
+ <div class="align-content-center p-2">
+ <InputCheckbox @bind-Value="searchCriteria.SearchByText"
+ class="form-check-input" />
+ </div>
+ <div class="form-group w-100 p-2 align-content-center">
+ <label class="control-label">Tytuł / Przedmiot / Opis:</label>
+ <InputText @bind-Value="searchCriteria.Text"
+ class="form-control form-control-sm"
+ disabled="@(!searchCriteria.SearchByText)" />
+ </div>
+ </div>
+ <div class="d-flex flex-row">
+ <div class="align-content-center p-2">
+ <InputCheckbox @bind-Value="searchCriteria.SearchByPriceMin"
+ class="form-check-input" />
+ </div>
+ <div class="form-group w-100 p-2 align-content-center">
+ <label class="control-label">Cena od:</label>
+ <InputNumber @bind-Value="searchCriteria.PriceMin"
+ class="form-control form-control-sm"
+ disabled="@(!searchCriteria.SearchByPriceMin)" />
+ </div>
+
+ <div class="align-content-center p-2">
+ <InputCheckbox @bind-Value="searchCriteria.SearchByPriceMax"
+ class="form-check-input" />
+ </div>
+ <div class="form-group w-100 p-2 align-content-center">
+ <label class="control-label">Cena do:</label>
+ <InputNumber @bind-Value="searchCriteria.PriceMax"
+ class="form-control form-control-sm"
+ disabled="@(!searchCriteria.SearchByPriceMax)" />
+ </div>
+ </div>
+ <div class="d-flex flex-row">
+ <div class="align-content-center p-2">
+ <InputCheckbox @bind-Value="searchCriteria.SearchByLocation"
+ class="form-check-input" />
+ </div>
+ <div class="form-group w-100 p-2 align-content-center">
+ <label class="control-label">Lokalizacja:</label>
+ <InputText @bind-Value="searchCriteria.Location"
+ class="form-control form-control-sm"
+ disabled="@(!searchCriteria.SearchByLocation)" />
+ </div>
+ </div>
+ <div class="d-flex flex-row">
+ <div class="align-content-center p-2">
+ <InputCheckbox @bind-Value="searchCriteria.SearchByCategoryId"
+ class="form-check-input" />
+ </div>
+ <div class="form-group w-100 p-2 align-content-center">
+ <label class="control-label">Kategoria:</label>
+ <InputSelect @bind-Value="searchCriteria.CategoryId"
+ class="form-select"
+ disabled="@(!searchCriteria.SearchByCategoryId)">
+ @foreach (CategoryDto category in categories)
+ {
+ <option value="@category.Id">@category.Name</option>
+ }
+ </InputSelect>
+ </div>
+
+ <div class="align-content-center p-2">
+ <InputCheckbox @bind-Value="searchCriteria.SearchByIsRemote"
+ class="form-check-input" />
+ </div>
+ <div class="form-group w-100 p-2 align-content-center">
+ <InputCheckbox @bind-Value="searchCriteria.IsRemote"
+ class="form-check-input"
+ disabled="@(!searchCriteria.SearchByIsRemote)" />
+ <label class="control-label">Nauczanie zdalne</label>
+ </div>
+ <input type="hidden" value="@searchOutputJson" name="searchCriteria" />
+ </div>
+</div>
+
+
+ @code {
+ [Parameter, EditorRequired]
+ public string? SearchCriteriaJson { get; set; }
+ [Parameter, EditorRequired]
+ public string? CategoriesJson { get; set; }
+
+ private AdSearchCriteriaViewModel searchCriteria = new();
+ private List<CategoryDto> categories = [];
+
+ private string searchOutputJson => searchCriteria.Serialize();
+
+ protected override void OnParametersSet()
+ {
+ base.OnParametersSet();
+
+ if (String.IsNullOrWhiteSpace(SearchCriteriaJson) == false)
+ {
+ searchCriteria = SearchCriteriaJson.DeserializeAdSearchCriteriaViewModel() ?? new();
+ }
+ if (String.IsNullOrWhiteSpace(CategoriesJson) == false)
+ {
+ categories = CategoriesJson.DeserializeCategories() ?? [];
+ }
+ }
+}

TutorLizard.Blazor/Extensions/AdSearchCriteriaExtensions.cs

@@ -0,0 +1,17 @@
+using System.Text.Json;
+using TutorLizard.Blazor.Models;
+
+namespace TutorLizard.Blazor.Extensions;
+
+public static class AdSearchCriteriaExtensions
+{
+ public static string Serialize(this AdSearchCriteriaViewModel searchCriteria)
+ {
+ return JsonSerializer.Serialize(searchCriteria);
+ }
+
+ public static AdSearchCriteriaViewModel? DeserializeAdSearchCriteriaViewModel(this string json)
+ {
+ return JsonSerializer.Deserialize<AdSearchCriteriaViewModel>(json);
+ }
+}

TutorLizard.Blazor/Extensions/CategoriesExtensions.cs

@@ -0,0 +1,17 @@
+using System.Text.Json;
+using TutorLizard.Shared.Models.DTOs;
+
+namespace TutorLizard.Blazor.Extensions;
+
+public static class CategoriesExtensions
+{
+ public static string Serialize(this IEnumerable<CategoryDto> categories)
+ {
+ return JsonSerializer.Serialize(categories);
+ }
+
+ public static List<CategoryDto> DeserializeCategories(this string json)
+ {
+ return JsonSerializer.Deserialize<List<CategoryDto>>(json) ?? [];
+ }
+}

TutorLizard.Web/Models/AdSearchCriteriaViewModel.cs → TutorLizard.Blazor/Models/AdSearchCriteriaViewModel.cs

@@ -1,4 +1,4 @@
-namespace TutorLizard.Web.Models;
+namespace TutorLizard.Blazor.Models;
 public class AdSearchCriteriaViewModel
 {
  public bool SearchByText { get; set; }

TutorLizard.Web/Controllers/BrowseController.cs

@@ -1,13 +1,13 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
 using TutorLizard.BusinessLogic.Interfaces.Services;
 using TutorLizard.Shared.Models.DTOs;
 using TutorLizard.Shared.Models.DTOs.Requests;
 using TutorLizard.Shared.Models.DTOs.Responses;
 using TutorLizard.Web.Interfaces.Services;
-using TutorLizard.Web.Models;
+using TutorLizard.Blazor.Models;
 using TutorLizard.Web.Extensions;
+using TutorLizard.Blazor.Extensions;
 
 namespace TutorLizard.Web.Controllers;
 public class BrowseController : Controller
@@ -59,9 +59,10 @@ public async Task<IActionResult> Ads(int id = 1, [FromQuery] string? search = ""
  }
 
  [HttpPost]
- public IActionResult Search([FromForm] AdSearchCriteriaViewModel searchCriteria)
+ public IActionResult Search([FromForm] string searchCriteria)
  {
- string search = searchCriteria.ToDto().ToBase64String();
+ var model = searchCriteria.DeserializeAdSearchCriteriaViewModel();
+ string search = model?.ToDto().ToBase64String() ?? "";
 
  return RedirectToAction(nameof(Ads), "Browse", new { search });
  }
@@ -114,8 +115,6 @@ private async Task AddCategoriesToViewBag()
  GetCategoriesRequest request = new();
  GetCategoriesResponse response = await _categoryService.GetCategories(request);
 
- ViewBag.Categories = new SelectList(items: response.Categories,
- dataValueField: nameof(CategoryDto.Id),
- dataTextField: nameof(CategoryDto.Name));
+ ViewBag.Categories = response.Categories;
  }
 }

TutorLizard.Web/Extensions/AdSearchCriteriaDtoExtensions.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using TutorLizard.Blazor.Models;
 using TutorLizard.Shared.Models.DTOs;
-using TutorLizard.Web.Models;
 
 namespace TutorLizard.Web.Extensions;
 

TutorLizard.Web/Views/Browse/Ads.cshtml

@@ -1,18 +1,29 @@
 @using TutorLizard.Web.Extensions
+@using TutorLizard.Blazor.Extensions
 @model GetBrowseAdsPageResponse
 
 @{
  ViewData["Title"] = "Ogłoszenia";
+ List<CategoryDto> categories = [];
+ if (ViewBag.Categories is not null)
+ {
+ categories = ViewBag.Categories;
+ }
 }
 
 <h1>Ogłoszenia</h1>
 
 <form asp-action="Search" method="post" class="d-flex flex-column p-2 border">
  <h2 class="text-center">Wyszukiwanie ogłoszeń</h2>
- <partial name="@PartialNames.AdSearchCriteria" model="Model.SearchCriteria.ToViewModel()"/>
+ <component type="typeof(AdSearchForm)"
+ render-mode="WebAssemblyPrerendered"
+ param-SearchCriteriaJson="Model.SearchCriteria.ToViewModel().Serialize()"
+ param-CategoriesJson="@categories.Serialize()" />
  <button type="submit" class="btn btn-primary m-2">Wyszukaj</button>
 </form>
 
+
+
 @if (Model.SearchCriteria.AnySearch)
 {
  <div class="p-2">Liczba wyników wyszukiwania: @Model.TotalAds</div>

TutorLizard.Web/Views/Shared/_Layout.cshtml

@@ -16,6 +16,7 @@
  <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
  <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
  <link rel="stylesheet" href="~/TutorLizard.Web.styles.css" asp-append-version="true" />
+ <base href="~/" />
 </head>
 <body>
  <header>

TutorLizard.Web/Views/_ViewImports.cshtml

@@ -8,4 +8,5 @@
 @using TutorLizard.Shared.Models.DTOs.Responses
 @using TutorLizard.Shared.Models.DTOs.Requests
 @using TutorLizard.Blazor.Components
+@using TutorLizard.Blazor.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers