From 8cae7bbd769d075746d5449cebe01e51d09278dd Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Tue, 23 Sep 2025 12:16:55 +0200
Subject: [PATCH] fixes...

---
 .../FruitBankClientTests.cs                   | 39 +++++++++++++++----
 .../Pages/MeasuringIn.razor.cs                | 19 +--------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs b/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs
index c6ec44f..834572a 100644
--- a/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs
+++ b/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs
@@ -2,8 +2,10 @@
 using AyCode.Core.Loggers;
 using AyCode.Utils.Extensions;
 using FruitBank.Common.Entities;
+using FruitBank.Common.Interfaces;
 using FruitBank.Common.Loggers;
 using FruitBankHybrid.Shared.Services.SignalRs;
+using System.Diagnostics.CodeAnalysis;
 
 namespace FruitBankHybrid.Shared.Tests
 {
@@ -133,16 +135,22 @@ namespace FruitBankHybrid.Shared.Tests
 
             Assert.IsNotNull(shippingItems);
             Assert.IsTrue(shippingItems.Count != 0);
+
+            Assert.IsTrue(shippingItems.All(si=>si.Product?.Id == si.ProductId), "shippingItem.Product == null");
         }
 
         //[TestMethod]
         //[DataRow(1)]
-        public async Task<ShippingItem> GetShippingItemByIdTest(int shippingItemeId)
+        [return: NotNull]
+        public async Task<ShippingItem> GetShippingItemByIdTest(int shippingItemId)
         {
-            var shippingItem = await _signalRClient.GetShippingItemById(shippingItemeId);
+            var shippingItem = await _signalRClient.GetShippingItemById(shippingItemId);
 
             Assert.IsNotNull(shippingItem);
-            Assert.IsTrue(shippingItem.Id == shippingItemeId);
+            Assert.IsNotNull(shippingItem.Product, $"shippingItem.Product == null; shippingItem.Id: {shippingItem.ProductId}");
+            Assert.IsTrue(shippingItem.Id == shippingItemId);
+
+            Assert.IsTrue(shippingItem.Quantity > 0, "Quantity == 0");
             Assert.IsTrue(shippingItem.NetWeight > 0, "NetWeight == 0");
             Assert.IsTrue(shippingItem.GrossWeight > 0, "GrossWeight == 0");
 
@@ -151,21 +159,38 @@ namespace FruitBankHybrid.Shared.Tests
 
         [DataTestMethod]
         [DataRow(1)]
+        //[DataRow(2)]
         public async Task UpdateShippingItemTest(int shippingItemId)
         {
-            var shippingItem = await GetShippingItemByIdTest(shippingItemId);
-            var newName = GetFixtureName(shippingItem.Name);
+            var originalShippingItem = await GetShippingItemByIdTest(shippingItemId);
+            var newName = GetFixtureName(originalShippingItem.Name);
 
+            var shippingItem = await GetShippingItemByIdTest(shippingItemId);
             shippingItem.Name = newName;
             //shippingItem.MeasuredGrossWeight = 5;
-            await _signalRClient.UpdateShippingItem(shippingItem);
+            shippingItem = await _signalRClient.UpdateShippingItem(shippingItem);
+
+            Assert.IsNotNull(shippingItem);
+            Assert.IsNotNull(shippingItem.Product);
+            Assert.IsTrue(shippingItem.Name == newName);
+            Assert.IsTrue(shippingItem.Product.StockQuantity == originalShippingItem.Product!.StockQuantity);
 
             shippingItem = await GetShippingItemByIdTest(shippingItemId);
+
             Assert.IsTrue(shippingItem.Name == newName);
+            Assert.IsTrue(shippingItem.Product!.StockQuantity == originalShippingItem.Product.StockQuantity);
             //Assert.IsTrue(shippingItem.MeasuredGrossWeight is 5);
 
             shippingItem.Name = GetOriginalName(shippingItem.Name);
-            await _signalRClient.UpdateShippingItem(shippingItem);
+            shippingItem = await _signalRClient.UpdateShippingItem(shippingItem);
+
+            Assert.IsNotNull(shippingItem);
+            Assert.IsNotNull(shippingItem.Product);
+
+            shippingItem = await GetShippingItemByIdTest(shippingItemId);
+
+            Assert.IsTrue(shippingItem.Name == originalShippingItem.Name);
+            Assert.IsTrue(shippingItem.Product!.StockQuantity == originalShippingItem.Product.StockQuantity);
         }
 
         #endregion ShippingItem
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
index 5a6dd44..50814c0 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
+++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs
@@ -1,27 +1,10 @@
-using AyCode.Core.Helpers;
-using AyCode.Core.Loggers;
-using AyCode.Models.Users;
+using AyCode.Core.Loggers;
 using DevExpress.Blazor;
-using DevExpress.Data.Mask.Internal;
 using FruitBank.Common.Entities;
-using FruitBank.Common.Interfaces;
-using FruitBank.Common.Loggers;
 using FruitBank.Common.Models;
 using FruitBankHybrid.Shared.Services.Loggers;
 using FruitBankHybrid.Shared.Services.SignalRs;
-using Mango.Nop.Core.Dtos;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.Extensions.Logging;
-using Microsoft.JSInterop;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Net.Mime.MediaTypeNames;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 using ILogger = Mango.Nop.Core.Loggers.ILogger;
 
 namespace FruitBankHybrid.Shared.Pages