From 44c69e544d8452a6c310d1fed93ffc36aaa8c26a Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Mon, 30 Jan 2023 23:16:34 +0800 Subject: [PATCH] Fix DTO validations --- common.props | 2 +- .../EasyAbp/EShop/Orders/Orders/Dtos/CreateOrderDto.cs | 5 ++++- .../EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentDto.cs | 5 ++++- .../EShop/Payments/Refunds/Dtos/CreateEShopRefundInput.cs | 5 ++++- .../EShop/Products/Products/Dtos/CreateUpdateProductDto.cs | 5 ++++- .../EShop/Products/Products/Dtos/UpdateProductSkuDto.cs | 5 ++++- .../Plugins/Baskets/BasketItems/Dtos/CreateBasketItemDto.cs | 5 ++++- .../BasketItems/Dtos/GenerateClientSideDataItemInput.cs | 5 ++++- .../Plugins/Baskets/BasketItems/Dtos/UpdateBasketItemDto.cs | 5 ++++- 9 files changed, 33 insertions(+), 9 deletions(-) diff --git a/common.props b/common.props index 139a52f0..68bee29c 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 3.3.0 + 3.3.1 $(NoWarn);CS1591 true EasyAbp Team diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/CreateOrderDto.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/CreateOrderDto.cs index 9b4789ed..7e51f46e 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/CreateOrderDto.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/CreateOrderDto.cs @@ -22,7 +22,10 @@ namespace EasyAbp.EShop.Orders.Orders.Dtos public override IEnumerable Validate(ValidationContext validationContext) { - base.Validate(validationContext); + foreach (var result in base.Validate(validationContext)) + { + yield return result; + } if (OrderLines.Count == 0) { diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentDto.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentDto.cs index edcaf086..516e4103 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentDto.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/CreatePaymentDto.cs @@ -15,7 +15,10 @@ namespace EasyAbp.EShop.Payments.Payments.Dtos public override IEnumerable Validate(ValidationContext validationContext) { - base.Validate(validationContext); + foreach (var result in base.Validate(validationContext)) + { + yield return result; + } if (OrderIds.Count == 0) { diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/CreateEShopRefundInput.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/CreateEShopRefundInput.cs index 8007ddb8..8dcfe122 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/CreateEShopRefundInput.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Refunds/Dtos/CreateEShopRefundInput.cs @@ -25,7 +25,10 @@ namespace EasyAbp.EShop.Payments.Refunds.Dtos public override IEnumerable Validate(ValidationContext validationContext) { - base.Validate(validationContext); + foreach (var result in base.Validate(validationContext)) + { + yield return result; + } if (RefundItems.IsNullOrEmpty()) { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/CreateUpdateProductDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/CreateUpdateProductDto.cs index 0f88780f..315f4998 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/CreateUpdateProductDto.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/CreateUpdateProductDto.cs @@ -55,7 +55,10 @@ namespace EasyAbp.EShop.Products.Products.Dtos public override IEnumerable Validate(ValidationContext validationContext) { - base.Validate(validationContext); + foreach (var result in base.Validate(validationContext)) + { + yield return result; + } if (PaymentExpireIn.HasValue && PaymentExpireIn.Value < TimeSpan.Zero) { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/UpdateProductSkuDto.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/UpdateProductSkuDto.cs index 2b4e7f8f..6b36179d 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/UpdateProductSkuDto.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/UpdateProductSkuDto.cs @@ -50,7 +50,10 @@ namespace EasyAbp.EShop.Products.Products.Dtos public override IEnumerable Validate(ValidationContext validationContext) { - base.Validate(validationContext); + foreach (var result in base.Validate(validationContext)) + { + yield return result; + } if (PaymentExpireIn.HasValue && PaymentExpireIn.Value < TimeSpan.Zero) { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/CreateBasketItemDto.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/CreateBasketItemDto.cs index e8b8a069..2f7fd925 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/CreateBasketItemDto.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/CreateBasketItemDto.cs @@ -23,7 +23,10 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems.Dtos public override IEnumerable Validate(ValidationContext validationContext) { - base.Validate(validationContext); + foreach (var result in base.Validate(validationContext)) + { + yield return result; + } if (Quantity <= 0) { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/GenerateClientSideDataItemInput.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/GenerateClientSideDataItemInput.cs index 98e335fc..7bded6ef 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/GenerateClientSideDataItemInput.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/GenerateClientSideDataItemInput.cs @@ -23,7 +23,10 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems.Dtos public override IEnumerable Validate(ValidationContext validationContext) { - base.Validate(validationContext); + foreach (var result in base.Validate(validationContext)) + { + yield return result; + } if (Quantity <= 0) { diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/UpdateBasketItemDto.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/UpdateBasketItemDto.cs index bc10628d..96c0f6dd 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/UpdateBasketItemDto.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application.Contracts/EasyAbp/EShop/Plugins/Baskets/BasketItems/Dtos/UpdateBasketItemDto.cs @@ -12,7 +12,10 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems.Dtos public override IEnumerable Validate(ValidationContext validationContext) { - base.Validate(validationContext); + foreach (var result in base.Validate(validationContext)) + { + yield return result; + } if (Quantity <= 0) {