gaillard/PIbd-23-Nasyrov-A.G.-FlowerShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

)

Browse Source
This commit is contained in:
antoc0der 2024-04-06 22:08:37 +04:00
parent 0870c015f5
commit a4843554ec
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FlowerShopContracts/SearchModels/ClientSearchModel.cs
View File

@ -11,5 +11,6 @@ namespace FlowerShopContracts.SearchModels
public int? Id { get; set; } public int? Id { get; set; }
public string? ClientFIO { get; set; } public string? ClientFIO { get; set; }
public string? Email { get; set; } public string? Email { get; set; }
public string? Password { get; set; }
} }
} }

9
FlowerShopDatabaseImplement/ClientStorage.cs
View File

@ -22,14 +22,16 @@ namespace FlowerShopDatabaseImplement.Implements
} }
public List<ClientViewModel> GetFilteredList(ClientSearchModel model) public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
{ {
if (string.IsNullOrEmpty(model.ClientFIO) && string.IsNullOrEmpty(model.Email)) if (string.IsNullOrEmpty(model.ClientFIO) && string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password) &&
string.IsNullOrEmpty(model.ClientFIO))
{ {
return new(); return new();
} }
using var context = new FlowerShopDataBase(); using var context = new FlowerShopDataBase();
return context.Clients return context.Clients
.Where(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO.Contains(model.ClientFIO) && .Where(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO.Contains(model.ClientFIO) &&
(string.IsNullOrEmpty(model.Email) || x.ClientFIO.Contains(model.Email)))) (string.IsNullOrEmpty(model.Email) || x.ClientFIO.Contains(model.Email)) &&
(string.IsNullOrEmpty(model.Password) || x.ClientFIO.Contains(model.Password))))
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }
@ -43,7 +45,8 @@ namespace FlowerShopDatabaseImplement.Implements
using var context = new FlowerShopDataBase(); using var context = new FlowerShopDataBase();
return context.Clients return context.Clients
.FirstOrDefault(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO == model.ClientFIO) && .FirstOrDefault(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO == model.ClientFIO) &&
(!model.Id.HasValue || x.Id == model.Id) && (string.IsNullOrEmpty(model.Email) || x.Email == model.Email)) (!model.Id.HasValue || x.Id == model.Id) && (string.IsNullOrEmpty(model.Email) || x.Email == model.Email) &&
(string.IsNullOrEmpty(model.Password) || x.Password == model.Password))
?.GetViewModel; ?.GetViewModel;
} }
public ClientViewModel? Insert(ClientBindingModel model) public ClientViewModel? Insert(ClientBindingModel model)

8
FlowerShopFileImplement/ClientStorage.cs
View File

@ -34,8 +34,9 @@ namespace FlowerShopFileImplement.Implements
return new(); return new();
} }
return source.Clients return source.Clients
.Where(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO.Contains(model.ClientFIO) && .Where(x => ((string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO.Contains(model.ClientFIO)) &&
(string.IsNullOrEmpty(model.Email) || x.ClientFIO.Contains(model.Email)))) (string.IsNullOrEmpty(model.Email) || x.ClientFIO.Contains(model.Email)) &&
(string.IsNullOrEmpty(model.Password) || x.ClientFIO.Contains(model.Password))))
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }
@ -43,7 +44,8 @@ namespace FlowerShopFileImplement.Implements
{ {
return source.Clients return source.Clients
.FirstOrDefault(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO == model.ClientFIO) && .FirstOrDefault(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO == model.ClientFIO) &&
(!model.Id.HasValue || x.Id == model.Id) && (string.IsNullOrEmpty(model.Email) || x.Email == model.Email)) (!model.Id.HasValue || x.Id == model.Id) && (string.IsNullOrEmpty(model.Email) || x.Email == model.Email) &&
(string.IsNullOrEmpty(model.Password) || x.Password == model.Password))
?.GetViewModel; ?.GetViewModel;
} }
public ClientViewModel? Insert(ClientBindingModel model) public ClientViewModel? Insert(ClientBindingModel model)

5
FlowerShopListImplement/ClientStorage.cs
View File

@ -32,7 +32,7 @@ namespace FlowerShopListImplement.Implements
model) model)
{ {
var result = new List<ClientViewModel>(); var result = new List<ClientViewModel>();
if (string.IsNullOrEmpty(model.ClientFIO) && string.IsNullOrEmpty(model.Email)) if (string.IsNullOrEmpty(model.ClientFIO) && string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password))
{ {
return result; return result;
} }
@ -50,7 +50,8 @@ namespace FlowerShopListImplement.Implements
foreach (var client in _source.Clients) foreach (var client in _source.Clients)
{ {
if ((string.IsNullOrEmpty(model.ClientFIO) || client.ClientFIO == model.ClientFIO) && if ((string.IsNullOrEmpty(model.ClientFIO) || client.ClientFIO == model.ClientFIO) &&
(!model.Id.HasValue || client.Id == model.Id) && (string.IsNullOrEmpty(model.Email) || client.Email == model.Email)) (!model.Id.HasValue || client.Id == model.Id) && (string.IsNullOrEmpty(model.Email) || client.Email == model.Email) &&
(string.IsNullOrEmpty(model.Password) || client.Password == model.Password))
{ {
return client.GetViewModel; return client.GetViewModel;
} }