diff --git a/TIAM.Database.Test/TIAM.Database.Test.csproj b/TIAM.Database.Test/TIAM.Database.Test.csproj index 74121880..de3e1978 100644 --- a/TIAM.Database.Test/TIAM.Database.Test.csproj +++ b/TIAM.Database.Test/TIAM.Database.Test.csproj @@ -43,7 +43,6 @@ - diff --git a/TIAM.Database.Test/UserDalTests.cs b/TIAM.Database.Test/UserDalTests.cs index 09c2cdcc..fe54a20b 100644 --- a/TIAM.Database.Test/UserDalTests.cs +++ b/TIAM.Database.Test/UserDalTests.cs @@ -7,13 +7,8 @@ using TIAM.Database.DbContexts.Users; using TIAM.Entities.Profiles; using TIAM.Entities.Users; using TIAM.Models.Dtos.Users; -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Addresses; -using TIAMWebApp.Server.Services.Logins; -using AyCode.Interfaces.Users; -using Microsoft.EntityFrameworkCore; -using SendGrid.Helpers.Mail; using TIAM.Entities.Emails; namespace TIAM.Database.Test @@ -21,12 +16,12 @@ namespace TIAM.Database.Test [TestClass] public class UserDalTests : AcUserDalTestBase { - private Guid _registerUserId = Guid.Parse("1f7e0591-330b-463b-81ad-d01f2e65e23e"); - private const string RegisterEmail = "qwerty@xxxxx.com"; - private const string RegisterPassword = "elem'r"; + //private Guid _registerUserId = Guid.Parse("1f7e0591-330b-463b-81ad-d01f2e65e23e"); + //private const string RegisterEmail = "qwerty@xxxxx.com"; + //private const string RegisterPassword = "elem'r"; - private const string LoginEmail = "asdfsdf@ggggg.hu"; - private const string LoginPassword = "alad'r"; + //private const string LoginEmail = "asdfsdf@ggggg.hu"; + //private const string LoginPassword = "alad'r"; //private WebAssemblyHostConfiguration _configuration = new(); //private Mock _mockContext; @@ -67,62 +62,63 @@ namespace TIAM.Database.Test } } - [TestMethod] - public async Task RegisterUser_ReturnsUser_WhenUserExist() - { - //var a = TiamConst.ProjectIdString; - - await Dal.RemoveUserAsync(_registerUserId); //kitöröljük a szemetet, ha korábbról bentmaradt - J. + //[DataTestMethod] + //public async Task RegisterUser_ReturnsUser_WhenUserExist() + //{ + // //var a = TiamConst.ProjectIdString; - var loginService = new LoginService(Dal, AcEnv.AppConfiguration); - var errorCode = await loginService.RegistrationAsync(_registerUserId, RegisterEmail, RegisterPassword, null); - - Assert.IsTrue(errorCode == AcErrorCode.Unset); + // await Dal.RemoveUserAsync(_registerUserId); //kitöröljük a szemetet, ha korábbról bentmaradt - J. - var user = Dal.GetUserByEmail(RegisterEmail, false); - - Assert.IsNotNull(user); - Assert.IsNotNull(user.Profile); - Assert.IsNotNull(user.Profile.Address); + // var loginService = new LoginService(Dal, AcEnv.AppConfiguration); + // var errorCode = await loginService.RegistrationAsync(_registerUserId, RegisterEmail, RegisterPassword, null); - await Dal.RemoveUserAsync(user); //kitöröljük a szemetet - J. - } + // Assert.IsTrue(errorCode == AcErrorCode.Unset); - [TestMethod] - public void LoginUser_ReturnsUser_WhenUserExist() - { - //var a = TiamConst.ProjectIdString; + // var user = Dal.GetUserByEmail(RegisterEmail, false); - var loginService = new LoginService(Dal, AcEnv.AppConfiguration); + // Assert.IsNotNull(user); + // Assert.IsNotNull(user.Profile); + // Assert.IsNotNull(user.Profile.Address); - #region Valid email+password test - var loggedInModel = loginService.Login(LoginEmail, LoginPassword); + // await Dal.RemoveUserAsync(user); //kitöröljük a szemetet - J. + //} - Assert.IsNotNull(loggedInModel); - Assert.IsNotNull(loggedInModel.LoggedInUser); - Assert.IsNotNull(loginService.LoggedInModel?.LoggedInUser); + //[DataTestMethod] + //[DataRow([LoginEmail, LoginPassword])] + //public void LoginUser_ReturnsUser_WhenUserExist() + //{ + // //var a = TiamConst.ProjectIdString; - Assert.IsTrue(loggedInModel.LoginErrorCode == AcErrorCode.Unset, $"errorCode: {loggedInModel.LoginErrorCode}"); - Assert.IsTrue(loggedInModel.IsLoggedIn, $"loggedInModel.IsLoggedIn == false; errorCode: {loggedInModel.LoginErrorCode}"); - Assert.IsTrue(string.Equals(loggedInModel.LoggedInUser.EmailAddress, LoginEmail, StringComparison.CurrentCultureIgnoreCase)); - #endregion Valid email+password test + // var loginService = new LoginService(Dal, AcEnv.AppConfiguration); - #region Wrong email test - loggedInModel = loginService.Login("gffsdgdfg@gu.hu", LoginPassword); + // #region Valid email+password test + // var loggedInModel = loginService.Login(LoginEmail, LoginPassword); - Assert.IsNotNull(loggedInModel); - Assert.IsFalse(loggedInModel.IsLoggedIn); - Assert.IsTrue(loggedInModel.LoginErrorCode == AcErrorCode.WrongLoginData); - #endregion Wrong email test + // Assert.IsNotNull(loggedInModel); + // Assert.IsNotNull(loggedInModel.LoggedInUser); + // Assert.IsNotNull(loginService.LoggedInModel?.LoggedInUser); - #region Wrong password test - loggedInModel = loginService.Login(LoginEmail, "fsdgfsdg"); + // Assert.IsTrue(loggedInModel.LoginErrorCode == AcErrorCode.Unset, $"errorCode: {loggedInModel.LoginErrorCode}"); + // Assert.IsTrue(loggedInModel.IsLoggedIn, $"loggedInModel.IsLoggedIn == false; errorCode: {loggedInModel.LoginErrorCode}"); + // Assert.IsTrue(string.Equals(loggedInModel.LoggedInUser.EmailAddress, LoginEmail, StringComparison.CurrentCultureIgnoreCase)); + // #endregion Valid email+password test - Assert.IsNotNull(loggedInModel); - Assert.IsFalse(loggedInModel.IsLoggedIn); - Assert.IsTrue(loggedInModel.LoginErrorCode == AcErrorCode.WrongLoginData); - #endregion Wrong password test - } + // #region Wrong email test + // loggedInModel = loginService.Login("gffsdgdfg@gu.hu", LoginPassword); + + // Assert.IsNotNull(loggedInModel); + // Assert.IsFalse(loggedInModel.IsLoggedIn); + // Assert.IsTrue(loggedInModel.LoginErrorCode == AcErrorCode.WrongLoginData); + // #endregion Wrong email test + + // #region Wrong password test + // loggedInModel = loginService.Login(LoginEmail, "fsdgfsdg"); + + // Assert.IsNotNull(loggedInModel); + // Assert.IsFalse(loggedInModel.IsLoggedIn); + // Assert.IsTrue(loggedInModel.LoginErrorCode == AcErrorCode.WrongLoginData); + // #endregion Wrong password test + //} [DataTestMethod] [DataRow("540271F6-C604-4C16-8160-D5A7CAFEDF00")] diff --git a/TIAM.Models.Server/Logins/ILoggedInModel.cs b/TIAM.Models.Server/Logins/ILoggedInModel.cs new file mode 100644 index 00000000..541c99f9 --- /dev/null +++ b/TIAM.Models.Server/Logins/ILoggedInModel.cs @@ -0,0 +1,10 @@ +using AyCode.Interfaces.Server.Logins; +using TIAM.Entities.Addresses; +using TIAM.Entities.Profiles; +using TIAM.Entities.ServiceProviders; +using TIAM.Entities.Users; + +namespace TIAM.Models.Server.Logins; + +public interface ILoggedInModel : IAcLoggedInModelBase +{} \ No newline at end of file diff --git a/TIAM.Models.Server/Logins/LoggedInModel.cs b/TIAM.Models.Server/Logins/LoggedInModel.cs new file mode 100644 index 00000000..110056bb --- /dev/null +++ b/TIAM.Models.Server/Logins/LoggedInModel.cs @@ -0,0 +1,11 @@ +using AyCode.Models.Server.Logins; +using TIAM.Entities.Addresses; +using TIAM.Entities.Profiles; +using TIAM.Entities.ServiceProviders; +using TIAM.Entities.Users; + +namespace TIAM.Models.Server.Logins; + +public class LoggedInModel : AcLoggedInModelServer, ILoggedInModel +{ +} \ No newline at end of file diff --git a/TIAM.Models.Server/TIAM.Models.Server.csproj b/TIAM.Models.Server/TIAM.Models.Server.csproj new file mode 100644 index 00000000..ac3f432d --- /dev/null +++ b/TIAM.Models.Server/TIAM.Models.Server.csproj @@ -0,0 +1,46 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll + + + + diff --git a/TIAM.Models/TIAM.Models.csproj b/TIAM.Models/TIAM.Models.csproj index 5c91222d..7238f820 100644 --- a/TIAM.Models/TIAM.Models.csproj +++ b/TIAM.Models/TIAM.Models.csproj @@ -13,7 +13,6 @@ - @@ -21,15 +20,33 @@ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Database.dll + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll + diff --git a/TIAM.Services.Server.Tests/LoginServices/LoginServiceServerTests.cs b/TIAM.Services.Server.Tests/LoginServices/LoginServiceServerTests.cs new file mode 100644 index 00000000..d266beb8 --- /dev/null +++ b/TIAM.Services.Server.Tests/LoginServices/LoginServiceServerTests.cs @@ -0,0 +1,34 @@ +using AyCode.Services.Server.Tests.LoginServices; +using TIAM.Database.DataLayers.Users; +using TIAM.Database.DbContexts.Users; +using TIAM.Entities.Addresses; +using TIAM.Entities.Emails; +using TIAM.Entities.Profiles; +using TIAM.Entities.ServiceProviders; +using TIAM.Entities.Users; +using TIAM.Models.Server.Logins; +using TIAM.Services.Server.Logins; + +namespace TIAM.Services.Server.Tests.LoginServices +{ + [TestClass] + public class LoginServiceServerTests : AcLoginServiceServerTestBase + { + private const string RegisterEmail = "qwerty@xxxxx.com"; + private const string RegisterPassword = "elem'r"; + private const string RegisterUserIdString = "1f7e0591-330b-463b-81ad-d01f2e65e23e"; + + 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); + } +} \ No newline at end of file diff --git a/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj b/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj new file mode 100644 index 00000000..21d29539 --- /dev/null +++ b/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj @@ -0,0 +1,98 @@ + + + + net8.0 + enable + enable + + false + true + + + + + + + + + PreserveNewest + true + PreserveNewest + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server.Tests\bin\Debug\net8.0\AyCode.Core.Tests.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Database.dll + + + ..\..\AyCode.Core\AyCode.Services.Server.Tests\bin\Debug\net8.0\AyCode.Database.Tests.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Services.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Services.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server.Tests\bin\Debug\net8.0\AyCode.Services.Server.Tests.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll + + + + + + + + diff --git a/TIAM.Services.Server.Tests/appsettings.json b/TIAM.Services.Server.Tests/appsettings.json new file mode 100644 index 00000000..780df2ec --- /dev/null +++ b/TIAM.Services.Server.Tests/appsettings.json @@ -0,0 +1,22 @@ +{ + "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" + }, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*", + "JWT": { + "Key": "Cee4400-rDMFkVvHPufyLDSzbfu2grgRhpepos299IhTLOXsljkcpt3yUR4RRjPQ", + "Issuer": "http://localhost:5000", + "Audience": "http://localhost:5000" + }, + "SendGrid": { + //"Key": "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" + "Key": "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" + } + +} diff --git a/TIAMWebApp/Server/Services/Logins/ILoginService.cs b/TIAM.Services.Server/Logins/ILoginService.cs similarity index 56% rename from TIAMWebApp/Server/Services/Logins/ILoginService.cs rename to TIAM.Services.Server/Logins/ILoginService.cs index 7c34cdc6..3455aaa9 100644 --- a/TIAMWebApp/Server/Services/Logins/ILoginService.cs +++ b/TIAM.Services.Server/Logins/ILoginService.cs @@ -1,15 +1,11 @@ using AyCode.Interfaces.Server.Logins; -using AyCode.Models.Server.Logins; using TIAM.Entities.Addresses; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; -using TIAMWebApp.Server.Models.Logins; +using TIAM.Models.Server.Logins; -namespace TIAMWebApp.Server.Services.Logins; - -public interface ILoginModel : IAcLoggedInModelBase -{} +namespace TIAM.Services.Server.Logins; public interface ILoginService : IAcLoginServiceServer { diff --git a/TIAMWebApp/Server/Services/Logins/LoginService.cs b/TIAM.Services.Server/Logins/LoginService.cs similarity index 74% rename from TIAMWebApp/Server/Services/Logins/LoginService.cs rename to TIAM.Services.Server/Logins/LoginService.cs index 0a8fd41f..dcfb8766 100644 --- a/TIAMWebApp/Server/Services/Logins/LoginService.cs +++ b/TIAM.Services.Server/Logins/LoginService.cs @@ -1,21 +1,16 @@ -using System.Reflection.Metadata.Ecma335; -using System.Security; -using AyCode.Core.Consts; -using AyCode.Interfaces.Server.Logins; +using AyCode.Core.Consts; using AyCode.Services.Server.Logins; -using AyCode.Utils.Extensions; -using TIAM.Database.DataLayers.Admins; +using Microsoft.Extensions.Configuration; using TIAM.Database.DataLayers.Users; -using TIAM.Database.DbContexts.Admins; using TIAM.Database.DbContexts.Users; using TIAM.Entities.Addresses; using TIAM.Entities.Emails; using TIAM.Entities.Profiles; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; -using TIAMWebApp.Server.Models.Logins; +using TIAM.Models.Server.Logins; -namespace TIAMWebApp.Server.Services.Logins; +namespace TIAM.Services.Server.Logins; public class LoginService(UserDal userDal, IConfiguration configuration) : AcLoginServiceServer(userDal, configuration), ILoginService diff --git a/TIAMWebApp/Server/Services/MessageSenderService.cs b/TIAM.Services.Server/MessageSenderService.cs similarity index 95% rename from TIAMWebApp/Server/Services/MessageSenderService.cs rename to TIAM.Services.Server/MessageSenderService.cs index 8ada768d..636c36b8 100644 --- a/TIAMWebApp/Server/Services/MessageSenderService.cs +++ b/TIAM.Services.Server/MessageSenderService.cs @@ -1,14 +1,12 @@ using System.Net; +using AyCode.Models.Enums; +using Microsoft.Extensions.Configuration; using SendGrid; using SendGrid.Helpers.Mail; -using AyCode.Models.Enums; using TIAM.Database.DataLayers.Admins; -using TIAM.Database.DataLayers.Users; using TIAM.Entities.Emails; -using TIAMWebApp.Shared.Application.Models.ClientSide.Messages; - -namespace TIAMWebApp.Server.Services +namespace TIAM.Services.Server { public class MessageSenderService(IConfiguration configuration, AdminDal adminDal) : IMessageSenderService { diff --git a/TIAM.Services.Server/TIAM.Services.Server.csproj b/TIAM.Services.Server/TIAM.Services.Server.csproj new file mode 100644 index 00000000..511ad036 --- /dev/null +++ b/TIAM.Services.Server/TIAM.Services.Server.csproj @@ -0,0 +1,63 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + + + + + + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Database.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Services.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Services.Server.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll + + + + diff --git a/TIAMWebApp/Server/Services/TransferBackendService.cs b/TIAM.Services.Server/TransferBackendService.cs similarity index 96% rename from TIAMWebApp/Server/Services/TransferBackendService.cs rename to TIAM.Services.Server/TransferBackendService.cs index e3c59e7b..ef82c262 100644 --- a/TIAMWebApp/Server/Services/TransferBackendService.cs +++ b/TIAM.Services.Server/TransferBackendService.cs @@ -1,10 +1,10 @@ -using TIAM.Core.Enums; +using Microsoft.Extensions.Configuration; +using TIAM.Core.Enums; using TIAM.Database.DataLayers.Admins; -using TIAM.Database.DataLayers.Users; using TIAM.Entities.Products; using TIAM.Entities.Transfers; -namespace TIAMWebApp.Server.Services +namespace TIAM.Services.Server { public class TransferBackendService(IConfiguration configuration, AdminDal adminDal) { diff --git a/TIAM.Services/TIAM.Services.csproj b/TIAM.Services/TIAM.Services.csproj new file mode 100644 index 00000000..00cad14a --- /dev/null +++ b/TIAM.Services/TIAM.Services.csproj @@ -0,0 +1,30 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll + + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll + + + + diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index f70c022e..d67dbb6b 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -18,7 +18,7 @@ using TIAM.Database.DbSets.Transfers; using TIAM.Entities.Products; using TIAM.Entities.Transfers; using TIAM.Entities.Users; -using TIAMWebApp.Server.Services; +using TIAM.Services.Server; using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; using TIAMWebApp.Shared.Application.Models.PageModels; diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index 09247417..f4907c39 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -28,7 +28,7 @@ using AyCode.Core.Consts; using AyCode.Core.Helpers; using TIAM.Entities.Profiles; using TIAM.Entities.Addresses; -using TIAMWebApp.Server.Services.Logins; +using TIAM.Services.Server.Logins; namespace TIAMWebApp.Server.Controllers { diff --git a/TIAMWebApp/Server/Models/Logins/LoggedInModel.cs b/TIAMWebApp/Server/Models/Logins/LoggedInModel.cs deleted file mode 100644 index 59043b4b..00000000 --- a/TIAMWebApp/Server/Models/Logins/LoggedInModel.cs +++ /dev/null @@ -1,12 +0,0 @@ -using AyCode.Models.Server.Logins; -using TIAM.Entities.Addresses; -using TIAM.Entities.Profiles; -using TIAM.Entities.ServiceProviders; -using TIAM.Entities.Users; -using TIAMWebApp.Server.Services.Logins; - -namespace TIAMWebApp.Server.Models.Logins; - -public class LoggedInModel : AcLoggedInModelServer, ILoginModel -{ -} \ No newline at end of file diff --git a/TIAMWebApp/Server/Program.cs b/TIAMWebApp/Server/Program.cs index d6c68705..ad9d915d 100644 --- a/TIAMWebApp/Server/Program.cs +++ b/TIAMWebApp/Server/Program.cs @@ -8,7 +8,7 @@ using TIAM.Database.DataLayers.Auctions; using TIAM.Database.DataLayers.TransferDestinations; using TIAM.Database.DataLayers.Users; using TIAM.Entities.Emails; -using TIAMWebApp.Server.Services; +using TIAM.Services.Server; //using TIAM.Database.DataLayers.ServiceProviders; var builder = WebApplication.CreateBuilder(args); diff --git a/TIAMWebApp/Server/TIAMWebApp.Server.csproj b/TIAMWebApp/Server/TIAMWebApp.Server.csproj index 021e8187..f71b6870 100644 --- a/TIAMWebApp/Server/TIAMWebApp.Server.csproj +++ b/TIAMWebApp/Server/TIAMWebApp.Server.csproj @@ -29,6 +29,9 @@ + + + @@ -72,5 +75,9 @@ + + + + diff --git a/TourIAmProject.sln b/TourIAmProject.sln index aa83a6c6..911e448a 100644 --- a/TourIAmProject.sln +++ b/TourIAmProject.sln @@ -42,6 +42,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution SqlSchemaCompare_Dev_to_DevRelease.scmp = SqlSchemaCompare_Dev_to_DevRelease.scmp EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Services", "TIAM.Services\TIAM.Services.csproj", "{2B6543F8-ABE3-4C09-A0B3-F6AD13286761}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Services.Server", "TIAM.Services.Server\TIAM.Services.Server.csproj", "{F1A1FA1F-DF3E-4BB3-85E9-BBA182FD6CA8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Services.Server.Tests", "TIAM.Services.Server.Tests\TIAM.Services.Server.Tests.csproj", "{433A137C-0FEF-4B96-B17F-1F4400108207}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TIAM.Models.Server", "TIAM.Models.Server\TIAM.Models.Server.csproj", "{D21032B0-B25F-495E-B784-1D3166FE720C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -118,6 +126,22 @@ Global {2A300982-AA2E-4E62-97F2-6EF4C97939B2}.Debug|Any CPU.Build.0 = Debug|Any CPU {2A300982-AA2E-4E62-97F2-6EF4C97939B2}.Release|Any CPU.ActiveCfg = Release|Any CPU {2A300982-AA2E-4E62-97F2-6EF4C97939B2}.Release|Any CPU.Build.0 = Release|Any CPU + {2B6543F8-ABE3-4C09-A0B3-F6AD13286761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B6543F8-ABE3-4C09-A0B3-F6AD13286761}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B6543F8-ABE3-4C09-A0B3-F6AD13286761}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B6543F8-ABE3-4C09-A0B3-F6AD13286761}.Release|Any CPU.Build.0 = Release|Any CPU + {F1A1FA1F-DF3E-4BB3-85E9-BBA182FD6CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1A1FA1F-DF3E-4BB3-85E9-BBA182FD6CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1A1FA1F-DF3E-4BB3-85E9-BBA182FD6CA8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1A1FA1F-DF3E-4BB3-85E9-BBA182FD6CA8}.Release|Any CPU.Build.0 = Release|Any CPU + {433A137C-0FEF-4B96-B17F-1F4400108207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {433A137C-0FEF-4B96-B17F-1F4400108207}.Debug|Any CPU.Build.0 = Debug|Any CPU + {433A137C-0FEF-4B96-B17F-1F4400108207}.Release|Any CPU.ActiveCfg = Release|Any CPU + {433A137C-0FEF-4B96-B17F-1F4400108207}.Release|Any CPU.Build.0 = Release|Any CPU + {D21032B0-B25F-495E-B784-1D3166FE720C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D21032B0-B25F-495E-B784-1D3166FE720C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D21032B0-B25F-495E-B784-1D3166FE720C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D21032B0-B25F-495E-B784-1D3166FE720C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE