From 6b1f86ed43124cdb9d9b97b7b26506b9d6d0ad2b Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Thu, 25 Jan 2024 17:21:32 +0100 Subject: [PATCH] improvements.... --- .../ServiceProviders/IAcServiceProvider.cs | 2 +- .../Users/{IUserForeignKey.cs => IAcUserForeignKey.cs} | 2 +- AyCode.Interfaces/Users/IAcUserRelation.cs | 10 +--------- .../Users/IAcUserToServiceProviderBase.cs | 2 +- AyCode.Interfaces/Users/IAcUsersRelation.cs | 9 +++++++++ AyCode.Models/Messages/EMailMessage.cs | 4 ++-- 6 files changed, 15 insertions(+), 14 deletions(-) rename AyCode.Interfaces/Users/{IUserForeignKey.cs => IAcUserForeignKey.cs} (67%) create mode 100644 AyCode.Interfaces/Users/IAcUsersRelation.cs diff --git a/AyCode.Interfaces/ServiceProviders/IAcServiceProvider.cs b/AyCode.Interfaces/ServiceProviders/IAcServiceProvider.cs index 1d491d3..f40f520 100644 --- a/AyCode.Interfaces/ServiceProviders/IAcServiceProvider.cs +++ b/AyCode.Interfaces/ServiceProviders/IAcServiceProvider.cs @@ -2,7 +2,7 @@ namespace AyCode.Interfaces.ServiceProviders; -public interface IAcServiceProvider : IAcServiceProviderBase, IAcUserListRelation +public interface IAcServiceProvider : IAcServiceProviderBase, IAcUsersRelation where TUser : class, IAcUserBase where TUserToServiceProvider : class, IAcUserToServiceProviderBase {} \ No newline at end of file diff --git a/AyCode.Interfaces/Users/IUserForeignKey.cs b/AyCode.Interfaces/Users/IAcUserForeignKey.cs similarity index 67% rename from AyCode.Interfaces/Users/IUserForeignKey.cs rename to AyCode.Interfaces/Users/IAcUserForeignKey.cs index b48f7cd..1bf4d8c 100644 --- a/AyCode.Interfaces/Users/IUserForeignKey.cs +++ b/AyCode.Interfaces/Users/IAcUserForeignKey.cs @@ -1,6 +1,6 @@ namespace AyCode.Interfaces.Users; -public interface IUserForeignKey +public interface IAcUserForeignKey { Guid UserId { get; set; } } \ No newline at end of file diff --git a/AyCode.Interfaces/Users/IAcUserRelation.cs b/AyCode.Interfaces/Users/IAcUserRelation.cs index 3045e6f..31bd928 100644 --- a/AyCode.Interfaces/Users/IAcUserRelation.cs +++ b/AyCode.Interfaces/Users/IAcUserRelation.cs @@ -3,15 +3,7 @@ using AyCode.Interfaces.ServiceProviders; namespace AyCode.Interfaces.Users; -public interface IAcUserListRelation - where TUser : class, IAcUserBase - where TUserToServiceProvider : class, IAcUserToServiceProviderBase -{ - public List Users { get; set; } - public List UserToServiceProviders { get; set; } -} - -public interface IAcUserRelation : IUserForeignKey where TUser : class, IAcUserBase +public interface IAcUserRelation : IAcUserForeignKey where TUser : class, IAcUserBase { public TUser User { get; set; } } \ No newline at end of file diff --git a/AyCode.Interfaces/Users/IAcUserToServiceProviderBase.cs b/AyCode.Interfaces/Users/IAcUserToServiceProviderBase.cs index ad62446..bc1e183 100644 --- a/AyCode.Interfaces/Users/IAcUserToServiceProviderBase.cs +++ b/AyCode.Interfaces/Users/IAcUserToServiceProviderBase.cs @@ -4,6 +4,6 @@ using AyCode.Interfaces.TimeStampInfo; namespace AyCode.Interfaces.Users; -public interface IAcUserToServiceProviderBase : IEntityGuid, IUserForeignKey, IAcServiceProviderForeignKey, ITimeStampInfo +public interface IAcUserToServiceProviderBase : IEntityGuid, IAcUserForeignKey, IAcServiceProviderForeignKey, ITimeStampInfo { } \ No newline at end of file diff --git a/AyCode.Interfaces/Users/IAcUsersRelation.cs b/AyCode.Interfaces/Users/IAcUsersRelation.cs new file mode 100644 index 0000000..54272bd --- /dev/null +++ b/AyCode.Interfaces/Users/IAcUsersRelation.cs @@ -0,0 +1,9 @@ +namespace AyCode.Interfaces.Users; + +public interface IAcUsersRelation + where TUser : class, IAcUserBase + where TUserToServiceProvider : class, IAcUserToServiceProviderBase +{ + public List Users { get; set; } + public List UserToServiceProviders { get; set; } +} \ No newline at end of file diff --git a/AyCode.Models/Messages/EMailMessage.cs b/AyCode.Models/Messages/EMailMessage.cs index ff77a17..ce94ad9 100644 --- a/AyCode.Models/Messages/EMailMessage.cs +++ b/AyCode.Models/Messages/EMailMessage.cs @@ -9,10 +9,10 @@ namespace AyCode.Models.Messages { public class EmailMessage : NoticeBase { - public EmailMessage() { } + public EmailMessage() { } public string Subject { get; set; } public string HtmlContent { get; set; } - public EmailMessage(Guid senderId, Guid receiverId, string message, string subject, string htmlContent) : base(senderId, receiverId, message ) + public EmailMessage(Guid senderId, Guid receiverId, string message, string subject, string htmlContent) : base(senderId, receiverId, message) { Subject = subject; HtmlContent = htmlContent;