From 07381e78b4cbb5b5904ad229f83af364785ddd59 Mon Sep 17 00:00:00 2001 From: TekH Date: Thu, 26 Jun 2025 16:46:55 +0200 Subject: [PATCH] Refactor name retrieval to use GetFullName method Updated the `CertificateModel.vb` and `EmailData.vb` files to replace direct access to the `FullName` property with the `GetFullName()` method for retrieving creator, sender, and receiver names. This change enhances flexibility and maintains consistency across the codebase. Additionally, added a new static `GetFullName` method in the `EGUserExtensions.cs` file to centralize the formatting of user names by concatenating the `Prename` and `Name` properties. --- EnvelopeGenerator.CommonServices/Models/CertificateModel.vb | 2 +- EnvelopeGenerator.CommonServices/Models/EmailData.vb | 6 +++--- EnvelopeGenerator.Domain/Entities/EGUserExtensions.cs | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/EnvelopeGenerator.CommonServices/Models/CertificateModel.vb b/EnvelopeGenerator.CommonServices/Models/CertificateModel.vb index 540199c0..ef3b608f 100644 --- a/EnvelopeGenerator.CommonServices/Models/CertificateModel.vb +++ b/EnvelopeGenerator.CommonServices/Models/CertificateModel.vb @@ -34,7 +34,7 @@ Public Class CertificateModel oCommand.Parameters.Add("ENVELOPE_UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid oCommand.Parameters.Add("ENVELOPE_SUBJECT", SqlDbType.NVarChar).Value = String.Empty oCommand.Parameters.Add("CREATOR_ID", SqlDbType.Int).Value = pEnvelope.UserId - oCommand.Parameters.Add("CREATOR_NAME", SqlDbType.NVarChar).Value = pEnvelope.User.FullName + oCommand.Parameters.Add("CREATOR_NAME", SqlDbType.NVarChar).Value = pEnvelope.User.GetFullName() oCommand.Parameters.Add("CREATOR_EMAIL", SqlDbType.NVarChar).Value = pEnvelope.User.Email oCommand.Parameters.Add("ENVELOPE_STATUS", SqlDbType.Int).Value = pEnvelope.Status diff --git a/EnvelopeGenerator.CommonServices/Models/EmailData.vb b/EnvelopeGenerator.CommonServices/Models/EmailData.vb index bf54bd57..2ecc6d90 100644 --- a/EnvelopeGenerator.CommonServices/Models/EmailData.vb +++ b/EnvelopeGenerator.CommonServices/Models/EmailData.vb @@ -39,7 +39,7 @@ Public Class EmailData ReceiverName = pReceiver.Name ReceiverAccessCode = pReceiver.AccessCode SenderAdress = pEnvelope.User.Email - SenderName = pEnvelope.User.FullName + SenderName = pEnvelope.User.GetFullName() EnvelopeTitle = pEnvelope.Title End Sub Public Function TextToHtml(input As String) As String @@ -72,10 +72,10 @@ Public Class EmailData Message = pEnvelope.Message ReferenceID = pEnvelope.Id ReferenceString = pEnvelope.Uuid - ReceiverName = pEnvelope.User.FullName + ReceiverName = pEnvelope.User.GetFullName() ReceiverAccessCode = String.Empty SenderAdress = pEnvelope.User.Email - SenderName = pEnvelope.User.FullName + SenderName = pEnvelope.User.GetFullName() EnvelopeTitle = pEnvelope.Title End Sub diff --git a/EnvelopeGenerator.Domain/Entities/EGUserExtensions.cs b/EnvelopeGenerator.Domain/Entities/EGUserExtensions.cs index a8e25f95..0efcc851 100644 --- a/EnvelopeGenerator.Domain/Entities/EGUserExtensions.cs +++ b/EnvelopeGenerator.Domain/Entities/EGUserExtensions.cs @@ -26,5 +26,7 @@ namespace EnvelopeGenerator.Domain.Entities DeletedWho = user.DeletedWho }; } + + public static string GetFullName(this User user) => $"{user.Prename} {user.Name}"; } } \ No newline at end of file