From 06f22951c93fc1b241fc4a4dfd0ea5872ce2a393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= <kamryz@st.amu.edu.pl>
Date: Thu, 13 Jun 2024 15:25:07 +0200
Subject: [PATCH] =?UTF-8?q?korekta=20dost=C4=99pno=C5=9Bci=20produkt=C3=B3?=
 =?UTF-8?q?w=20i=20totalprice=20przy=20updacie=20transakcji?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controllers/TransactionController.cs       |  2 +-
 nHibernate/Transactions/TransactionCRUD.cs | 31 +++++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Controllers/TransactionController.cs b/Controllers/TransactionController.cs
index 8f26387..8e546c7 100644
--- a/Controllers/TransactionController.cs
+++ b/Controllers/TransactionController.cs
@@ -134,7 +134,7 @@ namespace FirmTracker_Server.Controllers
                 {
                     product.TransactionId = transaction.Id; 
                     decimal price = _productCRUD.GetProductPrice(product.ProductID);
-                    transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100))));
+                    //transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100))));
                 }
 
                 transaction.TotalPrice = Math.Round(transaction.TotalPrice, 2, MidpointRounding.AwayFromZero);
diff --git a/nHibernate/Transactions/TransactionCRUD.cs b/nHibernate/Transactions/TransactionCRUD.cs
index fda048e..284cfd9 100644
--- a/nHibernate/Transactions/TransactionCRUD.cs
+++ b/nHibernate/Transactions/TransactionCRUD.cs
@@ -86,9 +86,30 @@ namespace FirmTracker_Server.nHibernate.Transactions
             {
                 try
                 {
+
+                    var oldTransaction = session.Load<Transaction>(transaction.Id);
+                    foreach (var tp in oldTransaction.TransactionProducts)
+                    {
+                        var product = session.Get<Product>(tp.ProductID);
+                        Console.WriteLine($"Product {product.Name} before quantity: {tp.Quantity}");
+                        
+                        if (product.Type != 0)
+                        {
+                            product.Availability += tp.Quantity;
+                            transaction.TotalPrice -= ((tp.Quantity * product.Price) * ((1 - (transaction.Discount / 100))));
+                        }
+                        else
+                        {
+                            transaction.TotalPrice -= (product.Price) * ((1 - (transaction.Discount / 100)));
+                        }
+                        session.Update(product);
+                    }
+                    session.Flush();
+                    session.Clear();
+
                     foreach (var transactionProduct in transaction.TransactionProducts)
                     {
-                        /*var product = session.Get<Product>(transactionProduct.ProductID);
+                        var product = session.Get<Product>(transactionProduct.ProductID);
                         if (product.Type != 0)
                         {
                             transaction.TotalPrice += ((transactionProduct.Quantity * product.Price) * ((1 - (transaction.Discount / 100))));
@@ -96,10 +117,13 @@ namespace FirmTracker_Server.nHibernate.Transactions
                         else
                         {
                             transaction.TotalPrice += (product.Price) * ((1 - (transaction.Discount / 100)));
-                        }*/
+                        }
+
+                        //var product = session.Load<Product>(transactionProduct.ProductID);
+                        Console.WriteLine($"Product {product.Name} after quantity: {transactionProduct.Quantity}");
 
                         transactionProduct.TransactionId = transaction.Id;
-                        session.Update(transactionProduct);
+                        session.SaveOrUpdate(transactionProduct);
                     }
                     session.Update(transaction);
 
@@ -114,7 +138,6 @@ namespace FirmTracker_Server.nHibernate.Transactions
                             session.Update(product);
                         }
                     }
-
                     sessionTransaction.Commit();
                 }
                 catch