From 5d86807bab553438975fe2bd0bace07df398fc4e Mon Sep 17 00:00:00 2001 From: Loretta Date: Sat, 11 Oct 2025 12:52:50 +0200 Subject: [PATCH] improvements, etc --- .../ICustomOrderSignalREndpointServer.cs | 7 +++++++ .../Interfaces/IFruitBankDataControllerServer.cs | 9 +++++++++ .../Services/SignalRs/DevAdminSignalRhub.cs | 5 ++++- FruitBank.Common/Dtos/OrderDto.cs | 15 +++++++++++++++ FruitBank.Common/Dtos/ProductDto.cs | 15 +++++++++++++++ .../Entities/MeasuringItemPalletBase.cs | 2 ++ .../ICustomOrderSignalREndpointClient.cs | 5 +++++ .../ICustomOrderSignalREndpointCommon.cs | 8 ++++++++ .../Interfaces/IFruitBankDataControllerServer.cs | 7 ------- .../Interfaces/IMeasuringItemPalletBase.cs | 5 +++-- FruitBank.Common/Interfaces/IOrderDto.cs | 8 ++++++++ FruitBank.Common/Interfaces/IProductDto.cs | 8 ++++++++ FruitBank.Common/Models/OrderListModelExtended.cs | 11 +++++++++++ FruitBank.Common/SignalRs/SignalRTags.cs | 2 ++ 14 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 FruitBank.Common.Server/Interfaces/ICustomOrderSignalREndpointServer.cs create mode 100644 FruitBank.Common.Server/Interfaces/IFruitBankDataControllerServer.cs create mode 100644 FruitBank.Common/Dtos/OrderDto.cs create mode 100644 FruitBank.Common/Dtos/ProductDto.cs create mode 100644 FruitBank.Common/Interfaces/ICustomOrderSignalREndpointClient.cs create mode 100644 FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs delete mode 100644 FruitBank.Common/Interfaces/IFruitBankDataControllerServer.cs create mode 100644 FruitBank.Common/Interfaces/IOrderDto.cs create mode 100644 FruitBank.Common/Interfaces/IProductDto.cs create mode 100644 FruitBank.Common/Models/OrderListModelExtended.cs diff --git a/FruitBank.Common.Server/Interfaces/ICustomOrderSignalREndpointServer.cs b/FruitBank.Common.Server/Interfaces/ICustomOrderSignalREndpointServer.cs new file mode 100644 index 0000000..a4fab14 --- /dev/null +++ b/FruitBank.Common.Server/Interfaces/ICustomOrderSignalREndpointServer.cs @@ -0,0 +1,7 @@ +using FruitBank.Common.Interfaces; + +namespace FruitBank.Common.Server.Interfaces; + +public interface ICustomOrderSignalREndpointServer : ICustomOrderSignalREndpointCommon +{ +} \ No newline at end of file diff --git a/FruitBank.Common.Server/Interfaces/IFruitBankDataControllerServer.cs b/FruitBank.Common.Server/Interfaces/IFruitBankDataControllerServer.cs new file mode 100644 index 0000000..d5eb9ed --- /dev/null +++ b/FruitBank.Common.Server/Interfaces/IFruitBankDataControllerServer.cs @@ -0,0 +1,9 @@ +using FruitBank.Common.Interfaces; +using Mango.Nop.Core.Models; + +namespace FruitBank.Common.Server.Interfaces; + + +public interface IFruitBankDataControllerServer : IFruitBankDataControllerCommon +{ +} \ No newline at end of file diff --git a/FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs b/FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs index 9a4c278..271eefd 100644 --- a/FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs +++ b/FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs @@ -3,6 +3,7 @@ using AyCode.Models.Server.DynamicMethods; using AyCode.Services.SignalRs; using FruitBank.Common.Interfaces; using FruitBank.Common.Loggers; +using FruitBank.Common.Server.Interfaces; using FruitBank.Common.SignalRs; using Mango.Nop.Core.Loggers; using Microsoft.Extensions.Configuration; @@ -27,10 +28,12 @@ namespace FruitBank.Common.Server.Services.SignalRs; public class DevAdminSignalRHub : AcWebSignalRHubWithSessionBase> { - public DevAdminSignalRHub(IConfiguration configuration, IFruitBankDataControllerServer fruitBankDataController/*, SessionService sessionService*/, IEnumerable logWriters) + public DevAdminSignalRHub(IConfiguration configuration, IFruitBankDataControllerServer fruitBankDataController/*, SessionService sessionService*/, + ICustomOrderSignalREndpointServer customOrderSignalREndpoint, IEnumerable logWriters) : base(configuration, new Logger(logWriters.ToArray())) { DynamicMethodCallModels.Add(new AcDynamicMethodCallModel(fruitBankDataController)); + DynamicMethodCallModels.Add(new AcDynamicMethodCallModel(customOrderSignalREndpoint)); } //public override Task OnReceiveMessage(int messageTag, byte[]? message, int? requestId) diff --git a/FruitBank.Common/Dtos/OrderDto.cs b/FruitBank.Common/Dtos/OrderDto.cs new file mode 100644 index 0000000..c2e1f3e --- /dev/null +++ b/FruitBank.Common/Dtos/OrderDto.cs @@ -0,0 +1,15 @@ +using FruitBank.Common.Interfaces; +using Mango.Nop.Core.Dtos; +using Nop.Core.Domain.Orders; + +namespace FruitBank.Common.Dtos; + +public class OrderDto : MgOrderDto, IOrderDto +{ + public OrderDto() :base() + { } + public OrderDto(int orderId) : base(orderId) + { } + public OrderDto(Order order) : base(order) + { } +} \ No newline at end of file diff --git a/FruitBank.Common/Dtos/ProductDto.cs b/FruitBank.Common/Dtos/ProductDto.cs new file mode 100644 index 0000000..cecadd7 --- /dev/null +++ b/FruitBank.Common/Dtos/ProductDto.cs @@ -0,0 +1,15 @@ +using FruitBank.Common.Interfaces; +using Mango.Nop.Core.Dtos; +using Nop.Core.Domain.Catalog; + +namespace FruitBank.Common.Dtos; + +public class ProductDto : MgProductDto, IProductDto +{ + public ProductDto() :base() + { } + public ProductDto(int productId) : base(productId) + { } + public ProductDto(Product product) : base(product) + { } +} \ No newline at end of file diff --git a/FruitBank.Common/Entities/MeasuringItemPalletBase.cs b/FruitBank.Common/Entities/MeasuringItemPalletBase.cs index 354ed95..cb3e2f2 100644 --- a/FruitBank.Common/Entities/MeasuringItemPalletBase.cs +++ b/FruitBank.Common/Entities/MeasuringItemPalletBase.cs @@ -13,6 +13,8 @@ public abstract class MeasuringItemPalletBase : MgEntityBase, IMeasuringItemPall [NotColumn] protected int ForeignItemId; + [NotColumn] + public int ForeignKey => ForeignItemId; public int Quantity { get; set; } diff --git a/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointClient.cs b/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointClient.cs new file mode 100644 index 0000000..e83a7cd --- /dev/null +++ b/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointClient.cs @@ -0,0 +1,5 @@ +namespace FruitBank.Common.Interfaces; + +public interface ICustomOrderSignalREndpointClient : ICustomOrderSignalREndpointCommon +{ +} \ No newline at end of file diff --git a/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs b/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs new file mode 100644 index 0000000..e7518f0 --- /dev/null +++ b/FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs @@ -0,0 +1,8 @@ +using Mango.Nop.Core.Models; + +namespace FruitBank.Common.Interfaces; + +public interface ICustomOrderSignalREndpointCommon +{ + //Task GetPendingOrderModels(); +} \ No newline at end of file diff --git a/FruitBank.Common/Interfaces/IFruitBankDataControllerServer.cs b/FruitBank.Common/Interfaces/IFruitBankDataControllerServer.cs deleted file mode 100644 index 9514559..0000000 --- a/FruitBank.Common/Interfaces/IFruitBankDataControllerServer.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Mango.Nop.Core.Models; - -namespace FruitBank.Common.Interfaces; - -public interface IFruitBankDataControllerServer : IFruitBankDataControllerCommon -{ -} \ No newline at end of file diff --git a/FruitBank.Common/Interfaces/IMeasuringItemPalletBase.cs b/FruitBank.Common/Interfaces/IMeasuringItemPalletBase.cs index d52911e..ec2ed1e 100644 --- a/FruitBank.Common/Interfaces/IMeasuringItemPalletBase.cs +++ b/FruitBank.Common/Interfaces/IMeasuringItemPalletBase.cs @@ -1,10 +1,11 @@ -using AyCode.Interfaces.Entities; +using AyCode.Interfaces; +using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; using FruitBank.Common.Entities; namespace FruitBank.Common.Interfaces; -public interface IMeasuringItemPalletBase : IEntityInt, IMeasuringQuantity, IMeasuringGrossWeight, IMeasured, ITimeStampInfo +public interface IMeasuringItemPalletBase : IEntityInt, IMeasuringQuantity, IMeasuringGrossWeight, IMeasured, ITimeStampInfo, ICustomForeignKeyInt { public double TareWeight { get; set; } public double PalletWeight { get; set; } diff --git a/FruitBank.Common/Interfaces/IOrderDto.cs b/FruitBank.Common/Interfaces/IOrderDto.cs new file mode 100644 index 0000000..eb359b6 --- /dev/null +++ b/FruitBank.Common/Interfaces/IOrderDto.cs @@ -0,0 +1,8 @@ +using Mango.Nop.Core.Interfaces; + +namespace FruitBank.Common.Interfaces; + +public interface IOrderDto : IMgOrderDto +{ + +} \ No newline at end of file diff --git a/FruitBank.Common/Interfaces/IProductDto.cs b/FruitBank.Common/Interfaces/IProductDto.cs new file mode 100644 index 0000000..597b408 --- /dev/null +++ b/FruitBank.Common/Interfaces/IProductDto.cs @@ -0,0 +1,8 @@ +using Mango.Nop.Core.Interfaces; + +namespace FruitBank.Common.Interfaces; + +public interface IProductDto : IMgProductDto +{ + +} \ No newline at end of file diff --git a/FruitBank.Common/Models/OrderListModelExtended.cs b/FruitBank.Common/Models/OrderListModelExtended.cs new file mode 100644 index 0000000..0f59384 --- /dev/null +++ b/FruitBank.Common/Models/OrderListModelExtended.cs @@ -0,0 +1,11 @@ +//using Nop.Web.Areas.Admin.Models.Orders; +//using Nop.Web.Framework.Models; + +//namespace FruitBank.Common.Models +//{ +// public partial record OrderListModelExtended : BasePagedListModel, IOrderListModelExtended +// { +// public bool? NeedsMeasurement { get; set; } +// } +//} + diff --git a/FruitBank.Common/SignalRs/SignalRTags.cs b/FruitBank.Common/SignalRs/SignalRTags.cs index 45e63dc..3bd2360 100644 --- a/FruitBank.Common/SignalRs/SignalRTags.cs +++ b/FruitBank.Common/SignalRs/SignalRTags.cs @@ -45,6 +45,8 @@ public class SignalRTags : AcSignalRTags public const int AddOrUpdateMeasuredShippingItemPallet = 97; public const int AddOrUpdateMeasuredShippingItemPallets = 98; + public const int GetPendingOrderModels = 115; + public const int AuthenticateUser = 160; public const int RefreshToken = 200;