From 562935e07ec7d3c1fb513680b1fde947aad79ad1 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Mon, 4 Dec 2023 15:29:58 +0100
Subject: [PATCH] prepare Web project for deployment

---
 EnvelopeGenerator.Web/Controllers/BaseController.cs |  2 +-
 .../Controllers/EnvelopeController.cs               | 13 +------------
 EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj  |  6 ++++++
 EnvelopeGenerator.Web/Program.cs                    |  6 +++++-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/EnvelopeGenerator.Web/Controllers/BaseController.cs b/EnvelopeGenerator.Web/Controllers/BaseController.cs
index 23caa188..5a88e0c0 100644
--- a/EnvelopeGenerator.Web/Controllers/BaseController.cs
+++ b/EnvelopeGenerator.Web/Controllers/BaseController.cs
@@ -17,7 +17,7 @@ namespace EnvelopeGenerator.Web.Controllers
         {
             this.database = database;
             this.logConfig = logging.LogConfig;
-            this.logger = logging.LogConfig.GetLoggerFor(GetType().Name);
+            this.logger = logging.LogConfig.GetLogger();
             this.state = database.State;
         }
 
diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
index 0edd5332..0b73362a 100644
--- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
@@ -27,6 +27,7 @@ namespace EnvelopeGenerator.Web.Controllers
                 envelopeService.EnsureValidEnvelopeKey(envelopeKey);
                 EnvelopeResponse response = envelopeService.LoadEnvelope(envelopeKey);
 
+                logger.Debug("Loaded envelope [{0}] for receiver [{1}]", response.Envelope.Id, response.Envelope.Id);
                 return Json(response);
             }
             catch (Exception e)
@@ -52,18 +53,6 @@ namespace EnvelopeGenerator.Web.Controllers
 
                 string annotationData = await envelopeService.EnsureValidAnnotationData(Request);
 
-                //envelopeService.InsertDocumentStatus(new DocumentStatus()
-                //{
-                //    EnvelopeId = response.Envelope.Id,
-                //    ReceiverId = response.Receiver.Id,
-                //    Value = annotationData,
-                //    Status = Common.Constants.DocumentStatus.Signed
-                //});        
-
-                //envelopeService.InsertHistoryEntrySigned(response);
-
-                //emailService.SendSignedEmail(response.Receiver.Id, response.Envelope.Id);
-
                 var signResult = actionService?.SignEnvelope(response.Envelope, response.Receiver);
 
                 return Ok();
diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
index f0e1279a..e0250ce0 100644
--- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
+++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
@@ -42,4 +42,10 @@
     </Reference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="appsettings.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
 </Project>
diff --git a/EnvelopeGenerator.Web/Program.cs b/EnvelopeGenerator.Web/Program.cs
index 427eb42e..5f357f33 100644
--- a/EnvelopeGenerator.Web/Program.cs
+++ b/EnvelopeGenerator.Web/Program.cs
@@ -19,7 +19,11 @@ namespace EnvelopeGenerator.Web
             builder.Services.AddSingleton<EnvelopeService>();
 
             // Add services to the container.
-            builder.Services.AddControllersWithViews();
+            builder.Services.AddControllersWithViews().AddJsonOptions(q =>
+            {
+                // Prevents serialization error when serializing SvgBitmap in EnvelopeReceiver
+                q.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles;
+            });
 
             // Configure and start scheduler
             builder.Services.AddQuartz(q =>