klllst/PIbd-23_Zargarov_M.A._Pizzeria
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Изменения в OrderStorage + фикс названий

Browse Source
This commit is contained in:
Марат Заргаров 2023-05-14 15:22:04 +04:00
parent 46513dcd83
commit 0ac8e075a0
4 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Pizzeria/PizzeriaDatabaseImplement/Implements/OrderStorage.cs
View File

@ -1,9 +1,9 @@
using PizzeriaContracts.BindingModels; using PizzeriaContracts.BindingModels;
using PizzeriaContracts.SearchModels; using PizzeriaContracts.SearchModels;
using PizzeriaContracts.StorageContracts;
using PizzeriaContracts.ViewModels; using PizzeriaContracts.ViewModels;
using PizzeriaDatabaseImplement.Models; using PizzeriaDatabaseImplement.Models;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using PizzeriaContracts.StorageContracts;
namespace PizzeriaDatabaseImplement.Implements namespace PizzeriaDatabaseImplement.Implements
{ {
@ -12,24 +12,21 @@ namespace PizzeriaDatabaseImplement.Implements
public List<OrderViewModel> GetFullList() public List<OrderViewModel> GetFullList()
{ {
using var context = new PizzeriaDatabase(); using var context = new PizzeriaDatabase();
return context.Orders.Include(x => x.Pizza) return context.Orders.Include(x => x.Pizza).Include(x => x.Client).Select(x => x.GetViewModel).ToList();
.Include(x => x.Client)
.Select(x => x.GetViewModel)
.ToList();
} }
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
{
return new();
}
using var context = new PizzeriaDatabase(); using var context = new PizzeriaDatabase();
return context.Orders.Include(x => x.Pizza) if (model.DateFrom.HasValue)
.Include(x => x.Client) {
.Where(x => (model.DateFrom.HasValue && model.DateTo.HasValue && x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) || return context.Orders.Include(x => x.Pizza).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
(model.ClientId.HasValue && x.ClientId == model.ClientId)) }
.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) public OrderViewModel? GetElement(OrderSearchModel model)
@ -39,10 +36,7 @@ namespace PizzeriaDatabaseImplement.Implements
return new(); return new();
} }
using var context = new PizzeriaDatabase(); using var context = new PizzeriaDatabase();
return context.Orders.Include(x => x.Pizza) return context.Orders.Include(x => x.Pizza).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
.Include(x => x.Client)
.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || (model.ClientId.HasValue && x.Id == model.ClientId))?
.GetViewModel;
} }
public OrderViewModel? Insert(OrderBindingModel model) public OrderViewModel? Insert(OrderBindingModel model)

8
Pizzeria/PizzeriaRestApi/Controllers/MainController.cs
View File

@ -34,20 +34,18 @@ namespace PizzeriaRestApi.Controllers
} }
} }
[HttpGet] [HttpGet]
public PizzaViewModel? GetPizza(int productId) public PizzaViewModel? GetPizza(int pizzaId)
{ {
try try
{ {
return _pizza.ReadElement(new PizzaSearchModel return _pizza.ReadElement(new PizzaSearchModel
{ {
Id = Id = pizzaId
productId
}); });
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка получения пиццы по id={Id}", _logger.LogError(ex, "Ошибка получения пиццы по id={Id}", pizzaId);
productId);
throw; throw;
} }
} }

4
Pizzeria/PizzeriaRestApi/Program.cs
View File

@ -26,7 +26,7 @@ builder.Services.AddSwaggerGen(c =>
{ {
c.SwaggerDoc("v1", new OpenApiInfo c.SwaggerDoc("v1", new OpenApiInfo
{ {
Title = "AbstractShopRestApi", Title = "PizzeriaRestApi",
Version Version
= "v1" = "v1"
}); });
@ -39,7 +39,7 @@ var app = builder.Build();
if (app.Environment.IsDevelopment()) if (app.Environment.IsDevelopment())
{ {
app.UseSwagger(); 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(); app.UseHttpsRedirection();

2
Pizzeria/PizzeriaRestApi/log4net.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<log4net> <log4net>
<appender name="RollingFile" type="log4net.Appender.RollingFileAppender"> <appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
<file value="c:/temp/AbstractShopRestApi.log" /> <file value="c:/temp/PizzeriaRestApi.log" />
<appendToFile value="true" /> <appendToFile value="true" />
<maximumFileSize value="100KB" /> <maximumFileSize value="100KB" />
<maxSizeRollBackups value="2" /> <maxSizeRollBackups value="2" />