improvements, fixes, etc....

FruitBank.Common/Entities/Partner.cs

@@ -1,4 +1,4 @@
-using FruitBank.Common.Entities;
+using FruitBank.Common.Interfaces;
 using LinqToDB.Mapping;
 using Mango.Nop.Core.Entities;
 

FruitBank.Common/Entities/Shipping.cs

@@ -1,4 +1,5 @@
-using LinqToDB.Mapping;
+using FruitBank.Common.Interfaces;
+using LinqToDB.Mapping;
 using Mango.Nop.Core.Entities;
 
 namespace FruitBank.Common.Entities;

FruitBank.Common/Entities/ShippingDocument.cs

@@ -1,4 +1,5 @@
-using LinqToDB.Mapping;
+using FruitBank.Common.Interfaces;
+using LinqToDB.Mapping;
 using Mango.Nop.Core.Entities;
 
 namespace FruitBank.Common.Entities;

FruitBank.Common/Entities/ShippingItem.cs

@@ -1,4 +1,5 @@
 using AyCode.Core.Interfaces;
+using FruitBank.Common.Interfaces;
 using LinqToDB.Mapping;
 using Mango.Nop.Core.Entities;
 

FruitBank.Common/Interfaces/IPartner.cs

@@ -1,7 +1,7 @@
 using AyCode.Interfaces.Entities;
 using AyCode.Interfaces.TimeStampInfo;
 
-namespace FruitBank.Common.Entities;
+namespace FruitBank.Common.Interfaces;
 
 public interface IPartner : IEntityInt, ITimeStampInfo
 {

FruitBank.Common/Interfaces/IShipping.cs

@@ -1,7 +1,7 @@
 using AyCode.Interfaces.Entities;
 using AyCode.Interfaces.TimeStampInfo;
 
-namespace FruitBank.Common.Entities;
+namespace FruitBank.Common.Interfaces;
 
 public interface IShipping : IEntityInt, ITimeStampInfo
 {

FruitBank.Common/Interfaces/IShippingDocument.cs

@@ -1,7 +1,7 @@
 using AyCode.Interfaces.Entities;
 using AyCode.Interfaces.TimeStampInfo;
 
-namespace FruitBank.Common.Entities;
+namespace FruitBank.Common.Interfaces;
 
 public interface IShippingDocument: IEntityInt, ITimeStampInfo
 {

FruitBank.Common/Interfaces/IShippingItem.cs

@@ -1,7 +1,7 @@
 using AyCode.Interfaces.Entities;
 using AyCode.Interfaces.TimeStampInfo;
 
-namespace FruitBank.Common.Entities;
+namespace FruitBank.Common.Interfaces;
 
 public interface IShippingItem : IEntityInt, ITimeStampInfo
 {

FruitBank.Common/Models/MeasuringModel.cs

@@ -4,18 +4,35 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using AyCode.Core.Interfaces;
+using FruitBank.Common.Entities;
 
 namespace FruitBank.Common.Models
 {
     public class MeasuringModel : IAcSerializableToJson
     {
-        public MeasuringModel() { }
+        public string Name { get; set; }
+
+        public Shipping Shipping { get; set; }
+        public List<Partner> Partners { get; set; }
+        public List<ShippingItem> ShippingItems { get; set; }
+        public List<ShippingDocument> ShippingDocuments { get; set; }
+
+
+        public MeasuringModel()
+        {
+        }
 
         public MeasuringModel(string name) : this()
         {
             Name = name;
         }
 
-        public string Name { get; set; }
+        public MeasuringModel(Shipping shipping, List<Partner> partners, List<ShippingItem> shippingItems, List<ShippingDocument> shippingDocuments) : this()
+        {
+            Shipping = shipping;
+            Partners = partners ?? [];
+            ShippingItems = shippingItems ?? [];
+            ShippingDocuments = shippingDocuments ?? [];
+        }
     }
 }

FruitBankHybrid.Shared/Pages/Chat.razor

@@ -6,7 +6,7 @@
 
 <input @bind="_userName" placeholder="Your name" />
 <input @bind="_message" placeholder="Partner ID..." />
-<button @onclick="Send">Send</button>
+<button @onclick="GetPartner">Send</button>
 
 <ul>
     @foreach (var m in _messages)

FruitBankHybrid.Shared/Pages/Chat.razor.cs

@@ -37,7 +37,7 @@ namespace FruitBankHybrid.Shared.Pages
             _logger.Info("OnInitializedAsync");
         }
 
-        private async Task Send()
+        private async Task GetPartner()
         {
             var measuringModel = new MeasuringModel();
 
@@ -46,6 +46,7 @@ namespace FruitBankHybrid.Shared.Pages
                 _message = string.Empty;
 
                 measuringModel.Name = (await FruitBankSignalRClient.GetPartnerById(partnerId))?.Name!;
+                //measuringModel.Name = (await FruitBankSignalRClient.GetMeasuringModelByShippingId(partnerId))?.Name!;
             }
 
             _messages.Add((_userName, measuringModel?.Name ?? "ERROR"));

FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs

@@ -19,7 +19,7 @@ namespace FruitBankHybrid.Shared.Services.SignalRs
         }
 
         public Task<MeasuringModel?> GetMeasuringModelByShippingId(int shippingId)
-            => GetAllAsync<MeasuringModel>(SignalRTags.GetMeasuringModelByShippingId);
+            => GetByIdAsync<MeasuringModel>(SignalRTags.GetMeasuringModelByShippingId, shippingId);
 
         //public Task GetWelcomeMessageAsync(string message, Action? callback = null)
         //{