From bdfb973d55e1ffdf2d44a105ab817854eb201747 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Thu, 26 Feb 2026 18:57:58 +0100
Subject: [PATCH] Refactor ReportCreator: DI, logging, and deprecations

Refactored ReportCreator to use constructor injection for dependencies and removed BaseClass inheritance. Marked legacy methods and fields as [Obsolete] to indicate migration to mediator queries. Improved logging by switching to Logger.LogError and updating string interpolation. Removed unused usings and added MergeEnvelope method (also obsolete). These changes modernize the class and highlight areas for further architectural improvement.
---
 .../Jobs/FinalizeDocument/ReportCreator.cs    | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs
index b7cc67e5..20a1b8b3 100644
--- a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs
+++ b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs
@@ -1,30 +1,24 @@
 using System.Data;
-using System.IO;
-using DigitalData.Modules.Base;
-using DigitalData.Modules.Logging;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.ServiceHost.Exceptions;
-using EnvelopeGenerator.ServiceHost.Jobs;
+using EnvelopeGenerator.ServiceHost.Extensions;
 
 namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
 
-public class ReportCreator : BaseClass
+[Obsolete("Instead of ReportModel create and use EnvelopeReport mediator queries")]
+public class ReportCreator(ReportModel ReportModel, ILogger<ReportCreator> Logger)
 {
+    [Obsolete("Solve the spaghetti...")]
     private Envelope? _envelope;
-    private readonly ReportModel _reportModel;
-
-    public ReportCreator(LogConfig logConfig, State state) : base(logConfig)
-    {
-        _reportModel = new ReportModel(state);
-    }
 
+    [Obsolete("Instead of ReportModel create and use EnvelopeReport mediator queries and solve this spaghetti...")]
     public byte[] CreateReport(Envelope envelope)
     {
         try
         {
             Logger.LogDebug("Loading report data..");
-            var table = _reportModel.List(envelope.Id);
+            var table = ReportModel.List(envelope.Id);
             var items = GetReportSource(table);
 
             _envelope = envelope;
@@ -34,7 +28,7 @@ public class ReportCreator : BaseClass
                 throw new CreateReportException("No report data found!");
             }
 
-            Logger.LogDebug("Creating report with [{0}] items..", items.Count);
+            Logger.LogDebug("Creating report with [{count}] items..", items.Count);
             var buffer = DoCreateReport(items);
             Logger.LogDebug("Report created!");
 
@@ -42,7 +36,7 @@ public class ReportCreator : BaseClass
         }
         catch (Exception ex)
         {
-            Logger.Error(ex);
+            Logger.LogError(ex);
             throw new CreateReportException("Could not prepare report data!", ex);
         }
     }
@@ -74,6 +68,7 @@ public class ReportCreator : BaseClass
         return stream.ToArray();
     }
 
+    [Obsolete("Solve this spaghetti...")]
     private ReportItem MergeEnvelope(ReportItem item)
     {
         if (item.Envelope is null)
@@ -100,8 +95,8 @@ public class ReportCreator : BaseClass
         }
         catch (Exception ex)
         {
-            Logger.Error(ex);
+            Logger.LogError(ex);
             throw new CreateReportException("Could not read data from database!", ex);
         }
     }
-}
+}
\ No newline at end of file