HtmlWriter, PdfWriter

Author: phongnguyend

src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/Html/IHtmlWriter.cs

@@ -0,0 +1,16 @@
+using System.IO;
+using System.Threading.Tasks;
+
+namespace ClassifiedAds.CrossCuttingConcerns.Html;
+
+public interface IHtmlWriter<T>
+    where T : IHtmlRequest
+{
+    Task WriteAsync(T data, Stream stream);
+
+    Task<string> GetStringAsync(T data);
+}
+
+public interface IHtmlRequest
+{
+}

src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/HtmlGenerator/IHtmlGenerator.cs

@@ -0,0 +1,16 @@
+using System.IO;
+using System.Threading.Tasks;
+
+namespace ClassifiedAds.CrossCuttingConcerns.Pdf;
+
+public interface IPdfWriter<T>
+    where T : IPdfRequest
+{
+    Task WriteAsync(T data, Stream stream);
+
+    Task<byte[]> GetBytesAsync(T data);
+}
+
+public interface IPdfRequest
+{
+}

src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/Pdf/IPdfWriter.cs

@@ -1,21 +1,18 @@
-using ClassifiedAds.CrossCuttingConcerns.HtmlGenerator;
-using ClassifiedAds.Infrastructure.HtmlGenerators;
-using RazorLight;
+using RazorLight;
 using System;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
-public static class HtmlGeneratorCollectionExtensions
+public static class HtmlCollectionExtensions
 {
-    public static IServiceCollection AddHtmlGenerator(this IServiceCollection services)
+    public static IServiceCollection AddHtmlRazorLightEngine(this IServiceCollection services)
     {
         var engine = new RazorLightEngineBuilder()
                .UseFileSystemProject(Environment.CurrentDirectory)
                .UseMemoryCachingProvider()
                .Build();
 
         services.AddSingleton<IRazorLightEngine>(engine);
-        services.AddSingleton<IHtmlGenerator, HtmlGenerator>();
 
         return services;
     }

src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/PdfConverter/IPdfConverter.cs

@@ -1,17 +1,13 @@
-using ClassifiedAds.CrossCuttingConcerns.PdfConverter;
-using ClassifiedAds.Infrastructure.PdfConverters.DinkToPdf;
-using DinkToPdf;
+using DinkToPdf;
 using DinkToPdf.Contracts;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
-public static class DinkToPdfConverterCollectionExtensions
+public static class DinkToPdfCollectionExtensions
 {
     public static IServiceCollection AddDinkToPdfConverter(this IServiceCollection services)
     {
         services.AddSingleton(typeof(IConverter), new SynchronizedConverter(new PdfTools()));
-        services.AddSingleton<IPdfConverter, DinkToPdfConverter>();
-
         return services;
     }
 }

src/ModularMonolith/ClassifiedAds.Infrastructure/HtmlGenerators/HtmlGeneratorCollectionExtensions.cs renamed to src/ModularMonolith/ClassifiedAds.Infrastructure/Html/HtmlCollectionExtensions.cs

@@ -1,18 +1,13 @@
-using ClassifiedAds.CrossCuttingConcerns.PdfConverter;
-using ClassifiedAds.Infrastructure.PdfConverters.PuppeteerSharp;
-using PuppeteerSharp;
+using PuppeteerSharp;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
-public static class PuppeteerSharpConverterCollectionExtensions
+public static class PuppeteerSharpCollectionExtensions
 {
     public static IServiceCollection AddPuppeteerSharpPdfConverter(this IServiceCollection services)
     {
         var browserFetcher = new BrowserFetcher();
         browserFetcher.DownloadAsync().GetAwaiter().GetResult();
-
-        services.AddSingleton<IPdfConverter, PuppeteerSharpConverter>();
-
         return services;
     }
 }

src/ModularMonolith/ClassifiedAds.Infrastructure/HtmlGenerators/HtmlGenerator.cs

@@ -1,12 +1,12 @@
 using ClassifiedAds.Application;
 using ClassifiedAds.Contracts.AuditLog.DTOs;
 using ClassifiedAds.CrossCuttingConcerns.Csv;
-using ClassifiedAds.CrossCuttingConcerns.HtmlGenerator;
-using ClassifiedAds.CrossCuttingConcerns.PdfConverter;
+using ClassifiedAds.CrossCuttingConcerns.Pdf;
 using ClassifiedAds.Modules.Product.Authorization;
 using ClassifiedAds.Modules.Product.Commands;
 using ClassifiedAds.Modules.Product.Csv;
 using ClassifiedAds.Modules.Product.Models;
+using ClassifiedAds.Modules.Product.Pdf;
 using ClassifiedAds.Modules.Product.Queries;
 using ClassifiedAds.Modules.Product.RateLimiterPolicies;
 using Microsoft.AspNetCore.Authorization;
@@ -33,22 +33,19 @@ public class ProductsController : ControllerBase
 {
     private readonly Dispatcher _dispatcher;
     private readonly ILogger _logger;
-    private readonly IHtmlGenerator _htmlGenerator;
-    private readonly IPdfConverter _pdfConverter;
+    private readonly IPdfWriter<ExportProductsToPdf> _pdfWriter;
     private readonly ICsvWriter<ExportProductsToCsv> _productCsvWriter;
     private readonly ICsvReader<ImportProductsFromCsv> _productCsvReader;
 
     public ProductsController(Dispatcher dispatcher,
         ILogger<ProductsController> logger,
-        IHtmlGenerator htmlGenerator,
-        IPdfConverter pdfConverter,
+        IPdfWriter<ExportProductsToPdf> pdfWriter,
         ICsvWriter<ExportProductsToCsv> productCsvWriter,
         ICsvReader<ImportProductsFromCsv> productCsvReader)
     {
         _dispatcher = dispatcher;
         _logger = logger;
-        _htmlGenerator = htmlGenerator;
-        _pdfConverter = pdfConverter;
+        _pdfWriter = pdfWriter;
         _productCsvWriter = productCsvWriter;
         _productCsvReader = productCsvReader;
     }
@@ -158,13 +155,8 @@ public async Task<ActionResult<IEnumerable<AuditLogEntryDTO>>> GetAuditLogs(Guid
     public async Task<IActionResult> ExportAsPdf()
     {
         var products = await _dispatcher.DispatchAsync(new GetProductsQuery());
-        var model = products.ToModels();
-
-        var template = Path.Combine(Environment.CurrentDirectory, $"Templates/ProductList.cshtml");
-        var html = await _htmlGenerator.GenerateAsync(template, model);
-        var pdf = await _pdfConverter.ConvertAsync(html);
-
-        return File(pdf, MediaTypeNames.Application.Octet, "Products.pdf");
+        var bytes = await _pdfWriter.GetBytesAsync(new ExportProductsToPdf { Products = products });
+        return File(bytes, MediaTypeNames.Application.Octet, "Products.pdf");
     }
 
     [HttpGet("exportascsv")]