From 0ac8e075a0762ecf383ee2f18312c026aa1ecc8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B0=D1=82=20=D0=97=D0=B0=D1=80=D0=B3?=
 =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2?= <maratzargarov@mail.ru>
Date: Sun, 14 May 2023 15:22:04 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20OrderStorage=20+=20=D1=84=D0=B8=D0=BA?=
 =?UTF-8?q?=D1=81=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implements/OrderStorage.cs                | 30 ++++++++-----------
 .../Controllers/MainController.cs             |  8 ++---
 Pizzeria/PizzeriaRestApi/Program.cs           |  4 +--
 Pizzeria/PizzeriaRestApi/log4net.config       |  2 +-
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/Pizzeria/PizzeriaDatabaseImplement/Implements/OrderStorage.cs b/Pizzeria/PizzeriaDatabaseImplement/Implements/OrderStorage.cs
index 9829b82..1c1682a 100644
--- a/Pizzeria/PizzeriaDatabaseImplement/Implements/OrderStorage.cs
+++ b/Pizzeria/PizzeriaDatabaseImplement/Implements/OrderStorage.cs
@@ -1,9 +1,9 @@
 using PizzeriaContracts.BindingModels;
 using PizzeriaContracts.SearchModels;
+using PizzeriaContracts.StorageContracts;
 using PizzeriaContracts.ViewModels;
 using PizzeriaDatabaseImplement.Models;
 using Microsoft.EntityFrameworkCore;
-using PizzeriaContracts.StorageContracts;
 
 namespace PizzeriaDatabaseImplement.Implements
 {
@@ -12,24 +12,21 @@ namespace PizzeriaDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new PizzeriaDatabase();
-            return context.Orders.Include(x => x.Pizza)
-                .Include(x => x.Client)
-                .Select(x => x.GetViewModel)
-                .ToList();
+            return context.Orders.Include(x => x.Pizza).Include(x => x.Client).Select(x => x.GetViewModel).ToList();
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
-            {
-                return new();
-            }
             using var context = new PizzeriaDatabase();
-            return context.Orders.Include(x => x.Pizza)
-                .Include(x => x.Client)
-                .Where(x => (model.DateFrom.HasValue && model.DateTo.HasValue && x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) ||
-                    (model.ClientId.HasValue && x.ClientId == model.ClientId))
-                .Select(x => x.GetViewModel).ToList();
+            if (model.DateFrom.HasValue)
+            {
+                return context.Orders.Include(x => x.Pizza).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
+            }
+            if (model.ClientId.HasValue)
+            {
+                return context.Orders.Include(x => x.Pizza).Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
+            }
+            return context.Orders.Include(x => x.Pizza).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
         }
 
         public OrderViewModel? GetElement(OrderSearchModel model)
@@ -39,10 +36,7 @@ namespace PizzeriaDatabaseImplement.Implements
                 return new();
             }
             using var context = new PizzeriaDatabase();
-            return context.Orders.Include(x => x.Pizza)
-                .Include(x => x.Client)
-                .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || (model.ClientId.HasValue && x.Id == model.ClientId))?
-                .GetViewModel;
+            return context.Orders.Include(x => x.Pizza).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
diff --git a/Pizzeria/PizzeriaRestApi/Controllers/MainController.cs b/Pizzeria/PizzeriaRestApi/Controllers/MainController.cs
index b0708c5..6364faf 100644
--- a/Pizzeria/PizzeriaRestApi/Controllers/MainController.cs
+++ b/Pizzeria/PizzeriaRestApi/Controllers/MainController.cs
@@ -34,20 +34,18 @@ namespace PizzeriaRestApi.Controllers
             }
         }
         [HttpGet]
-        public PizzaViewModel? GetPizza(int productId)
+        public PizzaViewModel? GetPizza(int pizzaId)
         {
             try
             {
                 return _pizza.ReadElement(new PizzaSearchModel
                 {
-                    Id =
-               productId
+                    Id = pizzaId
                 });
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка получения пиццы по id={Id}",
-               productId);
+                _logger.LogError(ex, "Ошибка получения пиццы по id={Id}", pizzaId);
                 throw;
             }
         }
diff --git a/Pizzeria/PizzeriaRestApi/Program.cs b/Pizzeria/PizzeriaRestApi/Program.cs
index 595dc25..007ae25 100644
--- a/Pizzeria/PizzeriaRestApi/Program.cs
+++ b/Pizzeria/PizzeriaRestApi/Program.cs
@@ -26,7 +26,7 @@ builder.Services.AddSwaggerGen(c =>
 {
     c.SwaggerDoc("v1", new OpenApiInfo
     {
-        Title = "AbstractShopRestApi",
+        Title = "PizzeriaRestApi",
         Version
     = "v1"
     });
@@ -39,7 +39,7 @@ var app = builder.Build();
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
-    app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json","AbstractShopRestApi v1"));
+    app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json","PizzeriaRestApi v1"));
 }
 
 app.UseHttpsRedirection();
diff --git a/Pizzeria/PizzeriaRestApi/log4net.config b/Pizzeria/PizzeriaRestApi/log4net.config
index 43b77f9..fbbf5db 100644
--- a/Pizzeria/PizzeriaRestApi/log4net.config
+++ b/Pizzeria/PizzeriaRestApi/log4net.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <log4net>
 	<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
-		<file value="c:/temp/AbstractShopRestApi.log" />
+		<file value="c:/temp/PizzeriaRestApi.log" />
 		<appendToFile value="true" />
 		<maximumFileSize value="100KB" />
 		<maxSizeRollBackups value="2" />