entities load relations improvements; fixes, etc..

FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs

@@ -1,11 +1,9 @@
-using AyCode.Core.Extensions;
+using AyCode.Core.Loggers;
-using AyCode.Core.Loggers;
 using AyCode.Models.Server.DynamicMethods;
 using AyCode.Services.SignalRs;
 using FruitBank.Common.Interfaces;
 using FruitBank.Common.Loggers;
 using FruitBank.Common.SignalRs;
-using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Configuration;
 
 namespace FruitBank.Common.Server.Services.SignalRs;

FruitBank.Common.Server/Services/SignalRs/LoggerSignalRHub.cs

@@ -1,7 +1,5 @@
-using AyCode.Core.Consts;
+using AyCode.Services.Server.SignalRs;
-using AyCode.Services.Server.SignalRs;
 using FruitBank.Common.Server.Services.Loggers;
-using Microsoft.AspNetCore.SignalR;
 
 namespace FruitBank.Common.Server.Services.SignalRs;
 

FruitBank.Common/Entities/Partner.cs

@@ -16,6 +16,11 @@ public class Partner : MgEntityBase, IPartner
     public string City { get; set; }
     public string Street { get; set; }
 
+    [Association(ThisKey = nameof(Id), OtherKey = nameof(ShippingDocument.ShippingId))]
+    public List<ShippingDocument>? ShippingDocuments { get; set; }
+
+
+
     [SkipValuesOnUpdate]
     public DateTime Created { get; set; }
     public DateTime Modified { get; set; }

FruitBank.Common/Entities/ShippingDocument.cs

@@ -12,6 +12,10 @@ public class ShippingDocument : MgEntityBase, IShippingDocument
     public int ShippingId { get; set; }
     public DateTime ShippingDate { get; set; }
     public string Country { get; set; }
+    public bool IsAllMeasured { get; set; }
+
+    [Association(ThisKey = nameof(ShippingId), OtherKey = nameof(Shipping.Id))]
+    public Shipping? Shipping{ get; set; }
 
     [Association(ThisKey = nameof(PartnerId), OtherKey = nameof(Partner.Id))]
     public Partner? Partner { get; set; }

FruitBank.Common/Entities/ShippingItem.cs

@@ -23,6 +23,10 @@ public class ShippingItem : MgEntityBase, IShippingItem
     public double? MeasuredGrossWeight { get; set; }
     public bool IsMeasured { get; set; }
 
+    [Association(ThisKey = nameof(ShippingDocumentId), OtherKey = nameof(ShippingDocument.Id))]
+    public ShippingDocument? ShippingDocument { get; set; }
+
+
     [SkipValuesOnUpdate]
     public DateTime Created { get; set; }
     public DateTime Modified { get; set; }

FruitBank.Common/FruitBankConstClient.cs

@@ -8,6 +8,7 @@ public static class FruitBankConstClient
     public static string DefaultLocale = "en-US";
 
     public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop
+    //public static string BaseUrl = "http://10.0.2.2:59579"; //FrutiBank (android) nop
     //public static string BaseUrl = "https://localhost:7144"; //HybridApp
     
 

FruitBank.Common/Interfaces/IShippingDocument.cs

@@ -10,6 +10,7 @@ public interface IShippingDocument: IEntityInt, ITimeStampInfo
     public int ShippingId { get; set; }
     public DateTime ShippingDate { get; set; }
     public string Country { get; set; }
+    public bool IsAllMeasured { get; set; }
 
     public Partner? Partner { get; set; }
     public List<ShippingItem>? ShippingItems { get; set; }

FruitBank.Common/Models/MeasuringModel.cs

@@ -1,9 +1,4 @@
-using System;
+using AyCode.Core.Interfaces;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AyCode.Core.Interfaces;
 using FruitBank.Common.Entities;
 
 namespace FruitBank.Common.Models

FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs

@@ -132,7 +132,7 @@ namespace FruitBankHybrid.Shared.Tests
             var shippingItems = await _signalRClient.GetShippingItems();
 
             Assert.IsNotNull(shippingItems);
-            Assert.IsTrue(shippingItems.Any());
+            Assert.IsTrue(shippingItems.Count != 0);
         }
 
         //[TestMethod]
@@ -216,7 +216,7 @@ namespace FruitBankHybrid.Shared.Tests
             var users = await _signalRClient.GetMeasuringUsers();
 
             Assert.IsNotNull(users);
-            Assert.IsTrue(users.Any());
+            Assert.IsTrue(users.Count != 0);
             Assert.IsTrue(users.All(x => !x.Email.IsNullOrEmpty() && !x.Deleted));
         }
 
@@ -230,7 +230,7 @@ namespace FruitBankHybrid.Shared.Tests
             var productDto = await _signalRClient.GetProductDtos();
 
             Assert.IsNotNull(productDto);
-            Assert.IsTrue(productDto.Any());
+            Assert.IsTrue(productDto.Count != 0);
             Assert.IsTrue(productDto.All(x => !x.Name.IsNullOrEmpty() && !x.Deleted));
         }
 

FruitBankHybrid.Web/Program.cs

@@ -1,9 +1,5 @@
-using DevExpress.Blazor;
 using AyCode.Core.Loggers;
-using AyCode.Services.Server.SignalRs;
 using FruitBank.Common;
-using FruitBank.Common.Interfaces;
-using FruitBank.Common.Loggers;
 using FruitBank.Common.Server.Services.Loggers;
 using FruitBank.Common.Server.Services.SignalRs;
 using FruitBankHybrid.Shared.Services;

FruitBankHybrid/FruitBankHybrid.csproj.user

@@ -4,7 +4,7 @@
     <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
     <ActiveDebugFramework>net9.0-windows10.0.19041.0</ActiveDebugFramework>
     <ActiveDebugProfile>Windows Machine</ActiveDebugProfile>
-    <SelectedPlatformGroup>PhysicalDevice</SelectedPlatformGroup>
+    <SelectedPlatformGroup>Emulator</SelectedPlatformGroup>
     <DefaultDevice>pixel_7_-_api_35</DefaultDevice>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-android|AnyCPU'">

FruitBankHybrid/MauiProgram.cs

@@ -22,7 +22,7 @@ public static class MauiProgram
 
         // Add device-specific services used by the FruitBankHybrid.Shared project
         builder.Services.AddSingleton<IFormFactor, FormFactor>();
-        builder.Services.AddScoped<ISignalRService, SignalRService>();
+        //builder.Services.AddScoped<ISignalRService, SignalRService>();
         builder.Services.AddScoped<FruitBankSignalRClient>();
 #if DEBUG
         builder.Services.AddSingleton<IAcLogWriterClientBase, BrowserConsoleLogWriter>();