diff --git a/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes.csproj b/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes.csproj
index c6936f5..d4a96ca 100644
--- a/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes.csproj
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes.csproj
@@ -36,4 +36,22 @@
+
+
+ 1.0.0
+
+
+
+
+
+ 1.0.0
+
+
+
+
+
+ 1.0.0
+
+
+
diff --git a/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutRepository.cs b/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutRepository.cs
index 892c41f..c3e6865 100644
--- a/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutRepository.cs
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutRepository.cs
@@ -1,8 +1,9 @@
-using DigitalData.Core.Abstractions.Infrastructure;
+using DigitalData.Core.Abstraction.Application.Repository;
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
namespace DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
+[Obsolete("Use IRepository")]
public interface IEmailOutRepository : ICRUDRepository
{
}
\ No newline at end of file
diff --git a/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutService.cs b/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutService.cs
index c4d906b..7b74319 100644
--- a/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutService.cs
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutService.cs
@@ -1,10 +1,11 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application;
+using DigitalData.Core.Abstraction.Application.DTO;
using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
namespace DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
+[Obsolete("Use MediatR")]
public interface IEmailOutService : ICRUDService
{
Task> CreateWithTemplateAsync(EmailOutCreateDto createDto, params object[] models);
diff --git a/DigitalData.EmailProfilerDispatcher.Abstraction/DTOs/EmailOut/EmailOutDto.cs b/DigitalData.EmailProfilerDispatcher.Abstraction/DTOs/EmailOut/EmailOutDto.cs
index 09250c6..1b9a872 100644
--- a/DigitalData.EmailProfilerDispatcher.Abstraction/DTOs/EmailOut/EmailOutDto.cs
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction/DTOs/EmailOut/EmailOutDto.cs
@@ -1,27 +1,24 @@
-using DigitalData.Core.Abstractions;
+namespace DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
-namespace DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut
-{
- public record EmailOutDto(
- int Id,
- int ReminderTypeId,
- int SendingProfile,
- int ReferenceId,
- string? ReferenceString,
- int? EntityId,
- int WfId,
- string? WfReference,
- string EmailAddress,
- string EmailSubj,
- string EmailBody,
- string? EmailAttmt1,
- DateTime? EmailSent,
- string? Comment,
- string AddedWho,
- DateTime? AddedWhen,
- string? ChangedWho,
- DateTime? ChangedWhen,
- DateTime? ErrorTimestamp,
- string? ErrorMsg
- ) : IUnique;
-}
\ No newline at end of file
+public record EmailOutDto(
+ int Id,
+ int ReminderTypeId,
+ int SendingProfile,
+ int ReferenceId,
+ string? ReferenceString,
+ int? EntityId,
+ int WfId,
+ string? WfReference,
+ string EmailAddress,
+ string EmailSubj,
+ string EmailBody,
+ string? EmailAttmt1,
+ DateTime? EmailSent,
+ string? Comment,
+ string AddedWho,
+ DateTime? AddedWhen,
+ string? ChangedWho,
+ DateTime? ChangedWhen,
+ DateTime? ErrorTimestamp,
+ string? ErrorMsg
+);
\ No newline at end of file
diff --git a/DigitalData.EmailProfilerDispatcher.Abstraction/DigitalData.EmailProfilerDispatcher.Abstraction.csproj b/DigitalData.EmailProfilerDispatcher.Abstraction/DigitalData.EmailProfilerDispatcher.Abstraction.csproj
index acf0011..d053b22 100644
--- a/DigitalData.EmailProfilerDispatcher.Abstraction/DigitalData.EmailProfilerDispatcher.Abstraction.csproj
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction/DigitalData.EmailProfilerDispatcher.Abstraction.csproj
@@ -12,9 +12,9 @@
icon.png
http://git.dd:3000/AppStd/EmailProfilerDispatcher.git
digital data email dispatcher abstraction
- 3.0.0
- 3.0.0
- 3.0.0
+ 3.1.0
+ 3.1.0
+ 3.1.0
@@ -25,7 +25,8 @@
-
+
+
diff --git a/DigitalData.EmailProfilerDispatcher.Abstraction/Entities/EmailOut.cs b/DigitalData.EmailProfilerDispatcher.Abstraction/Entities/EmailOut.cs
index 90de1e6..75e7489 100644
--- a/DigitalData.EmailProfilerDispatcher.Abstraction/Entities/EmailOut.cs
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction/Entities/EmailOut.cs
@@ -1,12 +1,11 @@
-using DigitalData.Core.Abstractions;
-using System.ComponentModel;
+using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace DigitalData.EmailProfilerDispatcher.Abstraction.Entities
{
[Table("TBEMLP_EMAIL_OUT")]
- public class EmailOut : IUnique
+ public class EmailOut
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
diff --git a/DigitalData.EmailProfilerDispatcher.sln b/DigitalData.EmailProfilerDispatcher.sln
index 489fa16..e50b344 100644
--- a/DigitalData.EmailProfilerDispatcher.sln
+++ b/DigitalData.EmailProfilerDispatcher.sln
@@ -42,8 +42,8 @@ Global
{DF202B1D-6C6F-4354-9B73-20F03486D020}.Debug|Any CPU.Build.0 = Release|Any CPU
{DF202B1D-6C6F-4354-9B73-20F03486D020}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF202B1D-6C6F-4354-9B73-20F03486D020}.Release|Any CPU.Build.0 = Release|Any CPU
- {16785881-75BA-4721-9A0C-B469FAA95D95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {16785881-75BA-4721-9A0C-B469FAA95D95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {16785881-75BA-4721-9A0C-B469FAA95D95}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+ {16785881-75BA-4721-9A0C-B469FAA95D95}.Debug|Any CPU.Build.0 = Release|Any CPU
{16785881-75BA-4721-9A0C-B469FAA95D95}.Release|Any CPU.ActiveCfg = Release|Any CPU
{16785881-75BA-4721-9A0C-B469FAA95D95}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
diff --git a/DigitalData.EmailProfilerDispatcher/DigitalData.EmailProfilerDispatcher.csproj b/DigitalData.EmailProfilerDispatcher/DigitalData.EmailProfilerDispatcher.csproj
index cbee35c..d4bbf87 100644
--- a/DigitalData.EmailProfilerDispatcher/DigitalData.EmailProfilerDispatcher.csproj
+++ b/DigitalData.EmailProfilerDispatcher/DigitalData.EmailProfilerDispatcher.csproj
@@ -5,7 +5,7 @@
enable
enable
DigitalData.EmailProfilerDispatcher
- 3.0.0
+ 3.1.0
Digital Data GmbH
Copyright 2024
icon.png
@@ -13,8 +13,8 @@
DigitalData.EmailProfilerDispatcher enables adding data to the Email Profiler's SQL tables for systematic and batch email dispatching. It also supports dynamic and automatic template filling using attributes, allowing object property values to populate email templates.
Digital Data GmbH
http://git.dd:3000/AppStd/EmailProfilerDispatcher.git
- 3.0.0
- 3.0.0
+ 3.1.0
+ 3.1.0
@@ -25,9 +25,8 @@
-
-
-
+
+
diff --git a/DigitalData.EmailProfilerDispatcher/Repositories/EmailOutRepository.cs b/DigitalData.EmailProfilerDispatcher/Repositories/EmailOutRepository.cs
index 29c8457..2ea61c2 100644
--- a/DigitalData.EmailProfilerDispatcher/Repositories/EmailOutRepository.cs
+++ b/DigitalData.EmailProfilerDispatcher/Repositories/EmailOutRepository.cs
@@ -1,15 +1,16 @@
-using DigitalData.Core.Infrastructure;
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Infrastructure;
using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
using Microsoft.EntityFrameworkCore;
-namespace DigitalData.EmailProfilerDispatcher.Repositories
+namespace DigitalData.EmailProfilerDispatcher.Repositories;
+
+[Obsolete("Use IRepository")]
+public class EmailOutRepository : CRUDRepository, IEmailOutRepository
+ where TDbContext : DbContext, IMailDbContext
{
- public class EmailOutRepository : CRUDRepository, IEmailOutRepository
- where TDbContext : DbContext, IMailDbContext
+ public EmailOutRepository(TDbContext dbContext) : base(dbContext, dbContext.EMailOuts)
{
- public EmailOutRepository(TDbContext dbContext) : base(dbContext, dbContext.EMailOuts)
- {
- }
}
-}
\ No newline at end of file
+}
diff --git a/DigitalData.EmailProfilerDispatcher/Services/EmailOutService.cs b/DigitalData.EmailProfilerDispatcher/Services/EmailOutService.cs
index b4bf8a6..336f389 100644
--- a/DigitalData.EmailProfilerDispatcher/Services/EmailOutService.cs
+++ b/DigitalData.EmailProfilerDispatcher/Services/EmailOutService.cs
@@ -1,6 +1,6 @@
using AutoMapper;
using DigitalData.Core.Application;
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
@@ -18,7 +18,7 @@ namespace DigitalData.EmailProfilerDispatcher.Abstraction.Services;
createDto.EmailSubj = createDto.EmailSubj.FillTemplate(models);
createDto.EmailBody = createDto.EmailBody.FillTemplate(models);
- return await base.CreateAsync(createDto);
+ return await base.CreateAsync(createDto).ThenAsync(email => Result.Success(email.Id), (msg, ntc) => Result.Fail().Message(msg).Notice(ntc));
}
public async Task> CreateWithTemplateAsync(EmailOutCreateDto createDto, Dictionary placeholders, params object[] models)
diff --git a/EmailProfilerDispatcher.Tests/EmailProfilerDispatcher.Tests.csproj b/EmailProfilerDispatcher.Tests/EmailProfilerDispatcher.Tests.csproj
index 8b7d9f0..39dc15c 100644
--- a/EmailProfilerDispatcher.Tests/EmailProfilerDispatcher.Tests.csproj
+++ b/EmailProfilerDispatcher.Tests/EmailProfilerDispatcher.Tests.csproj
@@ -1,4 +1,4 @@
-
+
net7.0
@@ -11,7 +11,8 @@
-
+
+