logging impprovements added

Author: mendozagit

Auth/AuthResponseService.cs

@@ -20,12 +20,13 @@
 using Fiscalapi.XmlDownloader.Common;
 using Fiscalapi.XmlDownloader.Common.Enums;
 using Fiscalapi.XmlDownloader.Common.Http;
+using Microsoft.Extensions.Logging;
 
 namespace Fiscalapi.XmlDownloader.Auth;
 
 public static class AuthResponseService
 {
-    public static AuthResponse Build(SatResponse satResponse, ICredential credential)
+    public static AuthResponse Build(SatResponse satResponse, ICredential credential, ILogger logger)
     {
         /*
          *<s:envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" xmlns:u="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">

Auth/AuthService.cs

@@ -28,11 +28,30 @@ namespace Fiscalapi.XmlDownloader.Auth;
 /// </summary>
 public class AuthService : SatService, IAuthService
 {
+    /// <summary>
+    /// Constructor for dependency injection scenarios
+    /// </summary>
+    /// <param name="httpClient">HttpClient instance</param>
+    /// <param name="logger">Logger instance</param>
+    public AuthService(HttpClient httpClient, ILogger<AuthService> logger) 
+        : base(httpClient, logger)
+    {
+    }
+
+    /// <summary>
+    /// Constructor for direct instantiation scenarios
+    /// </summary>
+    /// <param name="logger">Logger instance</param>
+    public AuthService(ILogger<AuthService> logger) 
+        : base(logger)
+    {
+    }
+
     /// <summary>
     /// Authenticates with SAT using the provided credential and returns the authentication token
     /// </summary>
     public async Task<AuthResponse> AuthenticateAsync(ICredential credential,
-        CancellationToken cancellationToken = default, ILogger? logger = null)
+        ILogger logger, CancellationToken cancellationToken = default)
     {
         // Generate Sat XML security token ID
         var uuid = CreateSecurityToken();
@@ -53,7 +72,7 @@ public async Task<AuthResponse> AuthenticateAsync(ICredential credential,
             cancellationToken: cancellationToken);
 
         // Map response 
-        var authResponse = AuthResponseService.Build(satResponse, credential);
+        var authResponse = AuthResponseService.Build(satResponse, credential, logger);
 
         return authResponse;
     }

Auth/IAuthService.cs

@@ -32,6 +32,5 @@ public interface IAuthService
     /// <param name="cancellationToken">CancellationToken</param>
     /// <param name="logger">Logger</param>
     /// <returns></returns>
-    Task<AuthResponse> AuthenticateAsync(ICredential credential, CancellationToken cancellationToken = default,
-        ILogger? logger = null);
+    Task<AuthResponse> AuthenticateAsync(ICredential credential, ILogger logger, CancellationToken cancellationToken = default);
 }

Common/Http/SatService.cs

@@ -16,6 +16,7 @@
 
 using System.Net;
 using System.Text;
+using Microsoft.Extensions.Logging;
 
 namespace Fiscalapi.XmlDownloader.Common.Http;
 
@@ -26,25 +27,28 @@ public abstract class SatService : IDisposable
 {
     private readonly HttpClient _httpClient;
     private readonly bool _ownsHttpClient;
+    private readonly ILogger _logger;
     private bool _disposed;
 
     protected bool IsDebugEnabled { get; set; }
 
     /// <summary>
     /// Constructor for dependency injection scenarios
     /// </summary>
-    protected SatService(HttpClient httpClient)
+    protected SatService(HttpClient httpClient, ILogger logger)
     {
         _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         _ownsHttpClient = false;
     }
 
     /// <summary>
     /// Constructor for direct instantiation scenarios
     /// </summary>
-    protected SatService()
+    protected SatService(ILogger logger)
     {
         _httpClient = new HttpClient();
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         _ownsHttpClient = true;
     }
 
@@ -100,6 +104,8 @@ protected async Task<SatResponse> SendRequestAsync(string url, string action, st
         {
             if (IsDebugEnabled)
                 LogError(ex, url, action);
+            
+            _logger.LogError(ex, "Error sending SOAP request to {Url} with action {Action}", url, action);
 
             return new SatResponse
             {
@@ -118,7 +124,7 @@ protected async Task<SatResponse> SendRequestAsync(string url, string action, st
     /// <param name="url">Request URL</param>
     /// <param name="soapAction">SOAP action header</param>
     /// <param name="payload">Request payload</param>
-    private static void LogRequest(HttpRequestMessage request, string url, string soapAction, string payload)
+    private void LogRequest(HttpRequestMessage request, string url, string soapAction, string payload)
     {
         try
         {
@@ -150,11 +156,11 @@ private static void LogRequest(HttpRequestMessage request, string url, string so
             sb.AppendLine(payload);
             sb.AppendLine("=== END REQUEST ===");
 
-            Console.WriteLine(sb.ToString());
+            _logger.LogDebug(sb.ToString());
         }
         catch (Exception ex)
         {
-            Console.WriteLine($"Error logging request: {ex.Message}");
+            _logger.LogError(ex, "Error logging request");
         }
     }
 
@@ -165,7 +171,7 @@ private static void LogRequest(HttpRequestMessage request, string url, string so
     /// <param name="responseContent">Response content</param>
     /// <param name="url">Original request URL</param>
     /// <param name="soapAction">Original SOAP action</param>
-    private static void LogResponse(HttpResponseMessage response, string responseContent, string url,
+    private void LogResponse(HttpResponseMessage response, string responseContent, string url,
         string soapAction)
     {
         try
@@ -200,11 +206,11 @@ private static void LogResponse(HttpResponseMessage response, string responseCon
             sb.AppendLine(string.IsNullOrEmpty(responseContent) ? "[Empty Response]" : responseContent);
             sb.AppendLine("=== END RESPONSE ===");
 
-            Console.WriteLine(sb.ToString());
+            _logger.LogDebug(sb.ToString());
         }
         catch (Exception ex)
         {
-            Console.WriteLine($"Error logging response: {ex.Message}");
+            _logger.LogError(ex, "Error logging response");
         }
     }
 
@@ -214,7 +220,7 @@ private static void LogResponse(HttpResponseMessage response, string responseCon
     /// <param name="ex">Exception that occurred</param>
     /// <param name="url">Request URL</param>
     /// <param name="soapAction">SOAP action</param>
-    private static void LogError(Exception ex, string url, string soapAction)
+    private void LogError(Exception ex, string url, string soapAction)
     {
         try
         {
@@ -235,11 +241,11 @@ private static void LogError(Exception ex, string url, string soapAction)
             sb.AppendLine(ex.StackTrace);
             sb.AppendLine("=== END ERROR ===");
 
-            Console.WriteLine(sb.ToString());
+            _logger.LogError(sb.ToString());
         }
         catch (Exception logEx)
         {
-            Console.WriteLine($"Error logging exception: {logEx.Message}");
+            _logger.LogError(logEx, "Error logging exception");
         }
     }
 

Download/DownloadResponseService.cs

@@ -19,12 +19,13 @@
 using Fiscalapi.XmlDownloader.Common.Http;
 using Fiscalapi.XmlDownloader.Download.Models;
 using Fiscalapi.XmlDownloader.Download.Models.Sat;
+using Microsoft.Extensions.Logging;
 
 namespace Fiscalapi.XmlDownloader.Download;
 
 public static class DownloadResponseService
 {
-    public static DownloadResponse Build(SatResponse satResponse)
+    public static DownloadResponse Build(SatResponse satResponse, ILogger logger)
     {
         if (satResponse.IsSuccessStatusCode)
         {

Download/DownloadService.cs

@@ -29,6 +29,25 @@ namespace Fiscalapi.XmlDownloader.Download;
 /// </summary>
 public class DownloadService : SatService, IDownloadService
 {
+    /// <summary>
+    /// Constructor for dependency injection scenarios
+    /// </summary>
+    /// <param name="httpClient">HttpClient instance</param>
+    /// <param name="logger">Logger instance</param>
+    public DownloadService(HttpClient httpClient, ILogger<DownloadService> logger) 
+        : base(httpClient, logger)
+    {
+    }
+
+    /// <summary>
+    /// Constructor for direct instantiation scenarios
+    /// </summary>
+    /// <param name="logger">Logger instance</param>
+    public DownloadService(ILogger<DownloadService> logger) 
+        : base(logger)
+    {
+    }
+
     /// <summary>
     /// Downloads a package from SAT using the provided credential, authentication token and package ID.s
     /// </summary>
@@ -39,7 +58,7 @@ public class DownloadService : SatService, IDownloadService
     /// <param name="logger">Logger</param>
     /// <returns>DownloadResponse</returns>
     public async Task<DownloadResponse> DownloadAsync(ICredential credential, Token authToken, string packageId,
-        CancellationToken cancellationToken = default, ILogger? logger = null)
+        ILogger logger, CancellationToken cancellationToken = default)
     {
         var toDigest = CreateDigest(packageId, credential.Certificate.Rfc);
         var signature = CreateSignature(credential, toDigest);
@@ -52,7 +71,7 @@ public async Task<DownloadResponse> DownloadAsync(ICredential credential, Token
             token: authToken.Value,
             cancellationToken: cancellationToken);
 
-        var downloadResponse = DownloadResponseService.Build(satResponse);
+        var downloadResponse = DownloadResponseService.Build(satResponse, logger);
 
         return downloadResponse;
     }

Download/IDownloadService.cs

@@ -36,5 +36,5 @@ public interface IDownloadService
     /// <param name="logger">Logger</param>
     /// <returns>DownloadResponse</returns>
     Task<DownloadResponse> DownloadAsync(ICredential credential, Token authToken, string packageId,
-        CancellationToken cancellationToken = default, ILogger? logger = null);
+         ILogger logger, CancellationToken cancellationToken = default);
 }

DownloaderExtensions.cs

@@ -170,11 +170,13 @@ public static TEnum ToEnumElement<TEnum>(this string code) where TEnum : struct,
     /// <returns>The service collection for chaining</returns>
     public static IServiceCollection AddXmlDownloader(this IServiceCollection services)
     {
-        // Register the services
-        services.AddScoped<IAuthService, AuthService>();
-        services.AddScoped<IQueryService, QueryService>();
-        services.AddScoped<IVerifyService, VerifyService>();
-        services.AddScoped<IDownloadService, DownloadService>();
+        // Register HttpClient factory for SAT services
+        services.AddHttpClient<IAuthService, AuthService>();
+        services.AddHttpClient<IQueryService, QueryService>();
+        services.AddHttpClient<IVerifyService, VerifyService>();
+        services.AddHttpClient<IDownloadService, DownloadService>();
+        
+        // Register non-HTTP services as scoped
         services.AddScoped<IFileStorageService, FileStorageService>();
         services.AddScoped<IXmlDownloaderService, XmlDownloaderService>();
 

Query/IQueryService.cs

@@ -36,5 +36,5 @@ public interface IQueryService
     /// <param name="logger">Logger</param>
     /// <returns>QueryResponse</returns>
     Task<QueryResponse> CreateAsync(ICredential credential, Token authToken,
-        QueryParameters parameters, CancellationToken cancellationToken, ILogger? logger = null);
+        QueryParameters parameters, ILogger logger, CancellationToken cancellationToken = default);
 }

Query/QueryResponseService.cs

@@ -19,12 +19,13 @@
 using Fiscalapi.XmlDownloader.Common.Http;
 using Fiscalapi.XmlDownloader.Query.Models;
 using Fiscalapi.XmlDownloader.Query.Models.Sat;
+using Microsoft.Extensions.Logging;
 
 namespace Fiscalapi.XmlDownloader.Query;
 
 public static class QueryResponseService
 {
-    public static QueryResponse Build(SatResponse satResponse)
+    public static QueryResponse Build(SatResponse satResponse, ILogger logger)
     {
         if (satResponse.IsSuccessStatusCode)
         {