From 4f96a2e097bf3b83933c8a1d69a7d1213313a128 Mon Sep 17 00:00:00 2001
From: strwbrry1 <matvienkosemyon@gmail.com>
Date: Mon, 23 Dec 2024 03:20:56 +0400
Subject: [PATCH] lab2 done

---
 ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs       | 2 +-
 .../Repositories/Implementations/OrderRepository.cs          | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs b/ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs
index 67a9473..0e8962d 100644
--- a/ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs
+++ b/ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs
@@ -73,7 +73,7 @@ namespace ProjectPublishing.Forms
                 {
                     continue;
                 }
-                list.Add(OrderMaterials.Create(0, Convert.ToInt32(row.Cells["columnMaterial"].Value), Convert.ToInt32(row.Cells["columnMaterialType"].Value)));
+                list.Add(OrderMaterials.Create(0, Convert.ToInt32(row.Cells["columnMaterialType"].Value), Convert.ToInt32(row.Cells["columnMaterial"].Value)));
             }
             return list;
         }
diff --git a/ProjectPublishing/ProjectPublishing/Repositories/Implementations/OrderRepository.cs b/ProjectPublishing/ProjectPublishing/Repositories/Implementations/OrderRepository.cs
index 42b673a..8738990 100644
--- a/ProjectPublishing/ProjectPublishing/Repositories/Implementations/OrderRepository.cs
+++ b/ProjectPublishing/ProjectPublishing/Repositories/Implementations/OrderRepository.cs
@@ -43,7 +43,8 @@ INSERT INTO OrderMaterials (MaterialId, OrderId, Amount)
 VALUES (@MaterialsId, @OrderId, @Amount)";
                 foreach (var elem in order.Materials)
                 {
-                    connection.Execute(querySubInsert, new { elem.MaterialsId, PrintingOrderId, elem.Amount }, transaction);
+                    _logger.LogDebug("Проверка MaterialId: {MaterialId}", elem.MaterialsId);
+                    connection.Execute(querySubInsert, new { elem.MaterialsId, OrderId = PrintingOrderId, elem.Amount }, transaction);
                 }
                 transaction.Commit();
                 connection.Close();
@@ -64,6 +65,8 @@ VALUES (@MaterialsId, @OrderId, @Amount)";
                 using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
                 connection.Open();
                 var queryDelete = @"
+DELETE FROM OrderMaterials
+WHERE OrderId=@id;
 DELETE FROM PrintingOrder
 WHERE Id=@id";
                 connection.Execute(queryDelete, new { id });