From b3cda2dcce7671d4cf4edbee7b75fc41b20c35aa Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Sun, 26 May 2024 09:12:54 +0200 Subject: [PATCH] Add Profile to ServiceProvider; ServiceProvider to Company in progress... --- Mango.Core/Loggers/ConsoleLogWriter.cs | 17 ++++++++++ Mango.Core/Loggers/Logger.cs | 19 +++++++++++ .../Mango.Database.Test.csproj | 8 ++--- Mango.Database.Test/appsettings.json | 23 +++++++++++-- Mango.Database/DbLogWriter.cs | 26 +++++++++++++++ Mango.Database/Mango.Database.csproj | 6 ++-- Mango.Entities/Companies/Company.cs | 3 +- Mango.Entities/Users/UserToCompany.cs | 2 +- Mango.Interfaces/Companies/ICompany.cs | 5 ++- Mango.Interfaces/Companies/ICompanyBase.cs | 2 +- Mango.Interfaces/Users/IUserToCompany.cs | 2 +- Mango.Interfaces/Users/IUserToCompanyBase.cs | 2 +- .../LoginServices/LoginServiceServerTests.cs | 32 ++++++++++++++++--- .../Mango.Services.Server.Tests.csproj | 2 +- Mango.Services.Server.Tests/appsettings.json | 19 ++++++++++- .../Mango.Services.Server.csproj | 2 +- .../MissNationBlazorHybrid.csproj | 6 ++-- .../Client/MissNationBlazorWASM.Client.csproj | 4 +-- .../Server/MissNationBlazorWASM.Server.csproj | 2 +- .../Shared/MissNationBlazorWASM.Shared.csproj | 2 +- MissNationSharedUI/MissNationSharedUI.csproj | 4 +-- 21 files changed, 156 insertions(+), 32 deletions(-) create mode 100644 Mango.Core/Loggers/ConsoleLogWriter.cs create mode 100644 Mango.Core/Loggers/Logger.cs create mode 100644 Mango.Database/DbLogWriter.cs diff --git a/Mango.Core/Loggers/ConsoleLogWriter.cs b/Mango.Core/Loggers/ConsoleLogWriter.cs new file mode 100644 index 0000000..403f007 --- /dev/null +++ b/Mango.Core/Loggers/ConsoleLogWriter.cs @@ -0,0 +1,17 @@ +using AyCode.Core.Enums; +using AyCode.Core.Loggers; + +namespace Mango.Core.Loggers; + +public class ConsoleLogWriter : AcConsoleLogWriter +{ + public ConsoleLogWriter() : this(null) + { } + + public ConsoleLogWriter(string? categoryName = null) : base(categoryName) + { } + + public ConsoleLogWriter(AppType appType, LogLevel logLevel, string? callerClassName = null) : base(appType, logLevel, callerClassName) + { + } +} \ No newline at end of file diff --git a/Mango.Core/Loggers/Logger.cs b/Mango.Core/Loggers/Logger.cs new file mode 100644 index 0000000..fa79afe --- /dev/null +++ b/Mango.Core/Loggers/Logger.cs @@ -0,0 +1,19 @@ +using AyCode.Core.Enums; +using AyCode.Core.Loggers; + +namespace Mango.Core.Loggers; + +public class Logger : AcLoggerBase +{ + public Logger() : this(null) + { } + + public Logger(string? categoryName) : base(categoryName) + { } + + public Logger(string? categoryName, params IAcLogWriterBase[] logWriters) : base(categoryName, logWriters) + { } + + public Logger(AppType appType, LogLevel logLevel, string? categoryName, params IAcLogWriterBase[] logWriters) : base(appType, logLevel, categoryName, logWriters) + { } +} \ No newline at end of file diff --git a/Mango.Database.Test/Mango.Database.Test.csproj b/Mango.Database.Test/Mango.Database.Test.csproj index 480e5dc..bcbad3b 100644 --- a/Mango.Database.Test/Mango.Database.Test.csproj +++ b/Mango.Database.Test/Mango.Database.Test.csproj @@ -24,10 +24,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/Mango.Database.Test/appsettings.json b/Mango.Database.Test/appsettings.json index 780df2e..c9c3222 100644 --- a/Mango.Database.Test/appsettings.json +++ b/Mango.Database.Test/appsettings.json @@ -1,6 +1,7 @@ { "ConnectionStrings": { - "DeveloperDbConnection": "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" + "DeveloperDbConnection": + "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true" }, "Logging": { "LogLevel": { @@ -17,6 +18,24 @@ "SendGrid": { //"Key": "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" "Key": "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" - } + }, + "AyCode": { + "ProjectId": "684f34d1-163a-4077-918f-a9d9df5ce789", + "Logger": { + "AppType": "Server", + "LogLevel": "Detail", + "LogWriters": [ + { + "LogLevel": "Detail", + "LogWriterType": "Mango.Core.Loggers.ConsoleLogWriter, Mango.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" + }, + { + "LogLevel": "Detail", + "LogWriterType": "Mango.Database.DbLogItemWriter, Mango.Database, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" + } + ] + } + } } + diff --git a/Mango.Database/DbLogWriter.cs b/Mango.Database/DbLogWriter.cs new file mode 100644 index 0000000..8266533 --- /dev/null +++ b/Mango.Database/DbLogWriter.cs @@ -0,0 +1,26 @@ +using AyCode.Core.Enums; +using AyCode.Core.Loggers; +using AyCode.Database; +using AyCode.Database.DbContexts.Loggers; +using AyCode.Entities.LogItems; +using AyCode.Entities.Server.LogItems; + +namespace Mango.Database; + +public class LoggerDbContextBase : AcLoggerDbContextBase +{ + +} + +public class DbLogItemWriter : AcDbLogItemWriter +{ + public DbLogItemWriter() : this(null) + { } + + public DbLogItemWriter(string? categoryName = null) : base(categoryName) + { } + + public DbLogItemWriter(AppType appType, LogLevel logLevel, string? categoryName = null) : base(appType, logLevel, categoryName) + { + } +} \ No newline at end of file diff --git a/Mango.Database/Mango.Database.csproj b/Mango.Database/Mango.Database.csproj index 3a367bd..717a25b 100644 --- a/Mango.Database/Mango.Database.csproj +++ b/Mango.Database/Mango.Database.csproj @@ -53,9 +53,9 @@ - - - + + + diff --git a/Mango.Entities/Companies/Company.cs b/Mango.Entities/Companies/Company.cs index ba6e1b6..3fba163 100644 --- a/Mango.Entities/Companies/Company.cs +++ b/Mango.Entities/Companies/Company.cs @@ -1,12 +1,13 @@ using System.ComponentModel.DataAnnotations.Schema; using AyCode.Entities.ServiceProviders; +using Mango.Entities.Profiles; using Mango.Entities.Users; using Mango.Interfaces.Companies; namespace Mango.Entities.Companies; [Table("ServiceProviders")] -public class Company : AcServiceProvider, ICompany, ICompanyBase +public class Company : AcCompany, ICompany, ICompanyBase { public Company() { diff --git a/Mango.Entities/Users/UserToCompany.cs b/Mango.Entities/Users/UserToCompany.cs index 65705ee..056c6e5 100644 --- a/Mango.Entities/Users/UserToCompany.cs +++ b/Mango.Entities/Users/UserToCompany.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace Mango.Entities.Users; [Table("UserToServiceProvider")] -public class UserToCompany : AcUserToServiceProvider, IUserToCompany +public class UserToCompany : AcUserToCompany, IUserToCompany { } \ No newline at end of file diff --git a/Mango.Interfaces/Companies/ICompany.cs b/Mango.Interfaces/Companies/ICompany.cs index 5f4417e..f06b1a3 100644 --- a/Mango.Interfaces/Companies/ICompany.cs +++ b/Mango.Interfaces/Companies/ICompany.cs @@ -1,11 +1,14 @@ using AyCode.Interfaces.ServiceProviders; using AyCode.Interfaces.Users; using System; +using AyCode.Interfaces.Profiles.Dtos; using Mango.Interfaces.Users; +using Mango.Interfaces.Profiles; namespace Mango.Interfaces.Companies; -public interface ICompany : IAcServiceProvider +public interface ICompany : IAcCompany where TUser : class, IUserBase where TUserToCompany : class, IUserToCompanyBase + where TProfile : class, IProfileDto {} \ No newline at end of file diff --git a/Mango.Interfaces/Companies/ICompanyBase.cs b/Mango.Interfaces/Companies/ICompanyBase.cs index 8baf306..ff78a83 100644 --- a/Mango.Interfaces/Companies/ICompanyBase.cs +++ b/Mango.Interfaces/Companies/ICompanyBase.cs @@ -2,6 +2,6 @@ namespace Mango.Interfaces.Companies; -public interface ICompanyBase : IAcServiceProviderBase +public interface ICompanyBase : IAcCompanyBase { } \ No newline at end of file diff --git a/Mango.Interfaces/Users/IUserToCompany.cs b/Mango.Interfaces/Users/IUserToCompany.cs index ee7fbd8..248f498 100644 --- a/Mango.Interfaces/Users/IUserToCompany.cs +++ b/Mango.Interfaces/Users/IUserToCompany.cs @@ -7,5 +7,5 @@ public interface IUserToCompany : IUserToCompanyBase where TCompany : class, ICompanyBase { public TUser User { get; set; } - public TCompany ServiceProvider { get; set; } + public TCompany Company { get; set; } } \ No newline at end of file diff --git a/Mango.Interfaces/Users/IUserToCompanyBase.cs b/Mango.Interfaces/Users/IUserToCompanyBase.cs index 1847dff..b6ef530 100644 --- a/Mango.Interfaces/Users/IUserToCompanyBase.cs +++ b/Mango.Interfaces/Users/IUserToCompanyBase.cs @@ -2,5 +2,5 @@ namespace Mango.Interfaces.Users; -public interface IUserToCompanyBase : IAcUserToServiceProviderBase +public interface IUserToCompanyBase : IAcUserToCompanyBase {} \ No newline at end of file diff --git a/Mango.Services.Server.Tests/LoginServices/LoginServiceServerTests.cs b/Mango.Services.Server.Tests/LoginServices/LoginServiceServerTests.cs index c7a2859..339b11e 100644 --- a/Mango.Services.Server.Tests/LoginServices/LoginServiceServerTests.cs +++ b/Mango.Services.Server.Tests/LoginServices/LoginServiceServerTests.cs @@ -1,4 +1,8 @@ +using AyCode.Core.Loggers; +using AyCode.Core.Server.Loggers; using AyCode.Services.Server.Tests.LoginServices; +using Mango.Core.Loggers; +using Mango.Database; using Mango.Database.DataLayers.Users; using Mango.Database.DbContexts.Users; using Mango.Entities.Addresses; @@ -14,6 +18,8 @@ namespace Mango.Services.Server.Tests.LoginServices [TestClass] public class LoginServiceServerTests : AcLoginServiceServerTestBase { + private readonly Logger _logger = new(nameof(LoginServiceServerTests)); + private const string RegisterEmail = "qwerty@xxxxx.com"; private const string RegisterPassword = "elem'r"; private const string RegisterUserIdString = "1f7e0591-330b-463b-81ad-d01f2e65e23e"; @@ -21,14 +27,30 @@ namespace Mango.Services.Server.Tests.LoginServices private const string LoginEmail = "asdfsdf@ggggg.hu"; private const string LoginPassword = "alad'r"; - [DataTestMethod] - [DataRow([RegisterUserIdString, RegisterEmail, RegisterPassword])] - public override Task AcBase_RegisterUser_ReturnsUser_WhenUserExist(string[] userIdEmailPasswordStrings) - => base.AcBase_RegisterUser_ReturnsUser_WhenUserExist(userIdEmailPasswordStrings); - [DataTestMethod] [DataRow([LoginEmail, LoginPassword])] public override void AcBase_LoginUser_ReturnsUser_WhenUserExist(string[] emailPasswordStrings) => base.AcBase_LoginUser_ReturnsUser_WhenUserExist(emailPasswordStrings); + + [DataTestMethod] + [DataRow([RegisterUserIdString, RegisterEmail, RegisterPassword])] + public override Task AcBase_RegisterUser_ReturnsUser_WhenUserExist(string[] userIdEmailPasswordStrings) + { + GlobalLogger.Debug("Test started0..."); + + for (int i = 0; i < 1000; i++) + { + _logger.Debug(i + ". Test started..."); + _logger.Debug(i + ". Test started2..."); + GlobalLogger.Debug(i + ". Test started3..."); + } + + GlobalLogger.Debug("Test started4..."); + GlobalLogger.Writer().Suggest("sdfdfa", nameof(LoginServiceServerTests)); + + //Assert.IsTrue(true); + //return Task.CompletedTask; + return base.AcBase_RegisterUser_ReturnsUser_WhenUserExist(userIdEmailPasswordStrings); + } } } \ No newline at end of file diff --git a/Mango.Services.Server.Tests/Mango.Services.Server.Tests.csproj b/Mango.Services.Server.Tests/Mango.Services.Server.Tests.csproj index 1d723b2..0176630 100644 --- a/Mango.Services.Server.Tests/Mango.Services.Server.Tests.csproj +++ b/Mango.Services.Server.Tests/Mango.Services.Server.Tests.csproj @@ -24,7 +24,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Mango.Services.Server.Tests/appsettings.json b/Mango.Services.Server.Tests/appsettings.json index 780df2e..1ba32c8 100644 --- a/Mango.Services.Server.Tests/appsettings.json +++ b/Mango.Services.Server.Tests/appsettings.json @@ -17,6 +17,23 @@ "SendGrid": { //"Key": "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" "Key": "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" - } + }, + "AyCode": { + "ProjectId": "684f34d1-163a-4077-918f-a9d9df5ce789", + "Logger": { + "AppType": "Server", + "LogLevel": "Detail", + "LogWriters": [ + { + "LogLevel": "Detail", + "LogWriterType": "Mango.Core.Loggers.ConsoleLogWriter, Mango.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" + }, + { + "LogLevel": "Detail", + "LogWriterType": "Mango.Database.DbLogItemWriter, Mango.Database, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" + } + ] + } + } } diff --git a/Mango.Services.Server/Mango.Services.Server.csproj b/Mango.Services.Server/Mango.Services.Server.csproj index 31fc60d..b8cbad7 100644 --- a/Mango.Services.Server/Mango.Services.Server.csproj +++ b/Mango.Services.Server/Mango.Services.Server.csproj @@ -11,7 +11,7 @@ - + diff --git a/MissNationBlazorHybrid/MissNationBlazorHybrid.csproj b/MissNationBlazorHybrid/MissNationBlazorHybrid.csproj index 372dc65..e8e8066 100644 --- a/MissNationBlazorHybrid/MissNationBlazorHybrid.csproj +++ b/MissNationBlazorHybrid/MissNationBlazorHybrid.csproj @@ -58,9 +58,9 @@ - - - + + + diff --git a/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj b/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj index aaacc5c..f51456c 100644 --- a/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj +++ b/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj b/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj index c476478..9693589 100644 --- a/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj +++ b/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/MissNationBlazorWASM/Shared/MissNationBlazorWASM.Shared.csproj b/MissNationBlazorWASM/Shared/MissNationBlazorWASM.Shared.csproj index 3c56617..9a938be 100644 --- a/MissNationBlazorWASM/Shared/MissNationBlazorWASM.Shared.csproj +++ b/MissNationBlazorWASM/Shared/MissNationBlazorWASM.Shared.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/MissNationSharedUI/MissNationSharedUI.csproj b/MissNationSharedUI/MissNationSharedUI.csproj index da800fa..3e2a5fa 100644 --- a/MissNationSharedUI/MissNationSharedUI.csproj +++ b/MissNationSharedUI/MissNationSharedUI.csproj @@ -12,8 +12,8 @@ - - + +