From 08e1187124ec32efdd518bedd9a4b02f85c2bf24 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Tue, 20 May 2025 15:14:58 +0200 Subject: [PATCH] Refactor namespaces and simplify DTOs Updated namespaces to align with the new DigitalData.Core structure, replacing `DigitalData.Core.Abstractions` with `DigitalData.Core.Application.Interfaces` and `DigitalData.Core.Client.Interface`. Removed the `IUnique` interface from several DTOs, simplifying their design and altering the handling of entity identification. Updated project files to reflect new dependency versions for improved compatibility and features. Cleaned up using directives to remove obsolete references, enhancing code maintainability. --- .../Configurations/GtxMessagingParams.cs | 2 +- .../Contracts/Repositories/IConfigRepository.cs | 2 +- .../IDocumentReceiverElementRepository.cs | 2 +- .../Repositories/IDocumentStatusRepository.cs | 2 +- .../Repositories/IEmailTemplateRepository.cs | 2 +- .../IEnvelopeCertificateRepository.cs | 2 +- .../Repositories/IEnvelopeDocumentRepository.cs | 2 +- .../Repositories/IEnvelopeHistoryRepository.cs | 2 +- .../IEnvelopeReceiverReadOnlyRepository.cs | 2 +- .../Repositories/IEnvelopeReceiverRepository.cs | 2 +- .../Repositories/IEnvelopeRepository.cs | 2 +- .../Repositories/IEnvelopeTypeRepository.cs | 2 +- .../Repositories/IReceiverRepository.cs | 2 +- .../Repositories/IUserReceiverRepository.cs | 2 +- .../Contracts/Services/IConfigService.cs | 2 +- .../Services/IDocumentReceiverElementService.cs | 2 +- .../Contracts/Services/IDocumentStatusService.cs | 2 +- .../Contracts/Services/IEmailTemplateService.cs | 2 +- .../Services/IEnvelopeCertificateService.cs | 2 +- .../Services/IEnvelopeDocumentService.cs | 2 +- .../Services/IEnvelopeHistoryService.cs | 2 +- .../Services/IEnvelopeReceiverReadOnlyService.cs | 2 +- .../Services/IEnvelopeReceiverService.cs | 2 +- .../Contracts/Services/IEnvelopeService.cs | 2 +- .../Contracts/Services/IEnvelopeTypeService.cs | 2 +- .../Contracts/Services/IReceiverService.cs | 4 ++-- .../Contracts/Services/IUserReceiverService.cs | 2 +- EnvelopeGenerator.Application/DTOs/ConfigDto.cs | 16 ++-------------- .../DTOs/DocumentReceiverElementDto.cs | 5 ++--- .../DTOs/DocumentStatusDto.cs | 5 ++--- .../DTOs/EmailTemplateDto.cs | 5 ++--- .../DTOs/EnvelopeCertificateDto.cs | 5 ++--- .../DTOs/EnvelopeDocumentDto.cs | 7 +++---- .../DTOs/EnvelopeDto.cs | 5 ++--- .../DTOs/EnvelopeTypeDto.cs | 5 ++--- .../DTOs/Receiver/ReceiverReadDto.cs | 5 ++--- .../DTOs/Receiver/ReceiverUpdateDto.cs | 5 ++--- .../DTOs/UserReceiverDto.cs | 5 ++--- .../Queries/Read/ReadDocumentQueryHandler.cs | 2 +- .../Reset/ResetEmailTemplateCommandHandler.cs | 3 +-- .../Update/UpdateEmailTemplateCommandHandler.cs | 2 +- .../EnvelopeGenerator.Application.csproj | 7 +++---- .../Services/EnvelopeHistoryService.cs | 3 ++- .../Services/GTXSmsSender.cs | 2 +- .../Services/ReceiverService.cs | 7 +++---- EnvelopeGenerator.Domain/Entities/Config.cs | 6 ------ .../Entities/EnvelopeReceiverBase.cs | 2 +- .../EnvelopeGenerator.GeneratorAPI.csproj | 3 +-- .../EnvelopeGenerator.Infrastructure.csproj | 4 ++-- .../EnvelopeGenerator.Terminal.csproj | 4 ++-- .../EnvelopeGenerator.Tests.Application.csproj | 6 +++--- .../EnvelopeGenerator.Web.csproj | 2 +- 52 files changed, 73 insertions(+), 104 deletions(-) diff --git a/EnvelopeGenerator.Application/Configurations/GtxMessagingParams.cs b/EnvelopeGenerator.Application/Configurations/GtxMessagingParams.cs index 837baf7d..60365683 100644 --- a/EnvelopeGenerator.Application/Configurations/GtxMessagingParams.cs +++ b/EnvelopeGenerator.Application/Configurations/GtxMessagingParams.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Client; +using DigitalData.Core.Client.Interface; namespace EnvelopeGenerator.Application.Configurations; /// diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IConfigRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IConfigRepository.cs index a2969fdd..cf364a8b 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IConfigRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IConfigRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IDocumentReceiverElementRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IDocumentReceiverElementRepository.cs index e01a9a0f..cdb980ee 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IDocumentReceiverElementRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IDocumentReceiverElementRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IDocumentStatusRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IDocumentStatusRepository.cs index 53d0f8e6..bf39dbee 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IDocumentStatusRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IDocumentStatusRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs index eee57f90..a458d74e 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEmailTemplateRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; using static EnvelopeGenerator.Common.Constants; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs index 0ab44c65..f3396eb3 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeDocumentRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeDocumentRepository.cs index f05cdfc5..ed818c86 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeDocumentRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeDocumentRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeHistoryRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeHistoryRepository.cs index e4ce226c..36b59316 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeHistoryRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeHistoryRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverReadOnlyRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverReadOnlyRepository.cs index f10f1f73..75e2c4cc 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverReadOnlyRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverReadOnlyRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverRepository.cs index d4aff70c..5537ab64 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeRepository.cs index 88ba257c..c6a112e8 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeTypeRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeTypeRepository.cs index e54b7697..74f02763 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeTypeRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeTypeRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IReceiverRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IReceiverRepository.cs index 3095d488..865a7341 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IReceiverRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IReceiverRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Repositories/IUserReceiverRepository.cs b/EnvelopeGenerator.Application/Contracts/Repositories/IUserReceiverRepository.cs index d0181151..299317a2 100644 --- a/EnvelopeGenerator.Application/Contracts/Repositories/IUserReceiverRepository.cs +++ b/EnvelopeGenerator.Application/Contracts/Repositories/IUserReceiverRepository.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Repositories; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IConfigService.cs b/EnvelopeGenerator.Application/Contracts/Services/IConfigService.cs index fe0569e0..f9ffdc86 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IConfigService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IConfigService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IDocumentReceiverElementService.cs b/EnvelopeGenerator.Application/Contracts/Services/IDocumentReceiverElementService.cs index cc398a27..3f259557 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IDocumentReceiverElementService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IDocumentReceiverElementService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IDocumentStatusService.cs b/EnvelopeGenerator.Application/Contracts/Services/IDocumentStatusService.cs index 2ba09003..3c3ae845 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IDocumentStatusService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IDocumentStatusService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Contracts.Services; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs index 6a7f8ec2..be0ea002 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs index 279e6aae..d6ce486c 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeDocumentService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeDocumentService.cs index 3463b6c9..1c3a8c2d 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeDocumentService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeDocumentService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs index 9ef1bb4e..3427f4de 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs.EnvelopeHistory; using EnvelopeGenerator.Application.DTOs.Receiver; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverReadOnlyService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverReadOnlyService.cs index 22e27811..e715382b 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverReadOnlyService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverReadOnlyService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs index 01075025..bf759987 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs @@ -1,5 +1,5 @@ using CommandDotNet; -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver; using EnvelopeGenerator.Application.DTOs.Messaging; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeService.cs index 1435f326..0577bd2f 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeTypeService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeTypeService.cs index ef8f721b..0766418c 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeTypeService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeTypeService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/Contracts/Services/IReceiverService.cs b/EnvelopeGenerator.Application/Contracts/Services/IReceiverService.cs index f56a7958..b186034f 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IReceiverService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IReceiverService.cs @@ -1,5 +1,5 @@ using DigitalData.Core.Abstractions; -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs.Receiver; using EnvelopeGenerator.Domain.Entities; @@ -12,5 +12,5 @@ public interface IReceiverService : ICRUDService DeleteByAsync(string? emailAddress = null, string? signature = null); - Task UpdateAsync(TUpdateDto updateDto) where TUpdateDto : IUnique; + Task UpdateAsync(TUpdateDto updateDto); } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/Contracts/Services/IUserReceiverService.cs b/EnvelopeGenerator.Application/Contracts/Services/IUserReceiverService.cs index e2b7db9a..4ea378a3 100644 --- a/EnvelopeGenerator.Application/Contracts/Services/IUserReceiverService.cs +++ b/EnvelopeGenerator.Application/Contracts/Services/IUserReceiverService.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Application; +using DigitalData.Core.Application.Interfaces; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/DTOs/ConfigDto.cs b/EnvelopeGenerator.Application/DTOs/ConfigDto.cs index 17dfc4ff..5952cc48 100644 --- a/EnvelopeGenerator.Application/DTOs/ConfigDto.cs +++ b/EnvelopeGenerator.Application/DTOs/ConfigDto.cs @@ -1,7 +1,4 @@ -using DigitalData.Core.Abstractions; -using Microsoft.AspNetCore.Mvc; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text.Json.Serialization; +using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs; @@ -9,7 +6,7 @@ namespace EnvelopeGenerator.Application.DTOs; /// Data Transfer Object representing configuration settings. /// [ApiExplorerSettings(IgnoreApi = true)] -public class ConfigDto : IUnique +public class ConfigDto { /// /// Gets or sets the path to the document. @@ -35,13 +32,4 @@ public class ConfigDto : IUnique /// Gets or sets the path where exports will be saved. /// public string ExportPath { get; set; } - - /// - /// Gets the ID of the configuration. - /// This DTO represents a single row in the database and does not support an ID. - /// - [NotMapped] - [JsonIgnore] - [Obsolete("Configuration does not have an ID; it represents a single table in the database.")] - public int Id => throw new InvalidOperationException("This configuration does not support an ID as it represents a single row in the database."); } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs b/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs index 8927357b..fa401c02 100644 --- a/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs +++ b/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs; @@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Application.DTOs; /// Data Transfer Object representing a positioned element assigned to a document receiver. /// [ApiExplorerSettings(IgnoreApi = true)] -public class DocumentReceiverElementDto : IUnique +public class DocumentReceiverElementDto { /// /// Gets or sets the unique identifier of the element. diff --git a/EnvelopeGenerator.Application/DTOs/DocumentStatusDto.cs b/EnvelopeGenerator.Application/DTOs/DocumentStatusDto.cs index 681ba505..02cc1e0c 100644 --- a/EnvelopeGenerator.Application/DTOs/DocumentStatusDto.cs +++ b/EnvelopeGenerator.Application/DTOs/DocumentStatusDto.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs; @@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Application.DTOs; /// Data Transfer Object representing the status of a document for a specific receiver. /// [ApiExplorerSettings(IgnoreApi = true)] -public class DocumentStatusDto : IUnique +public class DocumentStatusDto { /// /// Gets or sets the unique identifier of the document status entry. diff --git a/EnvelopeGenerator.Application/DTOs/EmailTemplateDto.cs b/EnvelopeGenerator.Application/DTOs/EmailTemplateDto.cs index d9b82487..0bd67944 100644 --- a/EnvelopeGenerator.Application/DTOs/EmailTemplateDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EmailTemplateDto.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs { @@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Application.DTOs /// /// [ApiExplorerSettings(IgnoreApi = true)] - public record EmailTemplateDto : IUnique + public record EmailTemplateDto { /// /// diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs index d7782e64..9b8a2570 100644 --- a/EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs; @@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Application.DTOs; /// Data Transfer Object representing certificate information for an envelope. /// [ApiExplorerSettings(IgnoreApi = true)] -public class EnvelopeCertificateDto : IUnique +public class EnvelopeCertificateDto { /// /// Gets the unique identifier of the certificate. diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs index 92139c3f..d387de5c 100644 --- a/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs; @@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Application.DTOs; /// Data Transfer Object representing a document within an envelope, including optional binary data and form elements. /// [ApiExplorerSettings(IgnoreApi = true)] -public class EnvelopeDocumentDto : IUnique +public class EnvelopeDocumentDto { /// /// Gets or sets the unique identifier of the document. @@ -33,4 +32,4 @@ public class EnvelopeDocumentDto : IUnique /// Gets or sets the collection of elements associated with the document for receiver interactions, if any. /// public IEnumerable? Elements { get; set; } -} +} \ No newline at end of file diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs index e1e82489..4a9ea070 100644 --- a/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes; +using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes; using DigitalData.UserManager.Application.DTOs.User; using EnvelopeGenerator.Domain.Entities; using Microsoft.AspNetCore.Mvc; @@ -7,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs; [ApiExplorerSettings(IgnoreApi = true)] -public record EnvelopeDto : IUnique +public record EnvelopeDto { public int Id { get; set; } diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeTypeDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeTypeDto.cs index 6ab24f4c..f00dba2a 100644 --- a/EnvelopeGenerator.Application/DTOs/EnvelopeTypeDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EnvelopeTypeDto.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs; @@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Application.DTOs; /// Data Transfer Object representing a type of envelope with its configuration settings. /// [ApiExplorerSettings(IgnoreApi = true)] -public class EnvelopeTypeDto : IUnique +public class EnvelopeTypeDto { /// /// Gets or sets the unique identifier of the envelope type. diff --git a/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs b/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs index c7e7f6ed..1b1d75dd 100644 --- a/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs +++ b/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs @@ -1,12 +1,11 @@ -using DigitalData.Core.Abstractions; -using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver; +using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver; using Microsoft.AspNetCore.Mvc; using System.Text.Json.Serialization; namespace EnvelopeGenerator.Application.DTOs.Receiver; [ApiExplorerSettings(IgnoreApi = true)] -public class ReceiverReadDto : IUnique +public class ReceiverReadDto { public int Id { get; set; } diff --git a/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs b/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs index 203df159..aebbaecd 100644 --- a/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs +++ b/EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs.Receiver; @@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Application.DTOs.Receiver; /// Data Transfer Object for updating a receiver's information. /// [ApiExplorerSettings(IgnoreApi = true)] -public class ReceiverUpdateDto : IUnique +public class ReceiverUpdateDto { /// /// Gets or sets the unique identifier of the receiver. diff --git a/EnvelopeGenerator.Application/DTOs/UserReceiverDto.cs b/EnvelopeGenerator.Application/DTOs/UserReceiverDto.cs index b46c3e0c..eb9f5d66 100644 --- a/EnvelopeGenerator.Application/DTOs/UserReceiverDto.cs +++ b/EnvelopeGenerator.Application/DTOs/UserReceiverDto.cs @@ -1,5 +1,4 @@ -using DigitalData.Core.Abstractions; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; namespace EnvelopeGenerator.Application.DTOs; @@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Application.DTOs; /// Data Transfer Object representing a user receiver with associated details. /// [ApiExplorerSettings(IgnoreApi = true)] -public class UserReceiverDto : IUnique +public class UserReceiverDto { /// /// Gets or sets the unique identifier of the user receiver. diff --git a/EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentQueryHandler.cs b/EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentQueryHandler.cs index f27cfa1a..f074d6d2 100644 --- a/EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentQueryHandler.cs +++ b/EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentQueryHandler.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Domain.Entities; using MediatR; diff --git a/EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommandHandler.cs b/EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommandHandler.cs index ab5300cf..64c81c1a 100644 --- a/EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommandHandler.cs +++ b/EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommandHandler.cs @@ -1,6 +1,5 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Application.DTOs; -using EnvelopeGenerator.Application.EmailTemplates.Queries.Read; using EnvelopeGenerator.Domain.Entities; using MediatR; diff --git a/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs b/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs index 4912e2e6..10d4e6f1 100644 --- a/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs +++ b/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs @@ -1,4 +1,4 @@ -using DigitalData.Core.Abstractions.Infrastructure; +using DigitalData.Core.Application.Interfaces.Repository; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Application.Exceptions; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj index 55f7b6fb..7cb16ce6 100644 --- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj +++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj @@ -15,15 +15,14 @@ - - - + + - + diff --git a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs index 4c07280e..dc479812 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs @@ -7,6 +7,7 @@ using DigitalData.Core.DTO; using EnvelopeGenerator.Application.DTOs.EnvelopeHistory; using EnvelopeGenerator.Application.DTOs.Receiver; using EnvelopeGenerator.Application.Contracts.Services; +using DigitalData.Core.Application.DTO; namespace EnvelopeGenerator.Application.Services; @@ -85,7 +86,7 @@ public class EnvelopeHistoryService : CRUDService Result.Success(id), + Success: dto => Result.Success(dto.Id), Fail: (mssg, ntc) => Result.Fail().Message(mssg).Notice(ntc) ); } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/Services/GTXSmsSender.cs b/EnvelopeGenerator.Application/Services/GTXSmsSender.cs index 0449887c..9ad767c1 100644 --- a/EnvelopeGenerator.Application/Services/GTXSmsSender.cs +++ b/EnvelopeGenerator.Application/Services/GTXSmsSender.cs @@ -1,5 +1,5 @@ using AutoMapper; -using DigitalData.Core.Abstractions.Client; +using DigitalData.Core.Client.Interface; using DigitalData.Core.Client; using EnvelopeGenerator.Application.Configurations; using EnvelopeGenerator.Application.Contracts.Services; diff --git a/EnvelopeGenerator.Application/Services/ReceiverService.cs b/EnvelopeGenerator.Application/Services/ReceiverService.cs index 2b587daa..72f12bfe 100644 --- a/EnvelopeGenerator.Application/Services/ReceiverService.cs +++ b/EnvelopeGenerator.Application/Services/ReceiverService.cs @@ -4,7 +4,6 @@ using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Application.Contracts.Repositories; using EnvelopeGenerator.Application.DTOs.Receiver; using DigitalData.Core.DTO; -using DigitalData.Core.Abstractions; using Microsoft.Extensions.Logging; using EnvelopeGenerator.Application.Contracts.Services; @@ -37,12 +36,12 @@ public class ReceiverService : CRUDService UpdateAsync(TUpdateDto updateDto) where TUpdateDto : IUnique + public virtual async Task UpdateAsync(TUpdateDto updateDto) { - var val = await _repository.ReadByIdAsync(updateDto.Id); + var val = await _repository.ReadByIdAsync(updateDto.GetId()); if (val == null) { - return Result.Fail().Notice(LogLevel.Warning, Flag.NotFound, $"{updateDto.Id} is not found in update process of {GetType()} entity."); + return Result.Fail().Notice(LogLevel.Warning, Flag.NotFound, $"{updateDto.GetIdOrDefault()} is not found in update process of {GetType()} entity."); } var entity = _mapper.Map(updateDto, val); diff --git a/EnvelopeGenerator.Domain/Entities/Config.cs b/EnvelopeGenerator.Domain/Entities/Config.cs index 22e0f9fb..65d4263a 100644 --- a/EnvelopeGenerator.Domain/Entities/Config.cs +++ b/EnvelopeGenerator.Domain/Entities/Config.cs @@ -1,6 +1,5 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text.Json.Serialization; namespace EnvelopeGenerator.Domain.Entities { @@ -22,10 +21,5 @@ namespace EnvelopeGenerator.Domain.Entities [Column("EXPORT_PATH", TypeName = "nvarchar(256)")] public string ExportPath { get; set; } - - [Obsolete("Configuration does not have an ID; it represents a single table in the database.")] - [NotMapped] - [JsonIgnore] - public int Id => throw new InvalidOperationException("This configuration does not support an ID as it represents a single table in the database."); } } \ No newline at end of file diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs index 8e2312c3..e62f94b4 100644 --- a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs +++ b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs @@ -46,7 +46,7 @@ namespace EnvelopeGenerator.Domain.Entities public string PhoneNumber { get; set; } [NotMapped] - public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId); + public Tuple Id => Tuple.Create(EnvelopeId, ReceiverId); [NotMapped] public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber); diff --git a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj index 67b5a332..add8539e 100644 --- a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj +++ b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj @@ -28,8 +28,7 @@ - - + diff --git a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj index 7697e068..9e0d1192 100644 --- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj +++ b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj @@ -31,8 +31,8 @@ - - + + diff --git a/EnvelopeGenerator.Terminal/EnvelopeGenerator.Terminal.csproj b/EnvelopeGenerator.Terminal/EnvelopeGenerator.Terminal.csproj index 7acd1d20..cc3df0bd 100644 --- a/EnvelopeGenerator.Terminal/EnvelopeGenerator.Terminal.csproj +++ b/EnvelopeGenerator.Terminal/EnvelopeGenerator.Terminal.csproj @@ -20,12 +20,12 @@ - + - + diff --git a/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj b/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj index f3b9aab3..c50134be 100644 --- a/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj +++ b/EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj @@ -25,16 +25,16 @@ - + - + - + diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj index 2b730e34..92e081ab 100644 --- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj +++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj @@ -2103,7 +2103,7 @@ - +