urlilpolly/PIbd-21_Blokhin_D.A._FishFactory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

это только начало

Browse Source
This commit is contained in:
Дмитрий Блохин 2024-04-04 19:51:00 +04:00
parent 090d5a8690
commit dd81117374
18 changed files with 428 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
FishFactory/FishFactoryBusinessLogic/BusinessLogics/ClientLogic.cs Normal file
View File

@ -0,0 +1,124 @@
using FishFactoryContracts.BindingModels;
using FishFactoryContracts.BusinessLogicsContracts;
using FishFactoryContracts.SearchModels;
using FishFactoryContracts.StoragesContracts;
using FishFactoryContracts.ViewModels;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryBusinessLogic.BusinessLogics
{
public class ClientLogic : IClientLogic
{
private readonly ILogger _logger;
private readonly IClientStorage _clientStorage;
public ClientLogic(ILogger<ClientLogic> logger, IClientStorage clientStorage)
{
_logger = logger;
_clientStorage = clientStorage;
}
public List<ClientViewModel>? ReadList(ClientSearchModel? model)
{
_logger.LogInformation("ReadList. ClientId:{Id}", model?.Id);
var list = model == null ? _clientStorage.GetFullList() : _clientStorage.GetFilteredList(model);
if (list == null)
{
_logger.LogWarning("ReadList return null list");
return null;
}
_logger.LogInformation("ReadList. Count:{Count}", list.Count);
return list;
}
public ClientViewModel? ReadElement(ClientSearchModel model)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
_logger.LogInformation("ReadElement. ClientFio:{ClientFio}.Id:{ Id}", model.ClientFIO, model.Id);
var element = _clientStorage.GetElement(model);
if (element == null)
{
_logger.LogWarning("ReadElement element not found");
return null;
}
_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
return element;
}
public bool Create(ClientBindingModel model)
{
CheckModel(model);
if (_clientStorage.Insert(model) == null)
{
_logger.LogWarning("Insert operation failed");
return false;
}
return true;
}
public bool Update(ClientBindingModel model)
{
CheckModel(model);
if (_clientStorage.Update(model) == null)
{
_logger.LogWarning("Update operation failed");
return false;
}
return true;
}
public bool Delete(ClientBindingModel model)
{
CheckModel(model, false);
_logger.LogInformation("Delete. Id:{Id}", model.Id);
if (_clientStorage.Delete(model) == null)
{
_logger.LogWarning("Delete operation failed");
return false;
}
return true;
}
private void CheckModel(ClientBindingModel model, bool withParams = true)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
if (!withParams)
{
return;
}
if (string.IsNullOrEmpty(model.ClientFIO))
{
throw new ArgumentNullException("Нет ФИО пользователя", nameof(model.ClientFIO));
}
if (string.IsNullOrEmpty(model.Email))
{
throw new ArgumentNullException("Нет почты пользователя", nameof(model.Email));
}
if (string.IsNullOrEmpty(model.Password))
{
throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password));
}
_logger.LogInformation("Client. ClientFIO:{ClientFIO}.Email:{Email}.Password:{Password}.Id:{Id}",
model.ClientFIO, model.Email, model.Password, model.Id);
var element = _clientStorage.GetElement(new ClientSearchModel
{
ClientFIO = model.ClientFIO
});
if (element != null && element.Id != model.Id)
{
throw new InvalidOperationException("Клиент с таким именем уже есть");
}
}
}
}

46
FishFactory/FishFactoryContracts/AbstractSaveToWord.cs
View File

@ -1,46 +0,0 @@
using DocumentFormat.OpenXml.Drawing.Charts;
using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
using FishFactoryBusinessLogic.OfficePackage.HelperModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryBusinessLogic.OfficePackage
{
public abstract class AbstractSaveToWord
{
public void CreateDoc(WordInfo info)
{
CreateWord(info);
CreateParagraph(new WordParagraph
{
Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) }, TextProperties = new WordTextProperties
{
Size = "24",
JustificationType = WordJustificationType.Center
}
});
foreach (var canned in info.Canneds)
{
CreateParagraph(new WordParagraph
{
Texts = new List<(string, WordTextProperties)> {
($"{canned.CannedName} - ", new WordTextProperties { Size = "24", Bold = true}) ,
(canned.Price.ToString(), new WordTextProperties { Size = "24", })
},
TextProperties = new WordTextProperties
{
Size = "24",
JustificationType = WordJustificationType.Both
}
});
}
SaveWord(info);
}
protected abstract void CreateWord(WordInfo info);
protected abstract void CreateParagraph(WordParagraph paragraph);
protected abstract void SaveWord(WordInfo info);
}
}

17
FishFactory/FishFactoryContracts/BindingModels/ClientBindingModel.cs Normal file
View File

@ -0,0 +1,17 @@
using FishFactoryDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryContracts.BindingModels
{
public class ClientBindingModel : IClientModel
{
public int Id { get; set; }
public string ClientFIO { get; set; } = string.Empty;
public string Email { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
}
}

1
FishFactory/FishFactoryContracts/BindingModels/OrderBindingModel.cs
View File

@ -12,6 +12,7 @@ namespace FishFactoryContracts.BindingModels
{
public int Id { get; set; }
public int CannedId { get; set; }
public int ClientId { get; set; }
public int Count { get; set; }
public double Sum { get; set; }
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

20
FishFactory/FishFactoryContracts/BusinessLogicsContracts/IClientLogic.cs Normal file
View File

@ -0,0 +1,20 @@
using FishFactoryContracts.BindingModels;
using FishFactoryContracts.SearchModels;
using FishFactoryContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryContracts.BusinessLogicsContracts
{
public interface IClientLogic
{
List<ClientViewModel>? ReadList(ClientSearchModel? model);
ClientViewModel? ReadElement(ClientSearchModel model);
bool Create(ClientBindingModel model);
bool Update(ClientBindingModel model);
bool Delete(ClientBindingModel model);
}
}

16
FishFactory/FishFactoryContracts/SearchModels/ClientSearchModel.cs Normal file
View File

@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryContracts.SearchModels
{
public class ClientSearchModel
{
public int? Id { get; set; }
public string? ClientFIO { get; set; }
public string? Email { get; set; }
public string? Password { get; set; }
}
}

1
FishFactory/FishFactoryContracts/SearchModels/OrderSearchModel.cs
View File

@ -9,6 +9,7 @@ namespace FishFactoryContracts.SearchModels
public class OrderSearchModel
{
public int? Id { get; set; }
public int? ClientId { get; set; }
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
}

21
FishFactory/FishFactoryContracts/StoragesContracts/IClientStorage.cs Normal file
View File

@ -0,0 +1,21 @@
using FishFactoryContracts.BindingModels;
using FishFactoryContracts.SearchModels;
using FishFactoryContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryContracts.StoragesContracts
{
public interface IClientStorage
{
List<ClientViewModel> GetFullList();
List<ClientViewModel> GetFilteredList(ClientSearchModel model);
ClientViewModel? GetElement(ClientSearchModel model);
ClientViewModel? Insert(ClientBindingModel model);
ClientViewModel? Update(ClientBindingModel model);
ClientViewModel? Delete(ClientBindingModel model);
}
}

21
FishFactory/FishFactoryContracts/ViewModels/ClientViewModel.cs Normal file
View File

@ -0,0 +1,21 @@
using FishFactoryDataModels.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryContracts.ViewModels
{
public class ClientViewModel : IClientModel
{
public int Id { get; set; }
[DisplayName("ФИО клиента")]
public string ClientFIO { get; set; } = string.Empty;
[DisplayName("Логин (эл. почта)")]
public string Email { get; set; } = string.Empty;
[DisplayName("Пароль")]
public string Password { get; set; } = string.Empty;
}
}

3
FishFactory/FishFactoryContracts/ViewModels/OrderViewModel.cs
View File

@ -13,6 +13,9 @@ namespace FishFactoryContracts.ViewModels
{
[DisplayName("Номер")]
public int Id { get; set; }
public int ClientId { get; set; }
[DisplayName("ФИО клиента")]
public string ClientFIO { get; set; } = string.Empty;
public int CannedId { get; set; }
[DisplayName("Консерва")]
public string CannedName { get; set; } = string.Empty;

15
FishFactory/FishFactoryDataModels/Models/IClientModel.cs Normal file
View File

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryDataModels.Models
{
public interface IClientModel : IId
{
string ClientFIO { get; }
string Email { get; }
string Password { get; }
}
}

1
FishFactory/FishFactoryDataModels/Models/IOrderModel.cs
View File

@ -10,6 +10,7 @@ namespace FishFactoryDataModels.Models
public interface IOrderModel : IId
{
int CannedId { get; }
int ClientId { get; }
int Count { get; }
double Sum { get; }
OrderStatus Status { get; }

1
FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabase.cs
View File

@ -22,5 +22,6 @@ namespace FishFactoryDatabaseImplement
public virtual DbSet<Canned> Canneds { set; get; }
public virtual DbSet<CannedComponent> CannedComponents { set; get; }
public virtual DbSet<Order> Orders { set; get; }
public virtual DbSet<Client> Clients { set; get; }
}
}

84
FishFactory/FishFactoryDatabaseImplement/Implements/ClientStorage.cs Normal file
View File

@ -0,0 +1,84 @@
using FishFactoryContracts.BindingModels;
using FishFactoryContracts.SearchModels;
using FishFactoryContracts.StoragesContracts;
using FishFactoryContracts.ViewModels;
using FishFactoryDatabaseImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryDatabaseImplement.Implements
{
public class ClientStorage : IClientStorage
{
public List<ClientViewModel> GetFullList()
{
using var context = new FishFactoryDatabase();
return context.Clients.Select(x => x.GetViewModel).ToList();
}
public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
{
if (string.IsNullOrEmpty(model.ClientFIO))
{
return new();
}
using var context = new FishFactoryDatabase();
return context.Clients.Where(x => x.ClientFIO.Contains(model.ClientFIO)).Select(x => x.GetViewModel).ToList();
}
public ClientViewModel? GetElement(ClientSearchModel model)
{
if (string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue)
{
return null;
}
using var context = new FishFactoryDatabase();
return context.Clients.FirstOrDefault(x =>
(!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) ||
(model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
public ClientViewModel? Insert(ClientBindingModel model)
{
var newComponent = Client.Create(model);
if (newComponent == null)
{
return null;
}
using var context = new FishFactoryDatabase();
context.Clients.Add(newComponent);
context.SaveChanges();
return newComponent.GetViewModel;
}
public ClientViewModel? Update(ClientBindingModel model)
{
using var context = new FishFactoryDatabase();
var component = context.Clients.FirstOrDefault(x => x.Id == model.Id);
if (component == null)
{
return null;
}
component.Update(model);
context.SaveChanges();
return component.GetViewModel;
}
public ClientViewModel? Delete(ClientBindingModel model)
{
using var context = new FishFactoryDatabase();
var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id);
if (element != null)
{
context.Clients.Remove(element);
context.SaveChanges();
return element.GetViewModel;
}
return null;
}
}
}

44
FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs
View File

@ -17,21 +17,21 @@ namespace FishFactoryDatabaseImplement.Implements
public List<OrderViewModel> GetFullList()
{
using var context = new FishFactoryDatabase();
return context.Orders
.Select(x => AccessCannedStorage(x.GetViewModel))
.ToList();
return context.Orders.Select(x => AccessCannedStorage(x.GetViewModel, context)).ToList();
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
if (!model.DateFrom.HasValue && !model.DateTo.HasValue && !model.Id.HasValue && !model.ClientId.HasValue)
{
return new();
}
using var context = new FishFactoryDatabase();
if (model.Id.HasValue)
return context.Orders.Where(x => x.Id == model.Id).Select(x => AccessCannedStorage(x.GetViewModel)).ToList();
return context.Orders.Where(x => x.Id == model.Id).Select(x => AccessCannedStorage(x.GetViewModel, context)).ToList();
else if (model.ClientId.HasValue)
return context.Orders.Where(x => x.ClientId == model.ClientId).Select(x => AccessCannedStorage(x.GetViewModel, context)).ToList();
else
return context.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AccessCannedStorage(x.GetViewModel)).ToList();
return context.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AccessCannedStorage(x.GetViewModel, context)).ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
{
@ -40,7 +40,7 @@ namespace FishFactoryDatabaseImplement.Implements
return null;
}
using var context = new FishFactoryDatabase();
return AccessCannedStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
return AccessCannedStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel, context);
}
public OrderViewModel? Insert(OrderBindingModel model)
{
@ -52,7 +52,7 @@ namespace FishFactoryDatabaseImplement.Implements
using var context = new FishFactoryDatabase();
context.Orders.Add(newOrder);
context.SaveChanges();
return AccessCannedStorage(newOrder.GetViewModel);
return AccessCannedStorage(newOrder.GetViewModel, context);
}
public OrderViewModel? Update(OrderBindingModel model)
{
@ -65,7 +65,7 @@ namespace FishFactoryDatabaseImplement.Implements
}
order.Update(model);
context.SaveChanges();
return AccessCannedStorage(order.GetViewModel);
return AccessCannedStorage(order.GetViewModel, context);
}
public OrderViewModel? Delete(OrderBindingModel model)
{
@ -76,24 +76,30 @@ namespace FishFactoryDatabaseImplement.Implements
{
context.Orders.Remove(element);
context.SaveChanges();
return AccessCannedStorage(element.GetViewModel);
return AccessCannedStorage(element.GetViewModel, context);
}
return null;
}
public static OrderViewModel AccessCannedStorage(OrderViewModel model)
public static OrderViewModel AccessCannedStorage(OrderViewModel? model, FishFactoryDatabase context)
{
if (model == null)
return null;
using var context = new FishFactoryDatabase();
foreach (var canned in context.Canneds)
{
if (canned.Id == model.CannedId)
{
model.CannedName = canned.CannedName;
break;
}
return null;
}
var canned = context.Canneds.FirstOrDefault(x => x.Id == model.CannedId);
if (canned == null)
{
return null;
}
var client = context.Clients.FirstOrDefault(x => x.Id == model.ClientId);
if (client == null)
{
return null;
}
model.CannedName = canned.CannedName;
model.ClientId = client.Id;
model.ClientFIO = client.ClientFIO;
return model;
}
}

2
FishFactory/FishFactoryDatabaseImplement/Migrations/20240308113242_InitialCreate.cs
View File

@ -38,7 +38,7 @@ namespace FishFactoryDatabaseImplement.Migrations
{
table.PrimaryKey("PK_Components", x => x.Id);
});
migrationBuilder.Sql("DELETE FROM [dbo].[Orders]");
migrationBuilder.CreateTable(
name: "Orders",
columns: table => new

73
FishFactory/FishFactoryDatabaseImplement/Models/Client.cs Normal file
View File

@ -0,0 +1,73 @@
using FishFactoryContracts.BindingModels;
using FishFactoryContracts.ViewModels;
using FishFactoryDataModels.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FishFactoryDatabaseImplement.Models
{
public class Client : IClientModel
{
public int Id { get; private set; }
[Required]
public string ClientFIO { get; set; } = string.Empty;
[Required]
public string Email { get; set; } = string.Empty;
[Required]
public string Password { get; set; } = string.Empty;
[ForeignKey("ClientId")]
public virtual List<Order> Orders { get; set; } = new();
public static Client? Create(ClientBindingModel model)
{
if (model == null)
{
return null;
}
return new Client()
{
Id = model.Id,
ClientFIO = model.ClientFIO,
Email = model.Email,
Password = model.Password
};
}
public static Client Create(ClientViewModel model)
{
return new Client
{
Id = model.Id,
ClientFIO = model.ClientFIO,
Email = model.Email,
Password = model.Password
};
}
public void Update(ClientBindingModel model)
{
if (model == null)
{
return;
}
ClientFIO = model.ClientFIO;
Email = model.Email;
Password = model.Password;
}
public ClientViewModel GetViewModel => new()
{
Id = Id,
ClientFIO = ClientFIO,
Email = Email,
Password = Password
};
}
}

4
FishFactory/FishFactoryDatabaseImplement/Models/Order.cs
View File

@ -15,6 +15,8 @@ namespace FishFactoryDatabaseImplement.Models
{
public int Id { get; private set; }
[Required]
public int ClientId { get; private set; }
[Required]
public int Count { get; private set; }
[Required]
public double Sum { get; private set; }
@ -35,6 +37,7 @@ namespace FishFactoryDatabaseImplement.Models
return new Order()
{
Id = model.Id,
ClientId = model.ClientId,
Count = model.Count,
Sum = model.Sum,
Status = model.Status,
@ -57,6 +60,7 @@ namespace FishFactoryDatabaseImplement.Models
public OrderViewModel GetViewModel => new()
{
CannedId = CannedId,
ClientId = ClientId,
Count = Count,
Sum = Sum,
Status = Status,