diff --git a/TIAM.Core/Enums/TransferStatusType.cs b/TIAM.Core/Enums/TransferStatusType.cs index 4f5f5d61..20d714fc 100644 --- a/TIAM.Core/Enums/TransferStatusType.cs +++ b/TIAM.Core/Enums/TransferStatusType.cs @@ -1,7 +1,10 @@ -namespace TIAM.Core.Enums; +using System.ComponentModel.DataAnnotations; + +namespace TIAM.Core.Enums; public enum TransferStatusType : byte { + [Display(Name = "OrderSubmittedDisplayName")] OrderSubmitted = 5, OrderConfirmed = 10, AssignedToDriver = 15, diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index a915db66..7e4aa2bf 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -11,8 +11,10 @@ using TIAM.Entities.Users; using TIAM.Models.Dtos.Users; using TIAM.Entities.Transfers; using AyCode.Core.Extensions; +using Microsoft.Extensions.DependencyInjection; using TIAM.Entities.ServiceProviders; using TIAM.Entities.Addresses; +using DevExpress.Pdf.Native.BouncyCastle.Asn1.Ocsp; namespace TIAM.Database.Test { @@ -129,6 +131,7 @@ namespace TIAM.Database.Test Assert.IsNotNull(user.UserProductMappings[0].Product, "Product is null"); + //ActivatorUtilities.CreateInstance(ServiceProvider, user); var userModelDto = (UserModelDto)Activator.CreateInstance(typeof(UserModelDto), user); Assert.IsNotNull(userModelDto); } @@ -504,6 +507,8 @@ namespace TIAM.Database.Test TransferStatusType = TransferStatusType.OrderConfirmed, }; + //TransferStatusType.OrderSubmitted.GetDisplayName(); + Assert.IsTrue(await Dal.AddTransferAsync(transfer)); Assert.IsNotNull(transfer); diff --git a/TIAM.Database.Test/TIAM.Database.Test.csproj b/TIAM.Database.Test/TIAM.Database.Test.csproj index 994f246e..218e8c8a 100644 --- a/TIAM.Database.Test/TIAM.Database.Test.csproj +++ b/TIAM.Database.Test/TIAM.Database.Test.csproj @@ -22,17 +22,16 @@ - - - - - + + + + + - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TIAM.Database/TIAM.Database.csproj b/TIAM.Database/TIAM.Database.csproj index 39ba2da1..4f3680c7 100644 --- a/TIAM.Database/TIAM.Database.csproj +++ b/TIAM.Database/TIAM.Database.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/TIAM.Entities/TIAM.Entities.csproj b/TIAM.Entities/TIAM.Entities.csproj index 04c496e1..4516ea29 100644 --- a/TIAM.Entities/TIAM.Entities.csproj +++ b/TIAM.Entities/TIAM.Entities.csproj @@ -32,7 +32,7 @@ - + diff --git a/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj b/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj index 89238bed..422381ba 100644 --- a/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj +++ b/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj @@ -26,10 +26,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/TIAM.Services.Server/TIAM.Services.Server.csproj b/TIAM.Services.Server/TIAM.Services.Server.csproj index 6962cb50..c4631780 100644 --- a/TIAM.Services.Server/TIAM.Services.Server.csproj +++ b/TIAM.Services.Server/TIAM.Services.Server.csproj @@ -30,7 +30,7 @@ - + diff --git a/TIAMMobileApp/TIAMMobileApp.csproj b/TIAMMobileApp/TIAMMobileApp.csproj index a895ed28..d629aee7 100644 --- a/TIAMMobileApp/TIAMMobileApp.csproj +++ b/TIAMMobileApp/TIAMMobileApp.csproj @@ -1,8 +1,7 @@  - net8.0-maccatalyst;net8.0-android;net8.0-ios - $(TargetFrameworks);net8.0-windows10.0.19041.0 + net8.0-maccatalyst;net8.0-ios;net8.0-android34.0 Exe @@ -25,7 +24,7 @@ 14.2 14.0 - 24.0 + 29.0 10.0.17763.0 10.0.17763.0 6.5 @@ -51,9 +50,10 @@ - + + @@ -66,7 +66,6 @@ - @@ -87,16 +86,4 @@ - - - - - - - - - - - - diff --git a/TIAMSharedUI/Pages/Login.razor.cs b/TIAMSharedUI/Pages/Login.razor.cs index cb7676a5..3bef497a 100644 --- a/TIAMSharedUI/Pages/Login.razor.cs +++ b/TIAMSharedUI/Pages/Login.razor.cs @@ -64,7 +64,7 @@ namespace TIAMSharedUI.Pages private async void SubmitLogin() { _currentStep = 1; - BrowserConsoleLogWriter.Info("Login started: " + "Email: " + _loginModel.Email + ", Password: " + _loginModel.Password); + BrowserConsoleLogWriter.Info("Login started: " + "Email: " + _loginModel.Email); var mainResponse = await userDataService.AuthenticateUser(_loginModel); diff --git a/TIAMSharedUI/TIAMSharedUI.csproj b/TIAMSharedUI/TIAMSharedUI.csproj index 12963120..e9d3f208 100644 --- a/TIAMSharedUI/TIAMSharedUI.csproj +++ b/TIAMSharedUI/TIAMSharedUI.csproj @@ -20,9 +20,9 @@ - - - + + + diff --git a/TIAMWebApp/Client/TIAMWebApp.Client.csproj b/TIAMWebApp/Client/TIAMWebApp.Client.csproj index f2ce51ad..20100fcd 100644 --- a/TIAMWebApp/Client/TIAMWebApp.Client.csproj +++ b/TIAMWebApp/Client/TIAMWebApp.Client.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/TIAMWebApp/Server/Controllers/AuctionAPIController.cs b/TIAMWebApp/Server/Controllers/AuctionAPIController.cs index 1b2c08dc..45e38023 100644 --- a/TIAMWebApp/Server/Controllers/AuctionAPIController.cs +++ b/TIAMWebApp/Server/Controllers/AuctionAPIController.cs @@ -9,7 +9,7 @@ namespace TIAMWebApp.Server.Controllers [Authorize] [ApiController] [Route("api/v1/[controller]")] - public class AuctionAPIController : ControllerBase + public class AuctionApiController : ControllerBase { private AuctionDal _auctionDal; private readonly IConfiguration _configuration; @@ -18,7 +18,7 @@ namespace TIAMWebApp.Server.Controllers private readonly ILogger _logger; - public AuctionAPIController(ILogger logger, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, AuctionDal auctionDal) + public AuctionApiController(ILogger logger, IConfiguration configuration, IWebHostEnvironment webHostEnvironment, AuctionDal auctionDal) { _logger = logger; _configuration = configuration; @@ -29,7 +29,7 @@ namespace TIAMWebApp.Server.Controllers [AllowAnonymous] [HttpPost] [Route("CreateBid")] - public async Task CreateUser([FromBody] AuctionBid SerializedAuctionBidModel) + public async Task CreateUser([FromBody] AuctionBid serializedAuctionBidModel) { GlobalLogger.Info("CreateBid called"); //if (string.IsNullOrEmpty(SerializedAuctionBidModel.GetRawText())) @@ -39,7 +39,7 @@ namespace TIAMWebApp.Server.Controllers //else //{ //AuctionBidModel? bid = JObject.Parse(SerializedAuctionBidModel.GetRawText()).ToObject(); - AuctionBid bid = SerializedAuctionBidModel; + AuctionBid bid = serializedAuctionBidModel; AuctionBid finalizedBidModel; if (bid != null) @@ -96,7 +96,7 @@ namespace TIAMWebApp.Server.Controllers [AllowAnonymous] [HttpPost] [Route("ValidateBid")] - public async Task ValidateBid([FromBody] AuctionBid SerializedAuctionBidModel) + public async Task ValidateBid([FromBody] AuctionBid serializedAuctionBidModel) { GlobalLogger.Info("ValidateBid called"); //var validateBid = JObject.Parse(SerializedAuctionBidModel.GetRawText()).ToObject(); @@ -105,12 +105,12 @@ namespace TIAMWebApp.Server.Controllers AuctionBid? dbBid = null; //Logger.Info(validateBid?.Id); - GlobalLogger.Info(SerializedAuctionBidModel?.Id.ToString()); + GlobalLogger.Info(serializedAuctionBidModel?.Id.ToString()); //if (validateBid != null) - if (SerializedAuctionBidModel != null) + if (serializedAuctionBidModel != null) { //dbBid = await _auctionDal.GetBidById(validateBid.Id); - dbBid = _auctionDal.GetBidById(SerializedAuctionBidModel.Id); + dbBid = _auctionDal.GetBidById(serializedAuctionBidModel.Id); } //check if password is valid @@ -125,7 +125,7 @@ namespace TIAMWebApp.Server.Controllers { //if (dbBid.Email == validateBid?.Email) - if (dbBid.Email == SerializedAuctionBidModel?.Email) + if (dbBid.Email == serializedAuctionBidModel?.Email) { GlobalLogger.Info("Bid is valid"); dbBid.IsValid = true; diff --git a/TIAMWebApp/Server/TIAMWebApp.Server.csproj b/TIAMWebApp/Server/TIAMWebApp.Server.csproj index 5eb22e51..2fb8c354 100644 --- a/TIAMWebApp/Server/TIAMWebApp.Server.csproj +++ b/TIAMWebApp/Server/TIAMWebApp.Server.csproj @@ -14,19 +14,19 @@ - - - - - - + + + + + + - - - + + + diff --git a/TIAMWebApp/Shared/Services/AdminSignalRClient.cs b/TIAMWebApp/Shared/Services/AdminSignalRClient.cs index 1a14b69c..0a2f7c9b 100644 --- a/TIAMWebApp/Shared/Services/AdminSignalRClient.cs +++ b/TIAMWebApp/Shared/Services/AdminSignalRClient.cs @@ -2,6 +2,7 @@ using AyCode.Core.Consts; using AyCode.Core.Helpers; using AyCode.Services.Loggers; +using Microsoft.Extensions.DependencyInjection; using TIAM.Entities.Drivers; using TIAM.Entities.Transfers; using TIAM.Entities.Users; @@ -15,8 +16,9 @@ namespace TIAMWebApp.Shared.Application.Services { public class AdminSignalRClient : AcSignalRClientBase, IUserApiControllerClient, ITransferApiControllerClient { - public AdminSignalRClient(IEnumerable logWriters) : base($"{Setting.BaseUrl}/DevAdminHub", new LoggerClient(nameof(AdminSignalRClient), logWriters.ToArray())) + public AdminSignalRClient(/*IServiceProvider serviceProvider, */IEnumerable logWriters) : base($"{Setting.BaseUrl}/DevAdminHub", new LoggerClient(nameof(AdminSignalRClient), logWriters.ToArray())) { + //var a = ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider); ConstHelper.NameByValue(0); } diff --git a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs index b050a6f4..816be767 100644 --- a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs +++ b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs @@ -21,7 +21,7 @@ namespace TIAMWebApp.Shared.Application.Services private readonly ISecureStorageHandler secureStorageHandler; private readonly LoggerClient _logger; - private AdminSignalRClient _adminSignalRClient; + private readonly AdminSignalRClient _adminSignalRClient; public ServiceProviderDataService(HttpClient http, ISecureStorageHandler secureStorageHandler, AdminSignalRClient adminSignalRClient, IEnumerable logWriters) { diff --git a/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs b/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs index cd012412..715d576d 100644 --- a/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs +++ b/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs @@ -90,7 +90,7 @@ public abstract class UserDataServiceClientBase : IUserDataService ////try ////{ - //// Logger.Detail("Login started: " + "Email: " + loginModel.Email + ", Password: " + loginModel.Password); + //// Logger.Detail("Login started: " + "Email: " + loginModel.Email); ////} ////catch (Exception ex) ////{ diff --git a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj index 1b491701..5d2426bb 100644 --- a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj +++ b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj @@ -22,14 +22,14 @@ - - - - - + + + + + - + diff --git a/Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj b/Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj index 802507ab..3717880d 100644 --- a/Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj +++ b/Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj @@ -14,9 +14,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + +