diff --git a/EnvelopeGenerator.CommonServices/Jobs/APIBackendJobs/APIEnvelopeJob.vb b/EnvelopeGenerator.CommonServices/Jobs/APIBackendJobs/APIEnvelopeJob.vb index 01652dbb..a7369610 100644 --- a/EnvelopeGenerator.CommonServices/Jobs/APIBackendJobs/APIEnvelopeJob.vb +++ b/EnvelopeGenerator.CommonServices/Jobs/APIBackendJobs/APIEnvelopeJob.vb @@ -85,7 +85,7 @@ Namespace Jobs oEnvelope.CURRENT_WORK_APP = "signFLOW_API_EnvJob_InvMail" Logger.Debug("SendInvMail - Loading Envelope Data..") Dim oEnvelopeData = GetEnvelopeData(oId) - oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id).OfType(Of EnvelopeReceiver).ToList() + oEnvelope.EnvelopeReceivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id).OfType(Of EnvelopeReceiver).ToList() Logger.Debug("SendInvMail - Created Reveivers!") If oEnvelopeData Is Nothing Then Logger.Warn("SendInvMail - EnvelopeData could not be loaded for Id [{0}]!", oId) @@ -135,7 +135,7 @@ Namespace Jobs Throw New ArgumentNullException("EnvelopeData") End If oEnvelope.CURRENT_WORK_APP = "signFLOW_API_EnvJob_Withdrawn" - oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id).OfType(Of EnvelopeReceiver).ToList() + oEnvelope.EnvelopeReceivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id).OfType(Of EnvelopeReceiver).ToList() Logger.Debug("WithdrawnEnv - Sending Withdrawn Mails..") diff --git a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb index 49df1b25..b464998d 100644 --- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb +++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb @@ -336,7 +336,7 @@ Namespace Jobs ' oAttachment = pAttachment End If - For Each oReceiver In pEnvelope.Receivers + For Each oReceiver In pEnvelope.EnvelopeReceivers If ActionService.CompleteEnvelope(pEnvelope, oReceiver) = False Then ', oAttachment Logger.Error("Envelope could not be completed for receiver [{0}]", oReceiver.Receiver.EmailAddress) Return False diff --git a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb index cf40565c..a47f8655 100644 --- a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb @@ -61,7 +61,7 @@ Public Class EnvelopeModel oEnvelope.DocResult = Nothing End If oEnvelope.User = UserModel.SelectUser(oEnvelope.UserId) - oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id) + oEnvelope.EnvelopeReceivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id) oEnvelope.Documents = DocumentModel.List(oEnvelope.Id) oEnvelope.History = HistoryModel.List(oEnvelope.Id) oEnvelope.Type = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId) diff --git a/EnvelopeGenerator.CommonServices/Services/ActionService.vb b/EnvelopeGenerator.CommonServices/Services/ActionService.vb index 5af3cb85..1dbd14b7 100644 --- a/EnvelopeGenerator.CommonServices/Services/ActionService.vb +++ b/EnvelopeGenerator.CommonServices/Services/ActionService.vb @@ -29,7 +29,7 @@ Public Class ActionService Return False End If - Dim oSendResult = pEnvelope.Receivers. + Dim oSendResult = pEnvelope.EnvelopeReceivers. Select(Function(r) EmailService.SendDocumentReceivedEmail(pEnvelope, r)). All(Function(r) r = True) @@ -50,7 +50,7 @@ Public Class ActionService Return False End If Dim oSendResult As Boolean = False - For Each oReceiver In pEnvelope.Receivers + For Each oReceiver In pEnvelope.EnvelopeReceivers EmailService.SendDocumentReceivedEmail(pEnvelope, oReceiver) Next Return oSendResult @@ -75,7 +75,7 @@ Public Class ActionService Return False End If - Dim oSendResult = pEnvelope.Receivers. + Dim oSendResult = pEnvelope.EnvelopeReceivers. Select(Function(r) EmailService.SendEnvelopeDeletedEmail(pEnvelope, r, pReason)). All(Function(r) r = True) @@ -87,7 +87,7 @@ Public Class ActionService End Function Public Function API_SendWithdrawn_Mails(pEnvelope As Domain.Entities.Envelope, pReason As String) As Boolean Dim oSendResult As Boolean = False - For Each oReceiver As ReceiverVM In pEnvelope.Receivers + For Each oReceiver As ReceiverVM In pEnvelope.EnvelopeReceivers If EmailService.SendEnvelopeDeletedEmail(pEnvelope, oReceiver, pReason) = False Then Return False End If diff --git a/EnvelopeGenerator.CommonServices/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.CommonServices/Strings/Envelope1.Designer.vb index 89f3c808..5dfec00b 100644 --- a/EnvelopeGenerator.CommonServices/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.CommonServices/Strings/Envelope1.Designer.vb @@ -304,7 +304,7 @@ Namespace My.Resources ''' Public Shared ReadOnly Property Incomplete_Receivers() As String Get - Return ResourceManager.GetString("Incomplete Receivers", resourceCulture) + Return ResourceManager.GetString("Incomplete EnvelopeReceivers", resourceCulture) End Get End Property @@ -371,7 +371,7 @@ Namespace My.Resources ''' Public Shared ReadOnly Property Missing_Receivers() As String Get - Return ResourceManager.GetString("Missing Receivers", resourceCulture) + Return ResourceManager.GetString("Missing EnvelopeReceivers", resourceCulture) End Get End Property diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs index 3cea74ce..7a348ac8 100644 --- a/EnvelopeGenerator.Domain/Entities/Envelope.cs +++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs @@ -37,7 +37,7 @@ public class Envelope UseAccessCode = false; Documents = Enumerable.Empty().ToList(); History = Enumerable.Empty().ToList(); - Receivers = Enumerable.Empty().ToList(); + EnvelopeReceivers = Enumerable.Empty().ToList(); #endif } @@ -166,7 +166,7 @@ public class Envelope #if NET ? #endif - Receivers { get; set; } + EnvelopeReceivers { get; set; } //#if NETFRAMEWORK /// @@ -179,10 +179,10 @@ public class Envelope if (!Documents?.Any() ?? true) errors.Add(My.Resources.Envelope.Missing_Documents); - if (!Receivers?.Any() ?? true) + if (!EnvelopeReceivers?.Any() ?? true) errors.Add(My.Resources.Envelope.Missing_Receivers); - if (Receivers?.Any(r => !r.HasEmailAndName) ?? false) + if (EnvelopeReceivers?.Any(r => !r.HasEmailAndName) ?? false) errors.Add(My.Resources.Envelope.Incomplete_Receivers); return errors; diff --git a/EnvelopeGenerator.Domain/Resources/Envelope.Designer.cs b/EnvelopeGenerator.Domain/Resources/Envelope.Designer.cs index 0f1217dc..e6f8c24c 100644 --- a/EnvelopeGenerator.Domain/Resources/Envelope.Designer.cs +++ b/EnvelopeGenerator.Domain/Resources/Envelope.Designer.cs @@ -318,7 +318,7 @@ namespace My.Resources { /// public static string Incomplete_Receivers { get { - return ResourceManager.GetString("Incomplete Receivers", resourceCulture); + return ResourceManager.GetString("Incomplete EnvelopeReceivers", resourceCulture); } } @@ -381,7 +381,7 @@ namespace My.Resources { /// public static string Missing_Receivers { get { - return ResourceManager.GetString("Missing Receivers", resourceCulture); + return ResourceManager.GetString("Missing EnvelopeReceivers", resourceCulture); } } diff --git a/EnvelopeGenerator.Domain/Resources/Envelope.cs b/EnvelopeGenerator.Domain/Resources/Envelope.cs index bcef8535..8c859b9a 100644 --- a/EnvelopeGenerator.Domain/Resources/Envelope.cs +++ b/EnvelopeGenerator.Domain/Resources/Envelope.cs @@ -300,7 +300,7 @@ internal class Envelope { /// internal static string Incomplete_Receivers { get { - return ResourceManager.GetString("Incomplete Receivers", resourceCulture); + return ResourceManager.GetString("Incomplete EnvelopeReceivers", resourceCulture); } } @@ -363,7 +363,7 @@ internal class Envelope { /// internal static string Missing_Receivers { get { - return ResourceManager.GetString("Missing Receivers", resourceCulture); + return ResourceManager.GetString("Missing EnvelopeReceivers", resourceCulture); } } diff --git a/EnvelopeGenerator.Form/Controllers/BaseController.vb b/EnvelopeGenerator.Form/Controllers/BaseController.vb index 1991760b..69c50727 100644 --- a/EnvelopeGenerator.Form/Controllers/BaseController.vb +++ b/EnvelopeGenerator.Form/Controllers/BaseController.vb @@ -75,7 +75,7 @@ Public MustInherit Class BaseController Throw New ApplicationException("could not delete documents") End If - Dim oResult2 = pEnvelope.Receivers. + Dim oResult2 = pEnvelope.EnvelopeReceivers. Select(Function(r) ReceiverModel.Delete(r.Receiver.Id, pEnvelope.Id, oTransaction)). All(Function(r) r = True) diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb index f5a2dded..b033c95d 100644 --- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb +++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb @@ -30,7 +30,7 @@ Public Class EnvelopeEditorController Envelope = pEnvelope Envelope.Documents = DocumentModel.List(pEnvelope.Id).ToList() - Envelope.Receivers = ReceiverModel.ListEnvelopeReceivers(pEnvelope.Id).Cast(Of EnvelopeReceiver)().ToList() + Envelope.EnvelopeReceivers = ReceiverModel.ListEnvelopeReceivers(pEnvelope.Id).Cast(Of EnvelopeReceiver)().ToList() Thumbnail = New Thumbnail(pState.LogConfig) ActionService = New ActionService(pState, Nothing) @@ -56,7 +56,7 @@ Public Class EnvelopeEditorController If ElementModel.OneElementPerReceiverExist(Envelope.Id) = False Then - For Each receiverItem As EnvelopeReceiver In Envelope.Receivers + For Each receiverItem As EnvelopeReceiver In Envelope.EnvelopeReceivers If ElementModel.ElementsExist(Envelope.Id, receiverItem.Envelope.Id) = False Then oEnvelopeErrors.Add(String.Format(Resources.Envelope.Missing_Elements_for_Receiver, receiverItem.Name)) End If @@ -106,7 +106,7 @@ Public Class EnvelopeEditorController Dim oAllReceivers As List(Of Receiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList() - pEnvelope.Receivers.Clear() + pEnvelope.EnvelopeReceivers.Clear() For Each oReceiver In pReceiversFromGrid If oReceiver.EmailAddress Is Nothing Then Continue For @@ -118,7 +118,7 @@ Public Class EnvelopeEditorController oReceiver.Signature = oDbReceiver.Signature End If - pEnvelope.Receivers.Add(oReceiver) + pEnvelope.EnvelopeReceivers.Add(oReceiver) Next Return True @@ -395,7 +395,7 @@ Public Class EnvelopeEditorController Return False End If - Return pEnvelope.Receivers. + Return pEnvelope.EnvelopeReceivers. Select(Function(r) ReceiverModel.Assign(pEnvelope, r, pTransaction)). All(Function(pResult) pResult = True) diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index b24389c7..3b3fc32a 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -486,7 +486,7 @@ Partial Public Class frmEnvelopeEditor ' 'EnvelopeReceiverBindingSource ' - Me.EnvelopeReceiverBindingSource.DataMember = "Receivers" + Me.EnvelopeReceiverBindingSource.DataMember = "EnvelopeReceivers" Me.EnvelopeReceiverBindingSource.DataSource = GetType(EnvelopeGenerator.Form.frmEnvelopeEditor) ' 'ViewReceivers diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index 073f64c3..46181818 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -105,7 +105,7 @@ Partial Public Class frmEnvelopeEditor Else Controller = New EnvelopeEditorController(State, Envelope) Documents = New BindingList(Of EnvelopeDocument)(Controller.Envelope.Documents) - Receivers = New BindingList(Of ReceiverVM)(Controller.Envelope.Receivers.Select(Function(r) ReceiverVM.From(r)).ToList()) + Receivers = New BindingList(Of ReceiverVM)(Controller.Envelope.EnvelopeReceivers.Select(Function(r) ReceiverVM.From(r)).ToList()) For Each docItem As EnvelopeDocument In Documents If Not File.Exists(docItem.Filepath) Then @@ -233,7 +233,7 @@ Partial Public Class frmEnvelopeEditor .Document = Controller.Envelope.Documents. Where(Function(d) d.Filename = oDocument.Filename). SingleOrDefault(), - .Receivers = Controller.Envelope.Receivers.Select(Function(r) ReceiverVM.From(r)).ToList() + .Receivers = Controller.Envelope.EnvelopeReceivers.Select(Function(r) ReceiverVM.From(r)).ToList() } oForm.ShowDialog() @@ -549,7 +549,7 @@ Partial Public Class frmEnvelopeEditor ViewReceivers.DeleteRow(ViewReceivers.FocusedRowHandle) Else ' Doppelte E-Mail-Adresse? TODO - 'Dim oReceivers = Controller.Envelope.Receivers + 'Dim oReceivers = Controller.Envelope.EnvelopeReceivers CellValueChanged = True Dim oNameCellValue = ViewReceivers.GetRowCellValue(e.RowHandle, COL_NAME) If oNameCellValue Is Nothing Then diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 5b6bff20..cbdd471d 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -194,7 +194,7 @@ Partial Class frmMain Me.GridEnvelopes.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation) Me.GridEnvelopes.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType) GridLevelNode1.LevelTemplate = Me.ViewReceivers - GridLevelNode1.RelationName = "Receivers" + GridLevelNode1.RelationName = "EnvelopeReceivers" GridLevelNode2.LevelTemplate = Me.ViewHistory GridLevelNode2.RelationName = "History" Me.GridEnvelopes.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2}) @@ -580,7 +580,7 @@ Partial Class frmMain Me.GridCompleted.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation) Me.GridCompleted.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType) GridLevelNode3.LevelTemplate = Me.ViewReceiversCompleted - GridLevelNode3.RelationName = "Receivers" + GridLevelNode3.RelationName = "EnvelopeReceivers" GridLevelNode4.LevelTemplate = Me.ViewHistoryCompleted GridLevelNode4.RelationName = "History" Me.GridCompleted.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3, GridLevelNode4}) diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index a481481b..e3599db9 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -624,7 +624,7 @@ Public Class frmMain Dim oController = New EnvelopeEditorController(State, oEnvelope) Dim Documents As New BindingList(Of EnvelopeDocument) - Dim Receivers = New BindingList(Of ReceiverVM)(oController.Envelope.Receivers.Select(Function(r) ReceiverVM.From(r)).ToList()) + Dim Receivers = New BindingList(Of ReceiverVM)(oController.Envelope.EnvelopeReceivers.Select(Function(r) ReceiverVM.From(r)).ToList()) For Each oReceiver As ReceiverVM In Receivers If oReceiver.EmailAddress = selReceiver.EmailAddress Then If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then @@ -872,7 +872,7 @@ Public Class frmMain If oEnvelope.UseAccessCode = True Then Dim oController = New EnvelopeEditorController(State, oEnvelope) Dim Documents As New BindingList(Of EnvelopeDocument) - Dim Receivers = New BindingList(Of ReceiverVM)(oController.Envelope.Receivers.Select(Function(r) ReceiverVM.From(r)).ToList()) + Dim Receivers = New BindingList(Of ReceiverVM)(oController.Envelope.EnvelopeReceivers.Select(Function(r) ReceiverVM.From(r)).ToList()) For Each oReceiver As ReceiverVM In Receivers If oReceiver.EmailAddress = selReceiver.EmailAddress Then If oController.ActionService.ManuallySendAccessCode(oEnvelope, oReceiver) = True Then diff --git a/EnvelopeGenerator.Infrastructure/EGDbContext.cs b/EnvelopeGenerator.Infrastructure/EGDbContext.cs index 265c74a8..6f83103f 100644 --- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs +++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs @@ -93,6 +93,16 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext modelBuilder.Entity() .HasKey(er => new { er.EnvelopeId, er.ReceiverId }); + modelBuilder.Entity() + .HasOne(er => er.Envelope) + .WithMany(e => e.EnvelopeReceivers) + .HasForeignKey(er => er.EnvelopeId); + + modelBuilder.Entity() + .HasOne(er => er.Receiver) + .WithMany(r => r.EnvelopeReceivers) + .HasForeignKey(er => er.ReceiverId); + modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); diff --git a/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs b/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs index 9bd1a714..06cab136 100644 --- a/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs +++ b/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs @@ -1352,7 +1352,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Receiver", b => { b.HasOne("EnvelopeGenerator.Domain.Entities.Envelope", null) - .WithMany("Receivers") + .WithMany("EnvelopeReceivers") .HasForeignKey("EnvelopeId"); }); @@ -1362,7 +1362,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations b.Navigation("History"); - b.Navigation("Receivers"); + b.Navigation("EnvelopeReceivers"); }); modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeDocument", b => diff --git a/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs b/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs index ecef0449..e4e00106 100644 --- a/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs +++ b/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs @@ -1349,7 +1349,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Receiver", b => { b.HasOne("EnvelopeGenerator.Domain.Entities.Envelope", null) - .WithMany("Receivers") + .WithMany("EnvelopeReceivers") .HasForeignKey("EnvelopeId"); }); @@ -1359,7 +1359,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations b.Navigation("History"); - b.Navigation("Receivers"); + b.Navigation("EnvelopeReceivers"); }); modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeDocument", b => diff --git a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml index 5ea1fbdb..52135080 100644 --- a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml +++ b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml @@ -8,7 +8,7 @@ @functions { string encodeEnvelopeKey(Envelope envelope) { - var receiver = envelope.Receivers!.First(); + var receiver = envelope.EnvelopeReceivers!.First(); return (envelope.Uuid, receiver.Receiver!.Signature).ToEnvelopeKey(); }