diff --git a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs index e9c4188..d8fd53e 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs @@ -3,6 +3,7 @@ using HardwareShopDatabaseImplement.Models.ManyToMany; using HardwareShopDatabaseImplement.Models.Storekeeper; using HardwareShopDatabaseImplement.Models.Worker; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Options; namespace HardwareShopDatabaseImplement { @@ -10,7 +11,7 @@ namespace HardwareShopDatabaseImplement { protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=Computer_Hardware_Store1;Username=user;Password=12345"); + optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=Computer_Hardware_Store4;Username=postgres;Password=1234"); AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); } diff --git a/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs b/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs index 864ef1a..1816218 100644 --- a/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs +++ b/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs @@ -49,12 +49,12 @@ namespace HardwareShopRestApi.Controllers } } - [HttpGet] - public List? GetPurchases(int userId) + [HttpPost] + public List? GetPurchases(PurchaseSearchModel model) { try { - return _purchaseLogic.ReadList(new() { UserId = userId }); + return _purchaseLogic.ReadList(model); } catch (Exception ex) { diff --git a/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs b/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs index 5820093..1b41b80 100644 --- a/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs +++ b/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs @@ -327,7 +327,7 @@ namespace HardwareShopWorkerApp.Controllers { return Redirect("~/Home/Enter"); } - return View(APIClient.GetRequest>($"api/purchase/getpurchases?userId={APIClient.User.Id}")); + return View(APIClient.PostRequestWithResult>($"api/purchase/getpurchases", new() { UserId = APIClient.User.Id })); } [HttpPost] @@ -358,7 +358,8 @@ namespace HardwareShopWorkerApp.Controllers { return Redirect("~/Home/Enter"); } - ViewBag.Purchases = APIClient.GetRequest>($"api/purchase/getpurchases?userId={APIClient.User.Id}"); + + ViewBag.Purchases = APIClient.PostRequestWithResult> ($"api/purchase/getpurchases", new() {UserId = APIClient.User.Id }); return View(); } @@ -521,8 +522,8 @@ namespace HardwareShopWorkerApp.Controllers if (buildId <= 0) { throw new Exception($"Идентификтаор сборки не может быть ниже или равен 0"); - } - ViewBag.Purchase = APIClient.GetRequest>($"api/purchase/GetPurchasesNotDelivery?userId={APIClient.User.Id}"); + } + ViewBag.Purchases = APIClient.PostRequestWithResult>($"api/purchase/getpurchases", new() { UserId = APIClient.User.Id, PurchaseStatus = PurchaseStatus.Выполняется }); return View(APIClient.GetRequest>>($"api/build/GetBuildPurchase?buildId={buildId}")); } diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml index 3df23d3..44d23f5 100644 --- a/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml +++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml @@ -79,7 +79,7 @@