Serxionaft/Coursach
Serxionaft/Coursach
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Фальшивого дрессировщика в цирке быстро раскусили.

Browse Source
This commit is contained in:
Дмитрий Блохин 2024-04-30 23:42:05 +04:00
parent 5e273fd259
commit 14a26c2765
10 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Course/Contracts/SearchModels/MachineSearchModel.cs
View File

@ -5,5 +5,8 @@
public int? Id { get; set; }
public string? Title { get; set; }
public int? UserId { get; set; }
}
public int? WorkerId { get; set; }
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
}
}

2
Course/Contracts/SearchModels/ProductSearchModel.cs
View File

@ -12,6 +12,6 @@ namespace Contracts.SearchModels
public string? Name { get; set; }
public int? UserId { get; set; }
public int? MachineId { get; set; }
public int? DetailId { get; set; }
public int? WorkerId { get; set; }
}
}

2
Course/Contracts/SearchModels/WorkerSearchModel.cs
View File

@ -5,5 +5,5 @@
public int? Id { get; set; }
public string? Name { get; set; }
public int? UserId { get; set; }
}
}
}

2
Course/Contracts/SearchModels/WorkshopSearchModel.cs
View File

@ -6,5 +6,7 @@
public string? Title { get; set; }
public int? UserId { get; set; }
public int? DetailId { get; set; }
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
}
}

15
Course/DatabaseImplement/Implements/MachineStorage.cs
View File

@ -29,12 +29,15 @@ namespace DatabaseImplement.Implements
public List<MachineViewModel> GetFilteredList(MachineSearchModel model)
{
if (!model.UserId.HasValue)
{
return new();
}
using var context = new FactoryGoWorkDatabase();
return context.Machines.Include(p => p.Workers).ThenInclude(p => p.Worker).Where(x => x.UserId == model.Id).Select(x => x.GetViewModel).ToList();
if (!model.UserId.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
{
return new();
}
using var context = new FactoryGoWorkDatabase();
if (model.DateFrom.HasValue)
return context.Machines.Where(x => x.UserId == model.Id).Where(x => x.DateCreate < model.DateTo && x.DateCreate > model.DateFrom).Select(x => x.GetViewModel).ToList();
else
return context.Machines.Where(x => x.UserId == model.Id).Select(x => x.GetViewModel).ToList();
}
public List<MachineViewModel> GetFullList()

6
Course/DatabaseImplement/Implements/ProductStorage.cs
View File

@ -29,13 +29,13 @@ namespace DatabaseImplement.Implements
public List<ProductViewModel> GetFilteredList(ProductSearchModel model)
{
if (!model.UserId.HasValue && !model.DetailId.HasValue)
if (!model.UserId.HasValue && !model.WorkerId.HasValue)
{
return new();
}
using var context = new FactoryGoWorkDatabase();
if (model.DetailId.HasValue)
return context.Products.Include(p => p.Details).ThenInclude(p => p.Detail).Where(x => x.UserId == model.Id).Where(x => x.Details.FirstOrDefault(y => y.DetailId == model.DetailId) != null).Select(x => x.GetViewModel).ToList();
if (model.WorkerId.HasValue)
return context.Products.Include(p => p.Details).ThenInclude(p => p.Detail).Where(x => x.UserId == model.Id).Where(x => x.Details.FirstOrDefault(y => y.DetailId == model.WorkerId) != null).Select(x => x.GetViewModel).ToList();
else
return context.Products.Include(p => p.Details).ThenInclude(p => p.Detail).Where(x => x.UserId == model.Id).Select(x => x.GetViewModel).ToList();
}

18
Course/DatabaseImplement/Implements/WorkshopStorage.cs
View File

@ -30,15 +30,15 @@ namespace DatabaseImplement.Implements
public List<WorkshopViewModel> GetFilteredList(WorkshopSearchModel model)
{
if (!model.UserId.HasValue && !model.DetailId.HasValue)
{
return new();
}
using var context = new FactoryGoWorkDatabase();
if (model.DetailId.HasValue)
return context.Workshops.Where(x => x.ProductionId != null).Include(x => x.Production).Where(x => x.Production!.Details.FirstOrDefault(y => y.DetailId == model.DetailId) != null).Where(x => x.UserId == model.UserId).Select(x => x.GetViewModel).ToList();
else
return context.Workshops.Include(x => x.Workers).ThenInclude(x => x.Worker).Where(x => x.UserId == model.UserId).Select(x => x.GetViewModel).ToList();
if (!model.UserId.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
{
return new();
}
using var context = new FactoryGoWorkDatabase();
if (model.DateFrom.HasValue)
return context.Workshops.Where(x => x.UserId == model.Id).Where(x => x.DateCreate < model.DateTo && x.DateCreate > model.DateFrom).Select(x => x.GetViewModel).ToList();
else
return context.Workshops.Where(x => x.UserId == model.Id).Select(x => x.GetViewModel).ToList();
}
public List<WorkshopViewModel> GetFullList()

4
Course/DatabaseImplement/Models/Machine.cs
View File

@ -19,7 +19,9 @@ namespace DatabaseImplement.Models
public string Title { get; private set; } = string.Empty;
[Required]
public string Country { get; private set; } = string.Empty;
[Required]
[Required]
public DateTime DateCreate { get; set; } = DateTime.Now;
[Required]
public int UserId { get; private set; }
private Dictionary<int, IWorkerModel>? _workerMachines = null;
[NotMapped]

4
Course/DatabaseImplement/Models/Workshop.cs
View File

@ -15,7 +15,9 @@ namespace DatabaseImplement.Models
public string Address { get; set; } = string.Empty;
[Required]
public string Director { get; set; } = string.Empty;
[Required]
[Required]
public DateTime DateCreate { get; set; } = DateTime.Now;
[Required]
public int UserId { get; set; }
public int? ProductionId { get; set; }
public virtual Production? Production { get; set; }

5
Course/TestingDatabase/Program.cs
View File

@ -14,3 +14,8 @@ ProductionStorage productionionStorage = new ProductionStorage();
ProductStorage productStorage = new ProductStorage();
MachineStorage machineStorage = new MachineStorage();
GuarantorStorage guarantorStorage = new GuarantorStorage();
WorkerStorage workerStorage = new WorkerStorage();
WorkshopStorage workshopStorage = new WorkshopStorage();