TurnerIlya/PIbd-22_Turner_I.A._PlumbingRepair
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

оно раотает

Browse Source
This commit is contained in:
ityurner02@mail.ru 2023-04-30 13:04:29 +04:00
parent 139326a4b8
commit efe87a6a04
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ClientStorage.cs
View File

@ -13,7 +13,6 @@ namespace PlumbingRepairDatabaseImplement.Implements
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Clients return context.Clients
.Include(x => x.Orders)
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }
@ -23,11 +22,15 @@ namespace PlumbingRepairDatabaseImplement.Implements
{ {
return new(); return new();
} }
if (!string.IsNullOrEmpty(model.Email)) if (model.Id.HasValue)
{
var res = GetElement(model);
return res != null ? new() { res } : new();
}
if (!string.IsNullOrEmpty(model.Email))
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Clients return context.Clients
.Include(x => x.Orders)
.Where(x => x.Email.Contains(model.Email)) .Where(x => x.Email.Contains(model.Email))
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
@ -36,19 +39,22 @@ namespace PlumbingRepairDatabaseImplement.Implements
} }
public ClientViewModel? GetElement(ClientSearchModel model) public ClientViewModel? GetElement(ClientSearchModel model)
{ {
using var context = new PlumbingRepairDataBase(); if (string.IsNullOrEmpty(model.ClientFIO) &&
if (model.Id.HasValue) string.IsNullOrEmpty(model.Email) &&
{ string.IsNullOrEmpty(model.Password) &&
return context.Clients !model.Id.HasValue)
.FirstOrDefault(x => (x.Id == model.Id))?.GetViewModel; {
} return null;
else if (!string.IsNullOrEmpty(model.Email) && !string.IsNullOrEmpty(model.Password)) }
{ using var context = new PlumbingRepairDataBase();
return context.Clients var temp = context.Clients
.FirstOrDefault(x => (x.Email == model.Email && x.Password == model.Password))?.GetViewModel; .FirstOrDefault(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO == model.ClientFIO) &&
} (string.IsNullOrEmpty(model.Email) || x.Email == model.Email) &&
return new(); (string.IsNullOrEmpty(model.Password) || x.Password == model.Password) &&
} (!model.Id.HasValue || x.Id == model.Id))
?.GetViewModel;
return temp;
}
public ClientViewModel? Insert(ClientBindingModel model) public ClientViewModel? Insert(ClientBindingModel model)
{ {
var newClient = Client.Create(model); var newClient = Client.Create(model);

4
PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/MessageInfoStorage.cs
View File

@ -10,8 +10,10 @@ namespace PlumbingRepairDatabaseImplement.Implements
{ {
public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
{ {
if (model.MessageId == null) if (string.IsNullOrEmpty(model.MessageId))
{
return null; return null;
}
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; return context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
} }

2
PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230429174158_WithMessage.Designer.cs → PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230430082314_WithMessage.Designer.cs generated
View File

@ -12,7 +12,7 @@ using PlumbingRepairDatabaseImplement;
namespace PlumbingRepairDatabaseImplement.Migrations namespace PlumbingRepairDatabaseImplement.Migrations
{ {
[DbContext(typeof(PlumbingRepairDataBase))] [DbContext(typeof(PlumbingRepairDataBase))]
[Migration("20230429174158_WithMessage")] [Migration("20230430082314_WithMessage")]
partial class WithMessage partial class WithMessage
{ {
/// <inheritdoc /> /// <inheritdoc />

0
PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230429174158_WithMessage.cs → PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230430082314_WithMessage.cs
View File

6
PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Message.cs
View File

@ -10,13 +10,9 @@ namespace PlumbingRepairDatabaseImplement.Models
[Key] [Key]
public string MessageId { get; private set; } = string.Empty; public string MessageId { get; private set; } = string.Empty;
public int? ClientId { get; private set; } public int? ClientId { get; private set; }
[Required]
public string SenderName { get; private set; } = string.Empty; public string SenderName { get; private set; } = string.Empty;
[Required] public DateTime DateDelivery { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
public DateTime DateDelivery { get; private set; }
[Required]
public string Subject { get; private set; } = string.Empty; public string Subject { get; private set; } = string.Empty;
[Required]
public string Body { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty;
public virtual Client? Client { get; set; } public virtual Client? Client { get; set; }