Revert "готово"

This reverts commit 00eee48168.

FishFactory/FishFactory.csproj

@@ -9,12 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.17">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
   </ItemGroup>
@@ -22,7 +16,6 @@
   <ItemGroup>
     <ProjectReference Include="..\FishFactoryBusinessLogic\FishFactoryBusinessLogic.csproj" />
     <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
-    <ProjectReference Include="..\FishFactoryDatabaseImplement\FishFactoryDatabaseImplement.csproj" />
     <ProjectReference Include="..\FishFactoryFileImplement\FishFactoryFileImplement.csproj" />
     <ProjectReference Include="..\FishFactoryListImplement\FishFactoryListImplement.csproj" />
   </ItemGroup>

FishFactory/FishFactory.sln

@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryListImplement",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryFileImplement", "..\FishFactoryFileImplement\FishFactoryFileImplement.csproj", "{4EB943AB-67A8-4386-8874-FA0E3E98159C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryDatabaseImplement", "..\FishFactoryDatabaseImplement\FishFactoryDatabaseImplement.csproj", "{5744376D-B7D8-4FFD-B6D9-F53C169B056C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,14 +71,6 @@ Global
 		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|x86.ActiveCfg = Release|Any CPU
 		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|x86.Build.0 = Release|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Debug|x86.Build.0 = Debug|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Release|x86.ActiveCfg = Release|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

FishFactory/Program.cs

@@ -2,7 +2,7 @@ using FishFactory.Forms;
 using FishFactoryContracts.BusinessLogicsContracts;
 using FishFactoryBusinessLogic.BusinessLogic;
 using FishFactoryContracts.StoragesContracts;
-using FishFactoryDatabaseImplement.Implements;
+using FishFactoryFileImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;

FishFactoryContracts/StoragesContracts/IOrderStorage.cs

@@ -1,6 +1,11 @@
 using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace FishFactoryContracts.StoragesContracts
 {

FishFactoryDatabaseImplement/FishFactoryDatabase.cs

@@ -1,21 +0,0 @@
-using FishFactoryDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace FishFactoryDatabaseImplement
-{
-    public class FishFactoryDatabase : DbContext
-    {
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            if (optionsBuilder.IsConfigured == false)
-            {
-                optionsBuilder.UseSqlServer(@"Data Source=CHESHIR\SQLEXPRESS;Initial Catalog=FishFactoryDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
-            }
-            base.OnConfiguring(optionsBuilder);
-        }
-        public virtual DbSet<Component> Components { set; get; }
-        public virtual DbSet<Canned> Canneds { set; get; }
-        public virtual DbSet<CannedComponent> CannedComponents { set; get; }
-        public virtual DbSet<Order> Orders { set; get; }
-    }
-}

FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
-    <ProjectReference Include="..\FishFactoryDataModels\FishFactoryDataModel.csproj" />
-  </ItemGroup>
-
-</Project>

FishFactoryDatabaseImplement/Implements/CannedStorage.cs

@@ -1,101 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class CannedStorage : ICannedStorage
-    {
-        public List<CannedViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.Canneds
-                .Include(x => x.Components)
-                .ThenInclude(x => x.Component)
-                .ToList()
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public List<CannedViewModel> GetFilteredList(CannedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.CannedName))
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Canneds
-                .Include(x => x.Components)
-                .ThenInclude(x => x.Component)
-                .Where(x => x.CannedName.Contains(model.CannedName))
-                .ToList()
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public CannedViewModel? GetElement(CannedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.CannedName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Canneds
-                .Include(x => x.Components)
-                .ThenInclude(x => x.Component)
-                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.CannedName) && x.CannedName == model.CannedName) ||
-                (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-        public CannedViewModel? Insert(CannedBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var newCanned = Canned.Create(context, model);
-            if (newCanned == null)
-            {
-                return null;
-            }
-            context.Canneds.Add(newCanned);
-            context.SaveChanges();
-            return newCanned.GetViewModel;
-        }
-        public CannedViewModel? Update(CannedBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            using var transaction = context.Database.BeginTransaction();
-            try
-            {
-                var product = context.Canneds.FirstOrDefault(rec => rec.Id == model.Id);
-                if (product == null)
-                {
-                    return null;
-                }
-                product.Update(model);
-                context.SaveChanges();
-                product.UpdateComponents(context, model);
-                transaction.Commit();
-                return product.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-        public CannedViewModel? Delete(CannedBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var element = context.Canneds
-                .Include(x => x.Components)
-                .FirstOrDefault(rec => rec.Id == model.Id);
-            if (element != null)
-            {
-                context.Canneds.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactoryDatabaseImplement/Implements/ComponentStorage.cs

@@ -1,76 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement.Models;
-
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class ComponentStorage : IComponentStorage
-    {
-        public List<ComponentViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.Components
-                .Select(x => x.GetViewModel).ToList();
-        }
-        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName))
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Components
-                .Where(x => x.ComponentName.Contains(model.ComponentName))
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public ComponentViewModel? GetElement(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Components
-                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-        public ComponentViewModel? Insert(ComponentBindingModel model)
-        {
-            var newComponent = Component.Create(model);
-            if (newComponent == null)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            context.Components.Add(newComponent);
-            context.SaveChanges();
-            return newComponent.GetViewModel;
-        }
-        public ComponentViewModel? Update(ComponentBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var component = context.Components.FirstOrDefault(x => x.Id == model.Id);
-            if (component == null)
-            {
-                return null;
-            }
-            component.Update(model);
-            context.SaveChanges();
-            return component.GetViewModel;
-        }
-        public ComponentViewModel? Delete(ComponentBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id);
-            if (element != null)
-            {
-                context.Components.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactoryDatabaseImplement/Implements/OrderStorage.cs

@@ -1,84 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        public List<OrderViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.Orders
-                .Include(x => x.Canned)
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Orders
-                .Include(x => x.Canned)
-                .Where(x => x.Id == model.Id)
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Orders
-                .Include(x => x.Canned)
-                .FirstOrDefault(x => x.Id == model.Id)
-                ?.GetViewModel;
-        }
-        public OrderViewModel? Insert(OrderBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            if (model == null)
-                return null;
-            var newOrder = Order.Create(context, model);
-            if (newOrder == null)
-            {
-                return null;
-            }
-            context.Orders.Add(newOrder);
-            context.SaveChanges();
-            return newOrder.GetViewModel;
-        }
-        public OrderViewModel? Update(OrderBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            order.Update(model);
-            context.SaveChanges();
-            return order.GetViewModel;
-        }
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var order = context.Orders.FirstOrDefault(rec => rec.Id == model.Id);
-            if (order != null)
-            {
-                context.Orders.Remove(order);
-                context.SaveChanges();
-                return order.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactoryDatabaseImplement/Models/Canned.cs

@@ -1,88 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModel.Models;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class Canned
-    {
-        public int Id { get; set; }
-        [Required]
-        public string CannedName { get; set; } = string.Empty;
-        [Required]
-        public double Price { get; set; }
-        private Dictionary<int, (IComponentModel, int)>? _cannedComponents = null;
-        [NotMapped]
-        public Dictionary<int, (IComponentModel, int)> CannedComponents
-        {
-            get
-            {
-                if (_cannedComponents == null)
-                {
-                    _cannedComponents = Components.ToDictionary(recPC => recPC.ComponentId, recPC => (recPC.Component as IComponentModel, recPC.Count));
-                }
-                return _cannedComponents;
-            }
-        }
-        [ForeignKey("CannedId")]
-        public virtual List<CannedComponent> Components { get; set; } = new();
-        [ForeignKey("CannedId")]
-        public virtual List<Order> Orders { get; set; } = new();
-        public static Canned Create(FishFactoryDatabase context, CannedBindingModel model)
-        {
-            return new Canned()
-            {
-                Id = model.Id,
-                CannedName = model.CannedName,
-                Price = model.Price,
-                Components = model.CannedComponents.Select(x => new CannedComponent
-                {
-                    Component = context.Components.First(y => y.Id == x.Key),
-                    Count = x.Value.Item2
-                }).ToList()
-            };
-        }
-        public void Update(CannedBindingModel model)
-        {
-            CannedName = model.CannedName;
-            Price = model.Price;
-        }
-        public CannedViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CannedName = CannedName,
-            Price = Price,
-            CannedComponents = CannedComponents
-        };
-        public void UpdateComponents(FishFactoryDatabase context, CannedBindingModel model)
-        {
-            var cannedComponents = context.CannedComponents.Where(rec => rec.CannedId == model.Id).ToList();
-            if (cannedComponents != null && cannedComponents.Count > 0)
-            { // удалили те, которых нет в модели
-                context.CannedComponents.RemoveRange(cannedComponents.Where(rec => !model.CannedComponents.ContainsKey(rec.ComponentId)));
-                context.SaveChanges();
-                // обновили количество у существующих записей
-                foreach (var updateComponent in cannedComponents)
-                {
-                    updateComponent.Count = model.CannedComponents[updateComponent.ComponentId].Item2;
-                    model.CannedComponents.Remove(updateComponent.ComponentId);
-                }
-                context.SaveChanges();
-            }
-            var canned = context.Canneds.First(x => x.Id == Id);
-            foreach (var pc in model.CannedComponents)
-            {
-                context.CannedComponents.Add(new CannedComponent
-                {
-                    Canned = canned,
-                    Component = context.Components.First(x => x.Id == pc.Key),
-                    Count = pc.Value.Item2
-                });
-                context.SaveChanges();
-            }
-            _cannedComponents = null;
-        }
-    }
-}

FishFactoryDatabaseImplement/Models/CannedComponent.cs

@@ -1,17 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class CannedComponent
-    {
-        public int Id { get; set; }
-        [Required]
-        public int CannedId { get; set; }
-        [Required]
-        public int ComponentId { get; set; }
-        [Required]
-        public int Count { get; set; }
-        public virtual Component Component { get; set; } = new();
-        public virtual Canned Canned { get; set; } = new();
-    }
-}

FishFactoryDatabaseImplement/Models/Component.cs

@@ -1,56 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModel.Models;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class Component : IComponentModel
-    {
-        public int Id { get; private set; }
-        [Required]
-        public string ComponentName { get; private set; } = string.Empty;
-        [Required]
-        public double Cost { get; set; }
-        [ForeignKey("ComponentId")]
-        public virtual List<CannedComponent> CannedComponents { get; set; } = new();
-        public static Component? Create(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Component()
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-        public static Component Create(ComponentViewModel model)
-        {
-            return new Component
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-        public void Update(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ComponentName = model.ComponentName;
-            Cost = model.Cost;
-        }
-        public ComponentViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ComponentName = ComponentName,
-            Cost = Cost
-        };
-    }
-}

FishFactoryDatabaseImplement/Models/Order.cs

@@ -1,55 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using FishFactoryDataModel.Enums;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class Order
-    {
-        public int Id { get; set; }
-        [Required]
-        public int CannedId { get; set; }
-        public virtual Canned Canned { get; set; } = new();
-        [Required]
-        public int Count { get; set; }
-        [Required]
-        public double Sum { get; set; }
-        [Required]
-        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        [Required]
-        public DateTime DateCreate { get; set; } = DateTime.Now;
-        public DateTime? DateImplement { get; set; }
-        public static Order Create (FishFactoryDatabase context, OrderBindingModel model)
-        {
-            return new Order()
-            {
-                Id = model.Id,
-                CannedId = model.CannedId,
-                Canned = context.Canneds.First(x => x.Id == model.CannedId),
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
-            };
-        }
-        public void Update(OrderBindingModel model)
-        {
-            Status = model.Status;
-            DateImplement = model.DateImplement;
-        }
-        public OrderViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CannedId = CannedId,
-            CannedName = Canned.CannedName,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-        };
-    }
-}