Adam
/
AyCode.Core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactoring EmailMessage, EmailRecipient, MessageSenderService, etc...

This commit is contained in:
jozsef.b@aycode.com 2024-04-27 19:06:15 +02:00
parent a8b4c2cb23
commit a05153b267
19 changed files with 146 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AyCode.Entities/AyCode.Entities.csproj
View File

@ -10,4 +10,8 @@
<ProjectReference Include="..\AyCode.Interfaces\AyCode.Interfaces.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Messages\" />
</ItemGroup>
</Project>

41
AyCode.Entities/Messages/AcEmailMessage.cs Normal file
View File

@ -0,0 +1,41 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Net.Mail;
using AyCode.Interfaces.Messages;
namespace AyCode.Entities.Messages;
[Table("EmailMessage")]
public abstract class AcEmailMessage<TEmailRecipient> : IAcEmailMessage<TEmailRecipient> where TEmailRecipient : IAcEmailRecipientBase
{
protected AcEmailMessage()
{
}
protected AcEmailMessage(Guid id, Guid? senderId, Guid contextId, string subject, string? text, string emailAddress) : this()
{
Id = id;
SenderId = senderId;
ContextId = contextId;
Subject = subject;
Text = text;
EmailAddress = emailAddress;
}
[Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
public Guid Id { get; set; }
public Guid ContextId { get; set; }
public Guid? SenderId { get; set; }
public virtual List<TEmailRecipient> Recipients { get; set; } = [];
[MaxLength(150)]
public string EmailAddress { get; set; }
[MaxLength(100)]
public string Subject { get; set; }
public string? Text { get; set; }
public DateTime Created { get; set; }
public DateTime Modified { get; set; }
}

35
AyCode.Entities/Messages/AcEmailRecipient.cs Normal file
View File

@ -0,0 +1,35 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Net.Mail;
using AyCode.Interfaces.Messages;
namespace AyCode.Entities.Messages;
[Table("EmailRecipient")]
public abstract class AcEmailRecipient<TEmailMessage> : IAcEmailRecipient<TEmailMessage> where TEmailMessage : IAcEmailMessageBase
{
protected AcEmailRecipient()
{
}
protected AcEmailRecipient(Guid id, Guid recipientId, Guid emailMessageId, string emailAddress) : this()
{
Id = id;
RecipientId = recipientId;
EmailMessageId = emailMessageId;
EmailAddress = emailAddress;
}
[Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
public Guid Id { get; set; }
public Guid RecipientId { get; set; }
public Guid EmailMessageId { get; set; }
public string EmailAddress { get; set; }
public virtual TEmailMessage EmailMessage { get; set; }
public DateTime Created { get; set; }
public DateTime Modified { get; set; }
}

37
AyCode.Entities/Messages/NoticeBase.cs
View File

@ -1,37 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using AyCode.Interfaces.Messages;
namespace AyCode.Entities.Messages
{
//[Table("Notices")]
//public class NoticeBase : INoticeBase
//{
// public NoticeBase() { }
// public NoticeBase(Guid senderId, Guid receiverId, string message) : this(Guid.NewGuid(), senderId, receiverId, message) { }
// public NoticeBase(Guid id, Guid senderId, Guid receiverId, string message) : this()
// {
// Id = id;
// SenderId = senderId;
// ReceiverId = receiverId;
// Message = message;
// }
// [Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
// public Guid Id { get; set; }
// public Guid SenderId { get; set; }
// public Guid ReceiverId { get; set; }
// public string Message { get; set; }
// public DateTime Created { get; set; }
// public DateTime Modified { get; set; }
//}
}

7
AyCode.Interfaces/Messages/IAcEmailMessage.cs Normal file
View File

@ -0,0 +1,7 @@
namespace AyCode.Interfaces.Messages;
public interface IAcEmailMessage<TEmailRecipient> : IAcEmailMessageBase, IAcEmailRecipientsRelation<TEmailRecipient>
where TEmailRecipient : IAcEmailRecipientBase
{
}

15
AyCode.Interfaces/Messages/IAcEmailMessageBase.cs Normal file
View File

@ -0,0 +1,15 @@
using AyCode.Interfaces.Entities;
using AyCode.Interfaces.TimeStampInfo;
using AyCode.Interfaces.Users;
namespace AyCode.Interfaces.Messages;
public interface IAcEmailMessageBase : IEntityGuid, ITimeStampInfo, IAcEmailAddress
{
public Guid ContextId { get; set; }
public Guid? SenderId { get; set; }
public string Subject { get; set; }
public string? Text { get; set; }
}

6
AyCode.Interfaces/Messages/IAcEmailMessageRelation.cs Normal file
View File

@ -0,0 +1,6 @@
namespace AyCode.Interfaces.Messages;
public interface IAcEmailMessageRelation<TEmailMessage> where TEmailMessage : IAcEmailMessageBase
{
TEmailMessage EmailMessage { get; }
}

9
AyCode.Interfaces/Messages/IAcEmailRecipient.cs Normal file
View File

@ -0,0 +1,9 @@
using System.Net.Mail;
namespace AyCode.Interfaces.Messages;
public interface IAcEmailRecipient<TEmailMessage> : IAcEmailRecipientBase, IAcEmailMessageRelation<TEmailMessage>
where TEmailMessage : IAcEmailMessageBase
{
}

11
AyCode.Interfaces/Messages/IAcEmailRecipientBase.cs Normal file
View File

@ -0,0 +1,11 @@
using AyCode.Interfaces.Entities;
using AyCode.Interfaces.TimeStampInfo;
using AyCode.Interfaces.Users;
namespace AyCode.Interfaces.Messages;
public interface IAcEmailRecipientBase : IEntityGuid, ITimeStampInfo, IAcEmailAddress
{
public Guid RecipientId { get; set; }
public Guid EmailMessageId { get; set; }
}

6
AyCode.Interfaces/Messages/IAcEmailRecipientsRelation.cs Normal file
View File

@ -0,0 +1,6 @@
namespace AyCode.Interfaces.Messages;
public interface IAcEmailRecipientsRelation<TEmailRecipient>
{
public List<TEmailRecipient> Recipients { get; set; }
}

8
AyCode.Interfaces/Messages/IAcMessageSenderService.cs Normal file
View File

@ -0,0 +1,8 @@
namespace AyCode.Interfaces.Messages;
public interface IAcMessageSenderService<TEmailMessage, TEmailRecipient>
where TEmailMessage : IAcEmailMessage<TEmailRecipient>
where TEmailRecipient : IAcEmailRecipientBase
{
public Task<string> SendMessageAsync(TEmailMessage message, int messageType);
}

8
AyCode.Interfaces/Messages/IMessageParticipants.cs
View File

@ -1,8 +0,0 @@

namespace AyCode.Interfaces.Messages
{
public interface IMessageParticipants : IMessageSender, IMessageReceiver
{
}
}

9
AyCode.Interfaces/Messages/IMessageReceiver.cs
View File

@ -1,9 +0,0 @@
using AyCode.Interfaces.Entities;
namespace AyCode.Interfaces.Messages
{
public interface IMessageReceiver : IEntityGuid
{
}
}

10
AyCode.Interfaces/Messages/IMessageSender.cs
View File

@ -1,10 +0,0 @@

using AyCode.Interfaces.Entities;
namespace AyCode.Interfaces.Messages
{
public interface IMessageSender : IEntityGuid
{
}
}

9
AyCode.Interfaces/Messages/IMessageSenderService.cs
View File

@ -1,9 +0,0 @@
using AyCode.Interfaces.Enums;
namespace AyCode.Interfaces.Messages
{
//public interface IMessageSenderService
//{
// public Task<string> SendMessageAsync<TNotice>(TNotice message, int messageType) where TNotice : class, ;
//}
}

12
AyCode.Interfaces/Messages/INoticeBase.cs
View File

@ -1,12 +0,0 @@

using AyCode.Interfaces.Entities;
using AyCode.Interfaces.Enums;
using AyCode.Interfaces.TimeStampInfo;
namespace AyCode.Interfaces.Messages
{
//public interface INoticeBase : IEntityGuid, ITimeStampInfo, IMessageParticipants
//{
// string Message { get; }
//}
}

2
AyCode.Interfaces/Users/IEmailAddress.cs → AyCode.Interfaces/Users/IAcEmailAddress.cs
View File

@ -6,7 +6,7 @@ using System.IO;
namespace AyCode.Interfaces.Users;
public interface IEmailAddress
public interface IAcEmailAddress
{
[MaxLength(150)]
string EmailAddress { get; set; }

2
AyCode.Interfaces/Users/IAcUserBase.cs
View File

@ -4,7 +4,7 @@ using AyCode.Interfaces.TimeStampInfo;
namespace AyCode.Interfaces.Users;
public interface IAcUserBase : IEntityGuid, IAcProfileForeignKey, IEmailAddress, IEmailConfirmed, IPassword, ITimeStampInfo
public interface IAcUserBase : IEntityGuid, IAcProfileForeignKey, IAcEmailAddress, IEmailConfirmed, IPassword, ITimeStampInfo
{
public string? PhoneNumber { get; set; }
public string? RefreshToken { get; set; }

6
AyCode.Services.Server/Emails/AcEmailServiceServer.cs
View File

@ -11,15 +11,13 @@ public interface IAcEmailServiceServer
}
public class AcEmailServiceServer() : IAcEmailServiceServer
{
private IConfiguration _configuration;
private readonly SendGridClient _sendGridClient;
private readonly EmailAddress _fromEmailAddress;
public AcEmailServiceServer(IConfiguration configuration) : this()
{
_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
//_sendGridClient = new SendGridClient(_configuration.ServerUserName);
//_fromEmailAddress = new EmailAddress(_configuration.FromEmail, _configuration.FromName);
_sendGridClient = new SendGridClient(configuration["SendGrid:Key"]);
_fromEmailAddress = new EmailAddress(configuration["SendGrid:FromEmail"], configuration["SendGrid:FromName"]);
//Console.WriteLine($"{config.ServerUserName}; {config.FromEmail}; {config.FromName}");
}