diff --git a/FishFactory/FishFactory/FormCreateOrder.cs b/FishFactory/FishFactory/FormCreateOrder.cs
index 263dcef..ae92afd 100644
--- a/FishFactory/FishFactory/FormCreateOrder.cs
+++ b/FishFactory/FishFactory/FormCreateOrder.cs
@@ -105,7 +105,7 @@ namespace FishFactoryView
MessageBox.Show("Выберите клиента", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
- _logger.LogInformation("Создание заказа");
+ _logger.LogInformation("Создание заказа");
try
{
var operationResult = _logicO.CreateOrder(new OrderBindingModel
@@ -126,8 +126,7 @@ namespace FishFactoryView
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка создания заказа");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void ButtonCancel_Click(object sender, EventArgs e)
diff --git a/FishFactory/FishFactoryBusinessLogic/BusinessLogic/WorkModeling.cs b/FishFactory/FishFactoryBusinessLogic/BusinessLogic/WorkModeling.cs
index c363bb6..8958ffd 100644
--- a/FishFactory/FishFactoryBusinessLogic/BusinessLogic/WorkModeling.cs
+++ b/FishFactory/FishFactoryBusinessLogic/BusinessLogic/WorkModeling.cs
@@ -88,6 +88,8 @@ namespace FishFactoryBusinessLogic.BusinessLogic
{
Id = order.Id,
});
+ // отдыхаем
+ Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
}
// кто-то мог уже перехватить заказ, игнорируем ошибку
catch (InvalidOperationException ex)
@@ -100,9 +102,6 @@ namespace FishFactoryBusinessLogic.BusinessLogic
_logger.LogError(ex, "Error while do work");
throw;
}
-
- // отдыхаем
- Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
}
});
}
@@ -139,7 +138,6 @@ namespace FishFactoryBusinessLogic.BusinessLogic
{
Id = runOrder.Id
});
-
// отдыхаем
Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
}
diff --git a/FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs b/FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs
index 6e2ffff..3b01bab 100644
--- a/FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs
+++ b/FishFactory/FishFactoryDatabaseImplement/Implements/OrderStorage.cs
@@ -128,7 +128,6 @@ namespace FishFactoryDatabaseImplement.Implements
return context.Orders
.Include(x => x.Canned)
.Include(x => x.Client)
- .Include(x => x.Implementer)
.FirstOrDefault(x => x.Id == newOrder.Id)
?.GetViewModel;
}
diff --git a/FishFactory/FishFactoryDatabaseImplement/Migrations/20230422093015_Init2.Designer.cs b/FishFactory/FishFactoryDatabaseImplement/Migrations/20230422093015_Init2.Designer.cs
new file mode 100644
index 0000000..97763ec
--- /dev/null
+++ b/FishFactory/FishFactoryDatabaseImplement/Migrations/20230422093015_Init2.Designer.cs
@@ -0,0 +1,257 @@
+//
+using System;
+using FishFactoryDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace FishFactoryDatabaseImplement.Migrations
+{
+ [DbContext(typeof(FishFactoryDatabase))]
+ [Migration("20230422093015_Init2")]
+ partial class Init2
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "7.0.4")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("CannedName")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Price")
+ .HasColumnType("double precision");
+
+ b.HasKey("Id");
+
+ b.ToTable("Canneds");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("CannedId")
+ .HasColumnType("integer");
+
+ b.Property("ComponentId")
+ .HasColumnType("integer");
+
+ b.Property("Count")
+ .HasColumnType("integer");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CannedId");
+
+ b.HasIndex("ComponentId");
+
+ b.ToTable("CannedComponents");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Client", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("ClientFIO")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Email")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Password")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.ToTable("Clients");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("ComponentName")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Cost")
+ .HasColumnType("double precision");
+
+ b.HasKey("Id");
+
+ b.ToTable("Components");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("ImplementerFIO")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Password")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Qualification")
+ .HasColumnType("integer");
+
+ b.Property("WorkExperience")
+ .HasColumnType("integer");
+
+ b.HasKey("Id");
+
+ b.ToTable("Implementers");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("CannedId")
+ .HasColumnType("integer");
+
+ b.Property("ClientId")
+ .HasColumnType("integer");
+
+ b.Property("Count")
+ .HasColumnType("integer");
+
+ b.Property("DateCreate")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("DateImplement")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("ImplementerId")
+ .HasColumnType("integer");
+
+ b.Property("Status")
+ .HasColumnType("integer");
+
+ b.Property("Sum")
+ .HasColumnType("double precision");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CannedId");
+
+ b.HasIndex("ClientId");
+
+ b.HasIndex("ImplementerId");
+
+ b.ToTable("Orders");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
+ {
+ b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
+ .WithMany("Components")
+ .HasForeignKey("CannedId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
+ .WithMany("CannedComponents")
+ .HasForeignKey("ComponentId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Canned");
+
+ b.Navigation("Component");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
+ {
+ b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
+ .WithMany("Orders")
+ .HasForeignKey("CannedId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("FishFactoryDatabaseImplement.Models.Client", "Client")
+ .WithMany("Orders")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("FishFactoryDatabaseImplement.Models.Implementer", "Implementer")
+ .WithMany("Orders")
+ .HasForeignKey("ImplementerId");
+
+ b.Navigation("Canned");
+
+ b.Navigation("Client");
+
+ b.Navigation("Implementer");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
+ {
+ b.Navigation("Components");
+
+ b.Navigation("Orders");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Client", b =>
+ {
+ b.Navigation("Orders");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
+ {
+ b.Navigation("CannedComponents");
+ });
+
+ modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
+ {
+ b.Navigation("Orders");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/FishFactory/FishFactoryDatabaseImplement/Migrations/20230422093015_Init2.cs b/FishFactory/FishFactoryDatabaseImplement/Migrations/20230422093015_Init2.cs
new file mode 100644
index 0000000..15632e6
--- /dev/null
+++ b/FishFactory/FishFactoryDatabaseImplement/Migrations/20230422093015_Init2.cs
@@ -0,0 +1,59 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace FishFactoryDatabaseImplement.Migrations
+{
+ ///
+ public partial class Init2 : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropForeignKey(
+ name: "FK_Orders_Implementers_ImplementerId",
+ table: "Orders");
+
+ migrationBuilder.AlterColumn(
+ name: "ImplementerId",
+ table: "Orders",
+ type: "integer",
+ nullable: true,
+ oldClrType: typeof(int),
+ oldType: "integer");
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_Orders_Implementers_ImplementerId",
+ table: "Orders",
+ column: "ImplementerId",
+ principalTable: "Implementers",
+ principalColumn: "Id");
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropForeignKey(
+ name: "FK_Orders_Implementers_ImplementerId",
+ table: "Orders");
+
+ migrationBuilder.AlterColumn(
+ name: "ImplementerId",
+ table: "Orders",
+ type: "integer",
+ nullable: false,
+ defaultValue: 0,
+ oldClrType: typeof(int),
+ oldType: "integer",
+ oldNullable: true);
+
+ migrationBuilder.AddForeignKey(
+ name: "FK_Orders_Implementers_ImplementerId",
+ table: "Orders",
+ column: "ImplementerId",
+ principalTable: "Implementers",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Cascade);
+ }
+ }
+}
diff --git a/FishFactory/FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs b/FishFactory/FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs
index d21a62f..1e95606 100644
--- a/FishFactory/FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs
+++ b/FishFactory/FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs
@@ -164,7 +164,6 @@ namespace FishFactoryDatabaseImplement.Migrations
.HasColumnType("timestamp with time zone");
b.Property("ImplementerId")
- .IsRequired()
.HasColumnType("integer");
b.Property("Status")
@@ -219,9 +218,7 @@ namespace FishFactoryDatabaseImplement.Migrations
b.HasOne("FishFactoryDatabaseImplement.Models.Implementer", "Implementer")
.WithMany("Orders")
- .HasForeignKey("ImplementerId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
+ .HasForeignKey("ImplementerId");
b.Navigation("Canned");
diff --git a/FishFactory/FishFactoryDatabaseImplement/Models/Order.cs b/FishFactory/FishFactoryDatabaseImplement/Models/Order.cs
index d8d0056..4c54eea 100644
--- a/FishFactory/FishFactoryDatabaseImplement/Models/Order.cs
+++ b/FishFactory/FishFactoryDatabaseImplement/Models/Order.cs
@@ -19,7 +19,6 @@ namespace FishFactoryDatabaseImplement.Models
public int CannedId { get; set; }
[Required]
public int ClientId { get; set; }
- [Required]
public int? ImplementerId { get; set; }
[Required]
public int Count { get; set; }
@@ -31,9 +30,9 @@ namespace FishFactoryDatabaseImplement.Models
public DateTime DateCreate { get; set; }
public DateTime? DateImplement { get; set; }
- public virtual Canned Canned { get; set; }
+ public virtual Canned? Canned { get; set; }
public virtual Implementer? Implementer { get; set; }
- public virtual Client Client { get; set; }
+ public virtual Client? Client { get; set; }
public int Id { get; set; }
public static Order? Create(OrderBindingModel model)
diff --git a/FishFactory/FishFactoryRestApi/Controllers/ImplementerController.cs b/FishFactory/FishFactoryRestApi/Controllers/ImplementerController.cs
new file mode 100644
index 0000000..409d3d5
--- /dev/null
+++ b/FishFactory/FishFactoryRestApi/Controllers/ImplementerController.cs
@@ -0,0 +1,102 @@
+using DocumentFormat.OpenXml.Office2010.Excel;
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Enums;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FishFactoryRestApi.Controllers
+{
+ [Route("api/[controller]/[action]")]
+ [ApiController]
+ public class ImplementerController : Controller
+ {
+ private readonly ILogger _logger;
+ private readonly IOrderLogic _order;
+ private readonly IImplementerLogic _logic;
+ public ImplementerController(IOrderLogic order, IImplementerLogic logic,
+ ILogger logger)
+ {
+ _logger = logger;
+ _order = order;
+ _logic = logic;
+ }
+ [HttpGet]
+ public ImplementerViewModel? Login(string login, string password)
+ {
+ try
+ {
+ return _logic.ReadElement(new ImplementerSearchModel
+ {
+ ImplementerFIO = login,
+ Password = password
+ });
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка авторизации сотрудника");
+ throw;
+ }
+ }
+ [HttpGet]
+ public List? GetNewOrders()
+ {
+ try
+ {
+ return _order.ReadList(new OrderSearchModel
+ {
+ Status = OrderStatus.Принят
+ });
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка получения новых заказов");
+ throw;
+ }
+ }
+ [HttpGet]
+ public OrderViewModel? GetImplementerOrder(int implementerId)
+ {
+ try
+ {
+ return _order.ReadElement(new OrderSearchModel
+ {
+ ImplementerId = implementerId
+ });
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка получения текущего заказа исполнителя");
+ throw;
+ }
+ }
+ [HttpPost]
+ public void TakeOrderInWork(OrderBindingModel model)
+ {
+ try
+ {
+ _order.TakeOrderInWork(model);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу", model.Id);
+ throw;
+ }
+ }
+ [HttpPost]
+ public void FinishOrder(OrderBindingModel model)
+ {
+ try
+ {
+ _order.FinishOrder(model);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка отметки о готовности заказа с №{ Id}", model.Id);
+ throw;
+ }
+ }
+ }
+
+}