From 9434f83b3e45bb55a969d156584c913ffe332396 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Mon, 1 Sep 2025 14:21:53 +0200
Subject: [PATCH] Refactor EnvelopeReceiver and History controllers

- Added using directive for EnvelopeGenerator.Domain.Constants.
- Updated ignore_statuses type in EnvelopeReceiverController.
- Improved resource management with using statements for SqlConnection and SqlCommand.
- Changed from Array.Empty<Signature>() to Enumerable.Empty<Signature>() for better performance.
- Simplified GetEnvelopeStatus method in HistoryController by using Status directly.
---
 .../Controllers/EnvelopeReceiverController.cs | 25 +++++++++----------
 .../Controllers/HistoryController.cs          |  5 ++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
index da91b735..16f42f50 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs
@@ -17,6 +17,7 @@ using Microsoft.Extensions.Options;
 using System.Data;
 using System.Reflection.Metadata;
 using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
@@ -104,7 +105,7 @@ public class EnvelopeReceiverController : ControllerBase
             max_status: envelopeReceiver.Envelope.Status?.Max,
             envelopeQuery: envelopeReceiver.Envelope,
             receiverQuery: envelopeReceiver.Receiver,
-            ignore_statuses: envelopeReceiver.Envelope.Status?.Ignore ?? Array.Empty<EnvelopeStatusQuery>())
+            ignore_statuses: envelopeReceiver.Envelope.Status?.Ignore ?? Array.Empty<EnvelopeStatus>())
             .ThenAsync(
                 Success: Ok,
                 Fail: IActionResult (msg, ntc) =>
@@ -233,22 +234,20 @@ public class EnvelopeReceiverController : ControllerBase
                 SELECT @OUT_SUCCESS as [@OUT_SUCCESS];";
 
         foreach (var rcv in res.SentReceiver)
-            foreach (var sign in request.Receivers.Where(r => r.EmailAddress == rcv.EmailAddress).FirstOrDefault()?.Signatures ?? Array.Empty<Signature>())
+            foreach (var sign in request.Receivers.Where(r => r.EmailAddress == rcv.EmailAddress).FirstOrDefault()?.Signatures ?? Enumerable.Empty<Signature>())
             {
-                using (SqlConnection conn = new(_cnnStr))
-                {
-                    conn.Open();
+                using SqlConnection conn = new(_cnnStr);
+                conn.Open();
 
-                    var formattedSQL = string.Format(sql, document.Id.ToSqlParam(), rcv.Id.ToSqlParam(), sign.X.ToSqlParam(), sign.Y.ToSqlParam(), sign.Page.ToSqlParam());
+                var formattedSQL = string.Format(sql, document.Id.ToSqlParam(), rcv.Id.ToSqlParam(), sign.X.ToSqlParam(), sign.Y.ToSqlParam(), sign.Page.ToSqlParam());
 
-                    using SqlCommand cmd = new SqlCommand(formattedSQL, conn);
-                    cmd.CommandType = CommandType.Text;
+                using SqlCommand cmd = new(formattedSQL, conn);
+                cmd.CommandType = CommandType.Text;
 
-                    using SqlDataReader reader = cmd.ExecuteReader();
-                    if (reader.Read())
-                    {
-                        bool outSuccess = reader.GetBoolean(0);
-                    }
+                using SqlDataReader reader = cmd.ExecuteReader();
+                if (reader.Read())
+                {
+                    bool outSuccess = reader.GetBoolean(0);
                 }
             }
         #endregion
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs
index 22f2660e..2572d7cc 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs
@@ -3,9 +3,8 @@ using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
-using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Application.Histories.Queries;
-using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
@@ -94,7 +93,7 @@ public class HistoryController : ControllerBase
     public IActionResult GetEnvelopeStatus([FromQuery] EnvelopeStatus? status = null)
     {
         return status is null
-            ? Ok(_memoryCache.GetEnumAsDictionary<EnvelopeStatus>("gen.api", Constants.Status.NonHist, Constants.Status.RelatedToFormApp))
+            ? Ok(_memoryCache.GetEnumAsDictionary<EnvelopeStatus>("gen.api", Status.NonHist, Status.RelatedToFormApp))
             : Ok(status.ToString());
     }