malimova/ISEbd-22_Alimova_M.S._Confectionery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

сделала что смогла и к сожалению я вырубаюсь и иду спать

Browse Source
This commit is contained in:
malimova 2024-05-04 01:28:24 +04:00
parent b974a4b4b5
commit e1715dffb8
11 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj
View File

@ -18,6 +18,7 @@
<ItemGroup>
<ProjectReference Include="..\ConfectioneryContracts\ConfectioneryContracts.csproj" />
<ProjectReference Include="..\ConfectioneryDataModels\ConfectioneryDataModels.csproj" />
</ItemGroup>
</Project>

5
Confectionery/ConfectioneryBusinessLogic/ImplementerLogic.cs
View File

@ -1,4 +1,9 @@
using Microsoft.Extensions.Logging;
using ConfectioneryContracts.BindingModels;
using ConfectioneryContracts.BusinessLogicsContracts;
using ConfectioneryContracts.SearchModels;
using ConfectioneryContracts.StoragesContracts;
using ConfectioneryContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;

19
Confectionery/ConfectioneryBusinessLogic/OrderLogic.cs
View File

@ -22,7 +22,24 @@ namespace ConfectioneryBusinessLogic
_logger = logger;
_orderStorage = orderStorage;
}
public List<OrderViewModel>? ReadList(OrderSearchModel? model)
public OrderViewModel? ReadElement(OrderSearchModel model)
{
if (model == null)
{
throw new ArgumentNullException(nameof(model));
}
_logger.LogInformation("ReadElement. ClientId:{ClientId}.Status:{Status}.ImplementerId:{ImplementerId}.DateFrom:{DateFrom}.DateTo:{DateTo}OrderId:{Id}",
model.ClientId, model.Status, model.ImplementerId, model.DateFrom, model.DateTo, model.Id);
var element = _orderStorage.GetElement(model);
if (element == null)
{
_logger.LogWarning("ReadElement element not found");
return null;
}
_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
return element;
}
public List<OrderViewModel>? ReadList(OrderSearchModel? model)
{
_logger.LogInformation("ReadList. OrderId:{Id}", model?.Id);
var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);

2
Confectionery/ConfectioneryContracts/BindingModels/ImplementerBindingModel.cs
View File

@ -1,4 +1,4 @@
using ConfectioneryDataModels;
using ConfectioneryDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;

3
Confectionery/ConfectioneryContracts/BindingModels/OrderBindingModel.cs
View File

@ -13,7 +13,8 @@ namespace ConfectioneryContracts.BindingModels
public int Id { get; set; }
public int PastryId { get; set; }
public int ClientId { get; set; }
public int Count { get; set; }
public int? ImplementerId { get; set; }
public int Count { get; set; }
public double Sum { get; set; }
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
public DateTime DateCreate { get; set; } = DateTime.Now;

2
Confectionery/ConfectioneryContracts/ViewModels/ImplementerViewModel.cs
View File

@ -1,4 +1,4 @@
using ConfectioneryDataModels;
using ConfectioneryDataModels.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel;

2
Confectionery/ConfectioneryDatabaseImplement/Implementer.cs
View File

@ -9,7 +9,7 @@ using ConfectioneryDataModels.Models;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
namespace ConfectioneryDatabaseImplement
namespace ConfectioneryDatabaseImplement.Models
{
public class Implementer : IImplementerModel
{

2
Confectionery/ConfectioneryFileImplement/Implementer.cs
View File

@ -54,8 +54,6 @@ namespace ConfectioneryFileImplement.Models
};
}
public void Update(ImplementerBindingModel model)
{
if (model == null)

2
Confectionery/ConfectioneryFileImplement/ImplementerStorage.cs
View File

@ -2,7 +2,7 @@
using ConfectioneryContracts.SearchModels;
using ConfectioneryContracts.StoragesContracts;
using ConfectioneryContracts.ViewModels;
using ConfectioneryDatabaseImplement;
using ConfectioneryFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;

6
Confectionery/ConfectioneryListImplement/DataListSingleton.cs
View File

@ -14,13 +14,15 @@ namespace ConfectioneryListImplement
public List<Order> Orders { get; set; }
public List<Pastry> Pastrys { get; set; }
public List<Client> Clients { get; set; }
private DataListSingleton()
public List<Implementer> Implementers { get; set; }
private DataListSingleton()
{
Components = new List<Component>();
Orders = new List<Order>();
Pastrys = new List<Pastry>();
Clients = new List<Client>();
}
Implementers = new List<Implementer>();
}
public static DataListSingleton GetInstance()
{
if (_instance == null)

1
Confectionery/ConfectioneryListImplement/ImplementerStorage.cs
View File

@ -2,6 +2,7 @@
using ConfectioneryContracts.SearchModels;
using ConfectioneryContracts.StoragesContracts;
using ConfectioneryContracts.ViewModels;
using ConfectioneryListImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;