From dc723d9f026135f335fe1cc2447e3960c1494949 Mon Sep 17 00:00:00 2001 From: TekH Date: Mon, 1 Sep 2025 11:17:27 +0200 Subject: [PATCH] Refactor envelope status handling and imports Updated `EnvelopeStatus` type in place of `EnvelopeStatusQuery` across multiple files, enhancing the domain model. Added `using` directives for `EnvelopeGenerator.Domain.Constants` in several files, improving clarity and maintainability. Modified import statements in Visual Basic files and repository classes to standardize imports. Overall, these changes aim to refine the structure and clarity of the codebase. --- .../Interfaces/Repositories/IEnvelopeReceiverRepository.cs | 3 ++- .../Interfaces/Services/IEnvelopeReceiverService.cs | 3 ++- .../Services/EnvelopeReceiverService.cs | 2 +- .../Jobs/FinalizeDocument/ReportItem.vb | 2 +- EnvelopeGenerator.CommonServices/Models/EmailData.vb | 4 ++-- .../Repositories/EmailTemplateRepository.cs | 2 +- .../Repositories/EnvelopeHistoryRepository.cs | 2 +- .../Repositories/EnvelopeRepository.cs | 1 + .../Repositories/EnvlopeReceiverRepository.cs | 1 + 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs b/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs index 55b32ec9..98f4a7b0 100644 --- a/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs +++ b/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs @@ -1,5 +1,6 @@ using DigitalData.Core.Abstraction.Application.Repository; using EnvelopeGenerator.Application.Envelopes.Queries; +using EnvelopeGenerator.Domain.Constants; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Interfaces.Repositories; @@ -84,7 +85,7 @@ public interface IEnvelopeReceiverRepository : ICRUDRepository /// /// - Task> ReadByUsernameAsync(string username, EnvelopeStatusQuery? min_status = null, EnvelopeStatusQuery? max_status = null, params EnvelopeStatusQuery[] ignore_statuses); + Task> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses); /// /// diff --git a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs index 1868af7f..7504a77d 100644 --- a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs +++ b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs @@ -7,6 +7,7 @@ using EnvelopeGenerator.Application.Envelopes; using EnvelopeGenerator.Application.Envelopes.Queries; using EnvelopeGenerator.Application.Receivers.Queries; using EnvelopeGenerator.Domain; +using EnvelopeGenerator.Domain.Constants; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Interfaces.Services; @@ -122,7 +123,7 @@ public interface IEnvelopeReceiverService : IBasicCRUDService /// /// - Task>> ReadByUsernameAsync(string username, EnvelopeStatusQuery? min_status = null, EnvelopeStatusQuery? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatusQuery[] ignore_statuses); + Task>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatus[] ignore_statuses); /// /// diff --git a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs index 6bfea539..92ab5cc1 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs @@ -237,7 +237,7 @@ public class EnvelopeReceiverService : BasicCRUDService /// /// - public async Task>> ReadByUsernameAsync(string username, EnvelopeStatusQuery? min_status = null, EnvelopeStatusQuery? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatusQuery[] ignore_statuses) + public async Task>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatus[] ignore_statuses) { var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses); diff --git a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb index b337402f..411162d5 100644 --- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb +++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb @@ -1,4 +1,4 @@ -Imports EnvelopeGenerator.Domain +Imports EnvelopeGenerator.Domain.Constants Imports EnvelopeGenerator.Domain.Entities Public Class ReportItem diff --git a/EnvelopeGenerator.CommonServices/Models/EmailData.vb b/EnvelopeGenerator.CommonServices/Models/EmailData.vb index d3ac11f0..a902c1cf 100644 --- a/EnvelopeGenerator.CommonServices/Models/EmailData.vb +++ b/EnvelopeGenerator.CommonServices/Models/EmailData.vb @@ -1,5 +1,5 @@ -Imports EnvelopeGenerator.CommonServices.EnvelopeGenerator.Domain.Entities -Imports EnvelopeGenerator.Domain +Imports EnvelopeGenerator.Domain +Imports EnvelopeGenerator.Domain.Constants Imports EnvelopeGenerator.Domain.Entities Public Class EmailData Public Property EmailAdress As String = "" diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs index ee8c9207..7c966f3f 100644 --- a/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs @@ -3,7 +3,7 @@ using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Application.Interfaces.Repositories; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; -using static EnvelopeGenerator.Domain.Constants; +using EnvelopeGenerator.Domain.Constants; namespace EnvelopeGenerator.Infrastructure.Repositories; diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs index 25763c41..6b8d8751 100644 --- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs @@ -2,7 +2,7 @@ using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Application.Interfaces.Repositories; using Microsoft.EntityFrameworkCore; -using EnvelopeGenerator.Domain; +using EnvelopeGenerator.Domain.Constants; namespace EnvelopeGenerator.Infrastructure.Repositories; diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs index 2a1282ae..134b3c10 100644 --- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs @@ -3,6 +3,7 @@ using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Application.Interfaces.Repositories; using Microsoft.EntityFrameworkCore; using EnvelopeGenerator.Domain; +using EnvelopeGenerator.Domain.Constants; namespace EnvelopeGenerator.Infrastructure.Repositories; diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs index d20489d8..14870415 100644 --- a/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs @@ -4,6 +4,7 @@ using EnvelopeGenerator.Application.Interfaces.Repositories; using Microsoft.EntityFrameworkCore; using DigitalData.Core.Exceptions; using EnvelopeGenerator.Domain; +using EnvelopeGenerator.Domain.Constants; namespace EnvelopeGenerator.Infrastructure.Repositories;