root/Wonky.Client
root/Wonky.Client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FIX: custom query helper function - replace deprecated WebUtilities

Browse source
This commit is contained in:
Frede Hundewadt 2023-06-15 09:05:59 +02:00
parent 671d8ce399
commit 79ec577930
4 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs
View file

@ -14,11 +14,12 @@
//
using System.Net.Http.Json;
using System.Text;
using System.Text.Json;
using Wonky.Client.Features;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.Options;
using Wonky.Client.Helpers;
using Wonky.Entity.Configuration;
using Wonky.Entity.DTO;
using Wonky.Entity.Requests;
@ -57,7 +58,7 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository
/// <returns>A paged response defined by pagingParameters</returns>
public async Task<PagingResponse<CompanyDto>> GetCompanies(CustomerPaging pagingParameters)
{
var queryString = new Dictionary<string, string>
var queryDictionary = new Dictionary<string, string>
{
["pageNumber"] = pagingParameters.PageNumber.ToString(),
["pageSize"] = pagingParameters.PageSize.ToString(),
@ -67,7 +68,8 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository
["isHidden"] = pagingParameters.IsHidden.ToString(),
["hasFolded"] = pagingParameters.HasFolded.ToString()
};
var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_conf.CrmCustomers}/page", queryString));
var endpoint = WebUtils.QueryHelper($"{_conf.CrmCustomers}/page", queryDictionary);
var response = await _client.GetAsync(endpoint);
if (!response.IsSuccessStatusCode)
{

10
Wonky.Client/HttpRepository/CountryCatalogRepository.cs
View file

@ -14,11 +14,12 @@
//
using System.Net.Http.Json;
using System.Text;
using System.Text.Json;
using Wonky.Client.Features;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.Options;
using Wonky.Client.Helpers;
using Wonky.Entity.Configuration;
using Wonky.Entity.Requests;
using Wonky.Entity.Views;
@ -55,7 +56,7 @@ public class CountryCatalogRepository : ICountryCatalogRepository
/// <returns></returns>
public async Task<PagingResponse<SalesItemView>> GetSalesItemsPaged(string countryCode, CatalogPager pager)
{
var queryString = new Dictionary<string, string>
var queryDictionary = new Dictionary<string, string>
{
["pageNumber"] = pager.PageNumber.ToString(),
["pageSize"] = pager.PageSize.ToString(),
@ -64,9 +65,10 @@ public class CountryCatalogRepository : ICountryCatalogRepository
["searchTerm"] = pager.SearchTerm,
["selectGroup"] = pager.SelectGroup == "0" ? "" : pager.SelectGroup
};
var response = await _client
.GetAsync(QueryHelpers.AddQueryString($"{_api.Catalog}/{countryCode}/page", queryString));
var endpoint = WebUtils.QueryHelper($"{_api.Catalog}/{countryCode}/page", queryDictionary);
var response = await _client.GetAsync(endpoint);
if (!response.IsSuccessStatusCode)
{
return new PagingResponse<SalesItemView>

15
Wonky.Client/HttpRepository/CountryCustomerRepository.cs
View file

@ -17,8 +17,8 @@ using System.Net.Http.Json;
using System.Text.Json;
using Wonky.Client.Features;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.Options;
using Wonky.Client.Helpers;
using Wonky.Entity.Configuration;
using Wonky.Entity.DTO;
using Wonky.Entity.Requests;
@ -58,7 +58,7 @@ public class CountryCustomerRepository : ICountryCustomerRepository
/// <returns></returns>
public async Task<PagingResponse<CompanyDto>> GetCompaniesPaged(string countryCode, CustomerPaging paging)
{
var queryString = new Dictionary<string, string>
var queryDictionary = new Dictionary<string, string>
{
["pageNumber"] = paging.PageNumber.ToString(),
["pageSize"] = paging.PageSize.ToString(),
@ -68,8 +68,10 @@ public class CountryCustomerRepository : ICountryCustomerRepository
["isHidden"] = paging.IsHidden.ToString(),
["hasFolded"] = paging.HasFolded.ToString(),
};
var endpoint = WebUtils.QueryHelper($"{_api.OfficeCustomers}/{countryCode}", queryDictionary);
var response = await _client.GetAsync(endpoint.ToString());
var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_api.OfficeCustomers}/{countryCode}", queryString));
var content = await response.Content.ReadAsStringAsync();
var pagingResponse = new PagingResponse<CompanyDto>
@ -90,7 +92,7 @@ public class CountryCustomerRepository : ICountryCustomerRepository
public async Task<PagingResponse<CompanyDto>> GetCompaniesPaged(string countryCode, string salesRepId,
CustomerPaging paging)
{
var queryString = new Dictionary<string, string>
var queryDictionary = new Dictionary<string, string>
{
["pageNumber"] = paging.PageNumber.ToString(),
["pageSize"] = paging.PageSize.ToString(),
@ -100,8 +102,11 @@ public class CountryCustomerRepository : ICountryCustomerRepository
["isHidden"] = paging.IsHidden.ToString(),
["hasFolded"] = paging.HasFolded.ToString(),
};
var endpoint = WebUtils
.QueryHelper($"{_api.OfficeCustomers}/{countryCode}/salesRep/{salesRepId}/", queryDictionary);
var response = await _client.GetAsync(endpoint);
var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_api.OfficeCustomers}/{countryCode}/salesRep/{salesRepId}/", queryString));
var content = await response.Content.ReadAsStringAsync();
var pagingResponse = new PagingResponse<CompanyDto>
{

30
Wonky.Client/Local.Services/VatInfoLookupService.cs
View file

@ -14,9 +14,11 @@
//
using System.Text;
using System.Text.Json;
using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Primitives;
using Wonky.Client.Helpers;
using Wonky.Entity.Configuration;
using Wonky.Entity.Models;
using Wonky.Entity.Requests;
@ -29,12 +31,14 @@ public class VatInfoLookupService
private readonly HttpClient _client;
private readonly ApiConfig _api;
public VatInfoLookupService(HttpClient client, IOptions<ApiConfig> apiConfig)
{
_client = client;
_api = apiConfig.Value;
}
public async Task<List<VirkRegInfo>> QueryVirkRegistry(VirkParams query)
{
Console.WriteLine(JsonSerializer.Serialize(query));
@ -42,7 +46,7 @@ public class VatInfoLookupService
if(!ValidateCvrQuery(query))
throw new ArgumentException("CvrQuery does not validate");
var queryString = new Dictionary<string, string>
var queryDictionary = new Dictionary<string, string>
{
["vatNumber"] = $"{query.VatNumber}",
["streetName"] = $"{query.StreetName}",
@ -50,8 +54,9 @@ public class VatInfoLookupService
["zipCode"] = $"{query.ZipCode}",
["entityName"] = $"{query.EntityName}"
};
var endpoint = QueryHelpers.AddQueryString(_api.ServicesVatDk, queryString);
var response = await _client.GetAsync(endpoint);
var endpoint = WebUtils.QueryHelper($"{_api.ServicesVatDk}", queryDictionary);
var response = await _client.GetAsync(endpoint.ToString());
var content = await response.Content.ReadAsStringAsync();
Console.WriteLine(content);
@ -71,15 +76,15 @@ public class VatInfoLookupService
return result.Count == 0 ? new List<VirkRegInfo>() : result;
}
public async Task<List<VirkRegInfo>> QueryBrRegistry(string vatNumber)
{
var queryString = new Dictionary<string, string>
var queryDictionary = new Dictionary<string, string>
{
["vatNumber"] = $"{vatNumber}"
};
var endpoint = QueryHelpers.AddQueryString(_api.ServicesVatNo, queryString);
var response = await _client.GetAsync(endpoint);
var endpoint = WebUtils.QueryHelper($"{_api.ServicesVatNo}", queryDictionary);
var response = await _client.GetAsync(endpoint.ToString());
var content = await response.Content.ReadAsStringAsync();
var jsonResult = JsonSerializer.Deserialize<List<VirkRegInfo>>(content, _options);
@ -94,14 +99,16 @@ public class VatInfoLookupService
return result.Count == 0 ? new List<VirkRegInfo>() : result;
}
public async Task<List<VirkRegInfo>> QueryViesRegistry(string vatNumber)
{
var queryString = new Dictionary<string, string>
var queryDictionary = new Dictionary<string, string>
{
["vatNumber"] = $"{vatNumber}"
};
var endpoint = QueryHelpers.AddQueryString(_api.ServicesVatEu, queryString);
var response = await _client.GetAsync(endpoint);
var endpoint = WebUtils.QueryHelper($"{_api.ServicesVatEu}", queryDictionary);
var response = await _client.GetAsync(endpoint.ToString());
var content = await response.Content.ReadAsStringAsync();
var jsonResult = JsonSerializer.Deserialize<List<VirkRegInfo>>(content, _options);
@ -115,6 +122,7 @@ public class VatInfoLookupService
return result.Count == 0 ? new List<VirkRegInfo>() : result;
}
private static bool ValidateCvrQuery(VirkParams query)
{
if (!string.IsNullOrWhiteSpace(query.VatNumber))