d.agliullov/ISEbd-21_Agliullov.D.A._Confectionery
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Agliullov D. A. Lab Work 5 Hard #16

Closed
d.agliullov wants to merge 49 commits from Lab5_Hard into Lab4_Hard
pull from: Lab5_Hard
merge into: d.agliullov:Lab4_Hard
Conversation 0 Commits 49 Files Changed 209 +32 -3
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ae1ae11879 - Show all commits

11
ConfectionaryFileImplement/ClientStorage.cs
View File

@ -26,7 +26,16 @@ namespace ConfectioneryFileImplement
public ClientViewModel? GetElement(ClientSearchModel model)
{
return _source.Clients.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
if (model.Id.HasValue)
return _source.Clients.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
if (model.Email != null && model.Password != null)
return _source.Clients
.FirstOrDefault(x => x.Email.Equals(model.Email)
&& x.Password.Equals(model.Password))
?.GetViewModel;
if (model.Email != null)
return _source.Clients.FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel;
return null;
}
public List<ClientViewModel> GetFilteredList(ClientSearchModel model)

11
ConfectionaryListImplement/ClientStorage.cs
View File

@ -30,7 +30,16 @@ namespace ConfectioneryListImplement
public ClientViewModel? GetElement(ClientSearchModel model)
{
return _source.Clients.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
if (model.Id.HasValue)
return _source.Clients.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
if (model.Email != null && model.Password != null)
return _source.Clients
.FirstOrDefault(x => x.Email.Equals(model.Email)
&& x.Password.Equals(model.Password))
?.GetViewModel;
if (model.Email != null)
return _source.Clients.FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel;
return null;
}
public List<ClientViewModel> GetFilteredList(ClientSearchModel model)

2
ConfectioneryContracts/SearchModels/ClientSearchModel.cs
View File

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

11
ConfectioneryDatabaseImplement/ClientStorage.cs
View File

@ -23,7 +23,16 @@ namespace ConfectioneryDatabaseImplement.Implements
public ClientViewModel? GetElement(ClientSearchModel model)
{
using var context = new ConfectioneryDatabase();
return context.Clients.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
if (model.Id.HasValue)
return context.Clients.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
if (model.Email != null && model.Password != null)
return context.Clients
.FirstOrDefault(x => x.Email.Equals(model.Email)
&& x.Password.Equals(model.Password))
?.GetViewModel;
if (model.Email != null)
return context.Clients.FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel;
return null;
}
public List<ClientViewModel> GetFilteredList(ClientSearchModel model)