From 1be107f8832ea52d0e37cfbab29f3eebaca2b3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=93=D0=BE=D1=80=D0=B4?=
=?UTF-8?q?=D0=B5=D0=B5=D0=B2?= <89176335310x@gmail.com>
Date: Tue, 28 May 2024 11:42:47 +0400
Subject: [PATCH] Word Orders
---
.../DataBase.cs | 4 ++-
...ner.cs => 20240528050446_Init.Designer.cs} | 4 +--
...nitMigration.cs => 20240528050446_Init.cs} | 2 +-
.../Controllers/MainController.cs | 31 ++++++++++++++++---
4 files changed, 33 insertions(+), 8 deletions(-)
rename ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/{20240527175902_InitMigration.Designer.cs => 20240528050446_Init.Designer.cs} (99%)
rename ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/{20240527175902_InitMigration.cs => 20240528050446_Init.cs} (99%)
diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs
index d5a8b5d..e4868b2 100644
--- a/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs
+++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs
@@ -6,11 +6,13 @@ namespace ElectronicsShopDataBaseImplement
{
public class Database : DbContext
{
+ //DESKTOP-E2VPEN3
+ //DESKTOP-O0N00SH
protected override void OnConfiguring(DbContextOptionsBuilder
optionsBuilder)
{
if (optionsBuilder.IsConfigured == false) {
- optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-O0N00SH\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+ optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-E2VPEN3\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
}
base.OnConfiguring(optionsBuilder);
}
diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240527175902_InitMigration.Designer.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240528050446_Init.Designer.cs
similarity index 99%
rename from ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240527175902_InitMigration.Designer.cs
rename to ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240528050446_Init.Designer.cs
index 7214802..0008c56 100644
--- a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240527175902_InitMigration.Designer.cs
+++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240528050446_Init.Designer.cs
@@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace ElectronicsShopDataBaseImplement.Migrations
{
[DbContext(typeof(Database))]
- [Migration("20240527175902_InitMigration")]
- partial class InitMigration
+ [Migration("20240528050446_Init")]
+ partial class Init
{
///
protected override void BuildTargetModel(ModelBuilder modelBuilder)
diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240527175902_InitMigration.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240528050446_Init.cs
similarity index 99%
rename from ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240527175902_InitMigration.cs
rename to ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240528050446_Init.cs
index d23eb50..8f70eb5 100644
--- a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240527175902_InitMigration.cs
+++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240528050446_Init.cs
@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace ElectronicsShopDataBaseImplement.Migrations
{
///
- public partial class InitMigration : Migration
+ public partial class Init : Migration
{
///
protected override void Up(MigrationBuilder migrationBuilder)
diff --git a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs
index 0548887..7bb00dc 100644
--- a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs
+++ b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs
@@ -26,13 +26,28 @@ namespace ElectronicsShopRestAPI.Controllers {
[HttpGet]
public List? GetProductList() {
- //tdoo
- return null;
+ try
+ {
+ return _product.ReadList(null);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка получения списка суши");
+ throw;
+ }
}
[HttpGet]
public ProductViewModel? GetProduct(int ProductID) {
- return null;
+ try
+ {
+ return _product.ReadElement(new ProductSearchModel { ID = ProductID});
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка получения продукта по id={Id}", ProductID);
+ throw;
+ }
}
@@ -67,7 +82,15 @@ namespace ElectronicsShopRestAPI.Controllers {
[HttpPost]
public void CreateOrder(OrderBindingModel model) {
- return;
+ try
+ {
+ _order.CreateOrder(model);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка создания заказа");
+ throw;
+ }
}
[HttpPost]