From de6698bab896c17c07fe8c87525d4a9cf4f1a006 Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 16 Sep 2025 09:12:36 +0200 Subject: [PATCH] entities load relations improvements; fixes, etc.. --- .../Services/SignalRs/DevAdminSignalRhub.cs | 4 +--- .../Services/SignalRs/LoggerSignalRHub.cs | 4 +--- FruitBank.Common/Entities/Partner.cs | 5 +++++ FruitBank.Common/Entities/ShippingDocument.cs | 4 ++++ FruitBank.Common/Entities/ShippingItem.cs | 4 ++++ FruitBank.Common/FruitBankConstClient.cs | 1 + FruitBank.Common/Interfaces/IShippingDocument.cs | 1 + FruitBank.Common/Models/MeasuringModel.cs | 7 +------ FruitBankHybrid/FruitBankHybrid.csproj.user | 2 +- FruitBankHybrid/MauiProgram.cs | 2 +- 10 files changed, 20 insertions(+), 14 deletions(-) diff --git a/FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs b/FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs index 23f4b57..c19a6af 100644 --- a/FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs +++ b/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; diff --git a/FruitBank.Common.Server/Services/SignalRs/LoggerSignalRHub.cs b/FruitBank.Common.Server/Services/SignalRs/LoggerSignalRHub.cs index 3e30d85..b0bfd2e 100644 --- a/FruitBank.Common.Server/Services/SignalRs/LoggerSignalRHub.cs +++ b/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; diff --git a/FruitBank.Common/Entities/Partner.cs b/FruitBank.Common/Entities/Partner.cs index 699f83b..ff91337 100644 --- a/FruitBank.Common/Entities/Partner.cs +++ b/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? ShippingDocuments { get; set; } + + + [SkipValuesOnUpdate] public DateTime Created { get; set; } public DateTime Modified { get; set; } diff --git a/FruitBank.Common/Entities/ShippingDocument.cs b/FruitBank.Common/Entities/ShippingDocument.cs index a0c02e4..35664de 100644 --- a/FruitBank.Common/Entities/ShippingDocument.cs +++ b/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; } diff --git a/FruitBank.Common/Entities/ShippingItem.cs b/FruitBank.Common/Entities/ShippingItem.cs index 5d48ae1..d409dcd 100644 --- a/FruitBank.Common/Entities/ShippingItem.cs +++ b/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; } diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs index 2d8fbd8..0fa419b 100644 --- a/FruitBank.Common/FruitBankConstClient.cs +++ b/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 diff --git a/FruitBank.Common/Interfaces/IShippingDocument.cs b/FruitBank.Common/Interfaces/IShippingDocument.cs index eb34695..8ac18ec 100644 --- a/FruitBank.Common/Interfaces/IShippingDocument.cs +++ b/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? ShippingItems { get; set; } diff --git a/FruitBank.Common/Models/MeasuringModel.cs b/FruitBank.Common/Models/MeasuringModel.cs index 483b4f2..56cfa1c 100644 --- a/FruitBank.Common/Models/MeasuringModel.cs +++ b/FruitBank.Common/Models/MeasuringModel.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using AyCode.Core.Interfaces; +using AyCode.Core.Interfaces; using FruitBank.Common.Entities; namespace FruitBank.Common.Models diff --git a/FruitBankHybrid/FruitBankHybrid.csproj.user b/FruitBankHybrid/FruitBankHybrid.csproj.user index 048cbfc..0419c5e 100644 --- a/FruitBankHybrid/FruitBankHybrid.csproj.user +++ b/FruitBankHybrid/FruitBankHybrid.csproj.user @@ -4,7 +4,7 @@ False net9.0-windows10.0.19041.0 Windows Machine - PhysicalDevice + Emulator pixel_7_-_api_35 diff --git a/FruitBankHybrid/MauiProgram.cs b/FruitBankHybrid/MauiProgram.cs index 73d29f5..94a9cf3 100644 --- a/FruitBankHybrid/MauiProgram.cs +++ b/FruitBankHybrid/MauiProgram.cs @@ -22,7 +22,7 @@ public static class MauiProgram // Add device-specific services used by the FruitBankHybrid.Shared project builder.Services.AddSingleton(); - builder.Services.AddScoped(); + //builder.Services.AddScoped(); builder.Services.AddScoped(); #if DEBUG builder.Services.AddSingleton();