From f746b17b44ab76b6f10c0d8c8800cdf0c5f2b62c Mon Sep 17 00:00:00 2001 From: Wob Jelsma Date: Fri, 24 Jan 2025 12:22:55 +0100 Subject: [PATCH] fix: made code clean --- HAN.Services/Exporters/FileExporter.cs | 1 - HAN.Services/Exporters/PdfExporter.cs | 47 +++++++++++++------------- HAN.Services/Exporters/WordExporter.cs | 38 ++++++++++----------- 3 files changed, 41 insertions(+), 45 deletions(-) diff --git a/HAN.Services/Exporters/FileExporter.cs b/HAN.Services/Exporters/FileExporter.cs index 5788e71..80bfa21 100644 --- a/HAN.Services/Exporters/FileExporter.cs +++ b/HAN.Services/Exporters/FileExporter.cs @@ -1,6 +1,5 @@ using System.ComponentModel.DataAnnotations; using HAN.Services.DTOs; -using HAN.Services.Interfaces; using ValidationException = HAN.Services.Exceptions.ValidationException; namespace HAN.Services.Exporters; diff --git a/HAN.Services/Exporters/PdfExporter.cs b/HAN.Services/Exporters/PdfExporter.cs index 84dff34..22efc83 100644 --- a/HAN.Services/Exporters/PdfExporter.cs +++ b/HAN.Services/Exporters/PdfExporter.cs @@ -3,35 +3,34 @@ using HAN.Services.DTOs; using QuestPDF.Helpers; -namespace HAN.Services.Exporters +namespace HAN.Services.Exporters; + +public class PdfExporter : FileExporter { - public class PdfExporter : FileExporter + public override FileDto Export(FileDto fileDto) { - public override FileDto Export(FileDto fileDto) - { - ValidateFile(fileDto); + ValidateFile(fileDto); - var fileName = fileDto.Name.EndsWith(".pdf") ? fileDto.Name : $"{fileDto.Name}.pdf"; - var filePath = GetExportFilePath(fileName); + var fileName = fileDto.Name.EndsWith(".pdf") ? fileDto.Name : $"{fileDto.Name}.pdf"; + var filePath = GetExportFilePath(fileName); - Console.WriteLine($"Generating PDF file at: {filePath}"); - Document.Create(container => + Console.WriteLine($"Generating PDF file at: {filePath}"); + Document.Create(container => + { + container.Page(page => { - container.Page(page => + page.Size(PageSizes.A4); + page.Margin(2, Unit.Centimetre); + page.Content().Column(column => { - page.Size(PageSizes.A4); - page.Margin(2, Unit.Centimetre); - page.Content().Column(column => - { - column.Item().Text($"Title: {fileDto.Name}") - .FontSize(20) - .Bold(); - column.Item().Text(fileDto.Content).FontSize(12); - }); + column.Item().Text($"Title: {fileDto.Name}") + .FontSize(20) + .Bold(); + column.Item().Text(fileDto.Content).FontSize(12); }); - }).GeneratePdf(filePath); - - return fileDto; - } + }); + }).GeneratePdf(filePath); + + return fileDto; } -} \ No newline at end of file +} diff --git a/HAN.Services/Exporters/WordExporter.cs b/HAN.Services/Exporters/WordExporter.cs index cd47b69..db30e92 100644 --- a/HAN.Services/Exporters/WordExporter.cs +++ b/HAN.Services/Exporters/WordExporter.cs @@ -1,31 +1,29 @@ - -using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml; using DocumentFormat.OpenXml.Packaging; using DocumentFormat.OpenXml.Wordprocessing; using HAN.Services.DTOs; -namespace HAN.Services.Exporters +namespace HAN.Services.Exporters; + +public class WordExporter : FileExporter { - public class WordExporter : FileExporter + public override FileDto Export(FileDto fileDto) { - public override FileDto Export(FileDto fileDto) - { - ValidateFile(fileDto); - - var fileName = fileDto.Name.EndsWith(".docx") ? fileDto.Name : $"{fileDto.Name}.docx"; - var filePath = GetExportFilePath(fileName); + ValidateFile(fileDto); - Console.WriteLine($"Generating Word file at: {filePath}"); - using var wordDocument = WordprocessingDocument.Create(filePath, WordprocessingDocumentType.Document); - var mainPart = wordDocument.AddMainDocumentPart(); - mainPart.Document = new DocumentFormat.OpenXml.Wordprocessing.Document(); - var body = mainPart.Document.AppendChild(new Body()); - var paragraph = body.AppendChild(new Paragraph()); - var run = paragraph.AppendChild(new Run()); - run.AppendChild(new Text(fileDto.Content)); + var fileName = fileDto.Name.EndsWith(".docx") ? fileDto.Name : $"{fileDto.Name}.docx"; + var filePath = GetExportFilePath(fileName); - return fileDto; - } + Console.WriteLine($"Generating Word file at: {filePath}"); + using var wordDocument = WordprocessingDocument.Create(filePath, WordprocessingDocumentType.Document); + var mainPart = wordDocument.AddMainDocumentPart(); + mainPart.Document = new DocumentFormat.OpenXml.Wordprocessing.Document(); + var body = mainPart.Document.AppendChild(new Body()); + var paragraph = body.AppendChild(new Paragraph()); + var run = paragraph.AppendChild(new Run()); + run.AppendChild(new Text(fileDto.Content)); + return fileDto; } + }