Extended search query and added tests

src/Kwtc.Tjek.Client.Abstractions/IClient.cs

@@ -4,5 +4,11 @@ namespace Kwtc.Tjek.Client.Abstractions;
 
 public interface IClient
 {
-    Task<IReadOnlyList<Offer>> Search(string query, CancellationToken cancellationToken = default);
+    public Task<IReadOnlyList<Offer>> Search(
+        string query,
+        string? dealerId = null,
+        string? catalogId = null,
+        string? publicationType = null,
+        int? limit = null,
+        CancellationToken cancellationToken = default);
 }

src/Kwtc.Tjek.Client.Abstractions/Models/Si.cs

@@ -1,8 +1,11 @@
 namespace Kwtc.Tjek.Client.Abstractions.Models;
 
+/// <summary>
+/// System of units
+/// </summary>
 public class Si
 {
     public long Factor { get; set; }
 
-    public long To { get; set; }
+    public long Symbol { get; set; }
 }

src/Kwtc.Tjek.Client/Client.cs

@@ -1,4 +1,5 @@
-using System.Text.Json;
+using System.Text;
+using System.Text.Json;
 using CommunityToolkit.Diagnostics;
 using Kwtc.Tjek.Client.Abstractions;
 using Kwtc.Tjek.Client.Abstractions.Models;
@@ -14,12 +15,30 @@ public Client(IHttpClientFactory httpClientFactory)
         this.httpClientFactory = httpClientFactory;
     }
 
-    public async Task<IReadOnlyList<Offer>> Search(string query, CancellationToken cancellationToken = default)
+    public async Task<IReadOnlyList<Offer>> Search(
+        string query,
+        string? dealerId = null,
+        string? catalogId = null,
+        string? publicationType = null,
+        int? limit = null,
+        CancellationToken cancellationToken = default)
     {
         Guard.IsNotNullOrEmpty(query, nameof(query));
-
+
+        // Build query string
+        var builder = new StringBuilder();
+        builder.Append($"?query={query.ToValidUri()}");
+
+        var queryString = BuildQueryString(new Dictionary<string, string>
+        {
+            { "dealer_id", $"{dealerId}" },
+            { "catalog_id", $"{catalogId}" },
+            { "types", $"{publicationType}" },
+            { "limit", $"{limit}" },
+        }, builder);
+
         var client = this.httpClientFactory.CreateClient(Constants.HttpClientName);
-        var response = await client.GetAsync($"v2/offers/search?query={query.ToValidUri()}", cancellationToken);
+        var response = await client.GetAsync($"v2/offers/search{queryString}", cancellationToken);
 
         response.EnsureSuccessStatusCode();
 
@@ -33,4 +52,19 @@ public async Task<IReadOnlyList<Offer>> Search(string query, CancellationToken c
 
         return result ?? [];
     }
+
+    private static string BuildQueryString(IDictionary<string, string> parameters, StringBuilder builder)
+    {
+        foreach (var parameter in parameters)
+        {
+            if (string.IsNullOrEmpty(parameter.Value))
+            {
+                continue;
+            }
+
+            builder.Append($"&{parameter.Key}={parameter.Value.ToValidUri()}");
+        }
+
+        return builder.ToString();
+    }
 }

src/Kwtc.Tjek.Client/StringExtensions.cs

@@ -5,7 +5,7 @@ public static class StringExtensions
     public static string ToValidUri(this string input)
     {
         var str = input;
-        str = System.Text.RegularExpressions.Regex.Replace(str, @"[^a-zA-Z0-9\s-æøåÆØÅ]", "");
+        str = System.Text.RegularExpressions.Regex.Replace(str, @"[^a-zA-Z0-9\s-æøåÆØÅ?&=]", "");
         str = System.Text.RegularExpressions.Regex.Replace(str, @"\s+", " ").Trim();
 
         return Uri.EscapeDataString(str);

test/Kwtc.Tjek.Client.Tests/UnitTests/ClientTests.cs

@@ -108,6 +108,138 @@ public async Task Search_ValidSearchTermUnexpectedResponseContent_ShouldThrow()
         this.httpClientFactoryMock.Verify(x => x.CreateClient(Constants.HttpClientName), Times.Once);
     }
 
+    [Fact]
+    public async Task Search_ValidSearchTermAndDealerIdExpectedResponse_ShouldSendRequest()
+    {
+        // Arrange
+        const string searchTerm = "ValidSearchTerm";
+        var httpClient = GetMockedClient(
+            uri: $"search?query={searchTerm.ToValidUri()}&dealer_id=123",
+            content: JsonSerializer.Serialize(new List<Offer> { new() })
+        );
+        var sut = GetSut();
+
+        this.httpClientFactoryMock
+            .Setup(x => x.CreateClient(Constants.HttpClientName))
+            .Returns(httpClient);
+
+        // Act
+        await sut.Search(query: searchTerm, dealerId: "123");
+
+        // Assert
+        this.httpClientFactoryMock.Verify(x => x.CreateClient(Constants.HttpClientName), Times.Once);
+    }
+
+    [Fact]
+    public async Task Search_ValidSearchTermAndDealerIdLimitExpectedResponse_ShouldSendRequest()
+    {
+        // Arrange
+        const string searchTerm = "ValidSearchTerm";
+        var httpClient = GetMockedClient(
+            uri: $"search?query={searchTerm.ToValidUri()}&dealer_id=123&limit=10",
+            content: JsonSerializer.Serialize(new List<Offer> { new() })
+        );
+        var sut = GetSut();
+
+        this.httpClientFactoryMock
+            .Setup(x => x.CreateClient(Constants.HttpClientName))
+            .Returns(httpClient);
+
+        // Act
+        await sut.Search(query: searchTerm, dealerId: "123", limit: 10);
+
+        // Assert
+        this.httpClientFactoryMock.Verify(x => x.CreateClient(Constants.HttpClientName), Times.Once);
+    }
+
+    [Fact]
+    public async Task Search_ValidSearchTermAndDealerIdNullExpectedResponse_RequestShouldNotContainDealerId()
+    {
+        // Arrange
+        const string searchTerm = "ValidSearchTerm";
+        var httpClient = GetMockedClient(
+            uri: $"search?query={searchTerm.ToValidUri()}&limit=10",
+            content: JsonSerializer.Serialize(new List<Offer> { new() })
+        );
+        var sut = GetSut();
+
+        this.httpClientFactoryMock
+            .Setup(x => x.CreateClient(Constants.HttpClientName))
+            .Returns(httpClient);
+
+        // Act
+        await sut.Search(query: searchTerm, dealerId: null, limit: 10);
+
+        // Assert
+        this.httpClientFactoryMock.Verify(x => x.CreateClient(Constants.HttpClientName), Times.Once);
+    }
+
+    [Fact]
+    public async Task Search_ValidSearchTermAndCatalogIdExpectedResponse_ShouldSendRequest()
+    {
+        // Arrange
+        const string searchTerm = "ValidSearchTerm";
+        var httpClient = GetMockedClient(
+            uri: $"search?query={searchTerm.ToValidUri()}&catalog_id=123",
+            content: JsonSerializer.Serialize(new List<Offer> { new() })
+        );
+        var sut = GetSut();
+
+        this.httpClientFactoryMock
+            .Setup(x => x.CreateClient(Constants.HttpClientName))
+            .Returns(httpClient);
+
+        // Act
+        await sut.Search(query: searchTerm, catalogId: "123");
+
+        // Assert
+        this.httpClientFactoryMock.Verify(x => x.CreateClient(Constants.HttpClientName), Times.Once);
+    }
+
+    [Fact]
+    public async Task Search_ValidSearchTermAndPublicationTypeExpectedResponse_ShouldSendRequest()
+    {
+        // Arrange
+        const string searchTerm = "ValidSearchTerm";
+        var httpClient = GetMockedClient(
+            uri: $"search?query={searchTerm.ToValidUri()}&types=123",
+            content: JsonSerializer.Serialize(new List<Offer> { new() })
+        );
+        var sut = GetSut();
+
+        this.httpClientFactoryMock
+            .Setup(x => x.CreateClient(Constants.HttpClientName))
+            .Returns(httpClient);
+
+        // Act
+        await sut.Search(query: searchTerm, publicationType: "123");
+
+        // Assert
+        this.httpClientFactoryMock.Verify(x => x.CreateClient(Constants.HttpClientName), Times.Once);
+    }
+
+    [Fact]
+    public async Task Search_ValidSearchTermAndLimitExpectedResponse_ShouldSendRequest()
+    {
+        // Arrange
+        const string searchTerm = "ValidSearchTerm";
+        var httpClient = GetMockedClient(
+            uri: $"search?query={searchTerm.ToValidUri()}&limit=10",
+            content: JsonSerializer.Serialize(new List<Offer> { new() })
+        );
+        var sut = GetSut();
+
+        this.httpClientFactoryMock
+            .Setup(x => x.CreateClient(Constants.HttpClientName))
+            .Returns(httpClient);
+
+        // Act
+        await sut.Search(query: searchTerm, limit: 10);
+
+        // Assert
+        this.httpClientFactoryMock.Verify(x => x.CreateClient(Constants.HttpClientName), Times.Once);
+    }
+
     private static HttpClient GetMockedClient(string uri, HttpStatusCode statusCode = HttpStatusCode.OK, string content = "")
     {
         var httpMessageHandlerMock = new Mock<HttpMessageHandler>();
@@ -116,7 +248,7 @@ private static HttpClient GetMockedClient(string uri, HttpStatusCode statusCode
             .Setup<Task<HttpResponseMessage>>(
                 "SendAsync",
                 ItExpr.Is<HttpRequestMessage>(x =>
-                    x.RequestUri!.AbsoluteUri.EndsWith(uri)
+                    x.RequestUri!.AbsoluteUri.Contains(uri)
                 ),
                 ItExpr.IsAny<CancellationToken>())
             .ReturnsAsync(new HttpResponseMessage