From 30f1e751b770bf730fc48b1baefb00f560694f35 Mon Sep 17 00:00:00 2001 From: dmolinari Date: Sat, 16 Aug 2025 13:30:05 -0300 Subject: [PATCH] Fix 1330 --- .../Services/ElectoralApiService.cs | 39 ++++++------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/Elecciones-Web/src/Elecciones.Infrastructure/Services/ElectoralApiService.cs b/Elecciones-Web/src/Elecciones.Infrastructure/Services/ElectoralApiService.cs index 041794c..eff8d22 100644 --- a/Elecciones-Web/src/Elecciones.Infrastructure/Services/ElectoralApiService.cs +++ b/Elecciones-Web/src/Elecciones.Infrastructure/Services/ElectoralApiService.cs @@ -24,20 +24,14 @@ public class ElectoralApiService : IElectoralApiService var client = _httpClientFactory.CreateClient("ElectoralApiClient"); var username = _configuration["ElectoralApi:Username"]; var password = _configuration["ElectoralApi:Password"]; - if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password)) return null; - - var request = new HttpRequestMessage(HttpMethod.Get, "/api/createtoken/"); // Con la barra final + var request = new HttpRequestMessage(HttpMethod.Get, "/api/createtoken/"); request.Headers.Add("username", username); request.Headers.Add("password", password); - var response = await client.SendAsync(request); if (!response.IsSuccessStatusCode) return null; - var tokenResponse = await response.Content.ReadFromJsonAsync(); - return (tokenResponse is { Success: true, Data.AccessToken: not null }) - ? tokenResponse.Data.AccessToken - : null; + return (tokenResponse is { Success: true, Data.AccessToken: not null }) ? tokenResponse.Data.AccessToken : null; } public async Task GetCatalogoAmbitosAsync(string authToken, int categoriaId) @@ -45,43 +39,34 @@ public class ElectoralApiService : IElectoralApiService var client = _httpClientFactory.CreateClient("ElectoralApiClient"); var request = new HttpRequestMessage(HttpMethod.Get, $"/api/catalogo/getCatalogo?categoriaId={categoriaId}"); request.Headers.Add("Authorization", $"Bearer {authToken}"); - var response = await client.SendAsync(request); - return response.IsSuccessStatusCode - ? await response.Content.ReadFromJsonAsync() - : null; + return response.IsSuccessStatusCode ? await response.Content.ReadFromJsonAsync() : null; } public async Task?> GetAgrupacionesAsync(string authToken, string distritoId, int categoriaId) { var client = _httpClientFactory.CreateClient("ElectoralApiClient"); - var requestUri = $"/api/catalogo/getAgrupaciones?distritold={distritoId}&categoriaId={categoriaId}"; + var requestUri = $"/api/catalogo/getAgrupaciones?distritoId={distritoId}&categoriaId={categoriaId}"; var request = new HttpRequestMessage(HttpMethod.Get, requestUri); request.Headers.Add("Authorization", $"Bearer {authToken}"); - var response = await client.SendAsync(request); - return response.IsSuccessStatusCode - ? await response.Content.ReadFromJsonAsync>() - : null; + return response.IsSuccessStatusCode ? await response.Content.ReadFromJsonAsync>() : null; } public async Task GetResultadosAsync(string authToken, string distritoId, string seccionId, string municipioId) { var client = _httpClientFactory.CreateClient("ElectoralApiClient"); - var requestUri = $"/api/resultados/getResultados?distritold={distritoId}&seccionld={seccionId}&municipiold={municipioId}&categoriaId=5"; // OJO: La categoría aquí está fija, puede necesitar ser dinámica + var requestUri = $"/api/resultados/getResultados?distritoId={distritoId}&seccionId={seccionId}&municipioId={municipioId}&categoriaId=5"; // OJO: La categoría está fija var request = new HttpRequestMessage(HttpMethod.Get, requestUri); request.Headers.Add("Authorization", $"Bearer {authToken}"); - var response = await client.SendAsync(request); - return response.IsSuccessStatusCode - ? await response.Content.ReadFromJsonAsync() - : null; + return response.IsSuccessStatusCode ? await response.Content.ReadFromJsonAsync() : null; } public async Task GetBancasAsync(string authToken, string distritoId, string seccionId) { var client = _httpClientFactory.CreateClient("ElectoralApiClient"); - var requestUri = $"/api/resultados/getBancas?distritold={distritoId}&seccionld={seccionId}&categoriaId=5"; // Revisar si necesita ser dinámico + var requestUri = $"/api/resultados/getBancas?distritoId={distritoId}&seccionId={seccionId}&categoriaId=5"; // OJO: La categoría está fija var request = new HttpRequestMessage(HttpMethod.Get, requestUri); request.Headers.Add("Authorization", $"Bearer {authToken}"); var response = await client.SendAsync(request); @@ -91,7 +76,7 @@ public class ElectoralApiService : IElectoralApiService public async Task?> GetTelegramasTotalizadosAsync(string authToken, string distritoId, string seccionId) { var client = _httpClientFactory.CreateClient("ElectoralApiClient"); - var requestUri = $"/api/resultados/getTelegramasTotalizados?distritold={distritoId}&seccionld={seccionId}"; + var requestUri = $"/api/resultados/getTelegramasTotalizados?distritoId={distritoId}&seccionId={seccionId}"; var request = new HttpRequestMessage(HttpMethod.Get, requestUri); request.Headers.Add("Authorization", $"Bearer {authToken}"); var response = await client.SendAsync(request); @@ -101,7 +86,7 @@ public class ElectoralApiService : IElectoralApiService public async Task GetTelegramaFileAsync(string authToken, string mesaId) { var client = _httpClientFactory.CreateClient("ElectoralApiClient"); - var requestUri = $"/api/resultados/getFile?mesald={mesaId}"; + var requestUri = $"/api/resultados/getFile?mesaId={mesaId}"; var request = new HttpRequestMessage(HttpMethod.Get, requestUri); request.Headers.Add("Authorization", $"Bearer {authToken}"); var response = await client.SendAsync(request); @@ -111,7 +96,7 @@ public class ElectoralApiService : IElectoralApiService public async Task GetResumenAsync(string authToken, string distritoId) { var client = _httpClientFactory.CreateClient("ElectoralApiClient"); - var requestUri = $"/api/resultados/getResumen?distritold={distritoId}"; + var requestUri = $"/api/resultados/getResumen?distritoId={distritoId}"; var request = new HttpRequestMessage(HttpMethod.Get, requestUri); request.Headers.Add("Authorization", $"Bearer {authToken}"); var response = await client.SendAsync(request); @@ -121,7 +106,7 @@ public class ElectoralApiService : IElectoralApiService public async Task GetEstadoRecuentoGeneralAsync(string authToken, string distritoId) { var client = _httpClientFactory.CreateClient("ElectoralApiClient"); - var requestUri = $"/api/estados/estadoRecuento?distritold={distritoId}"; + var requestUri = $"/api/estados/estadoRecuento?distritoId={distritoId}"; var request = new HttpRequestMessage(HttpMethod.Get, requestUri); request.Headers.Add("Authorization", $"Bearer {authToken}"); var response = await client.SendAsync(request);