From b4c12d6593bc554961d36364dce9cdb5bb250dd4 Mon Sep 17 00:00:00 2001 From: Haik Date: Sat, 18 Oct 2025 19:49:11 +0400 Subject: [PATCH 1/2] cleanup --- .../Validators/CommissionRuleValidator.cs | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/SharedKernel/ValidatorAndMediatR/Validators/CommissionRuleValidator.cs b/src/SharedKernel/ValidatorAndMediatR/Validators/CommissionRuleValidator.cs index 860a58a..4fbe16a 100644 --- a/src/SharedKernel/ValidatorAndMediatR/Validators/CommissionRuleValidator.cs +++ b/src/SharedKernel/ValidatorAndMediatR/Validators/CommissionRuleValidator.cs @@ -4,6 +4,7 @@ using SharedKernel.ValidatorAndMediatR.Validators.Files; namespace SharedKernel.ValidatorAndMediatR.Validators; + public sealed class CommissionRuleValidator : PropertyValidator { public override string Name => "CommissionRuleValidator"; @@ -16,8 +17,8 @@ public override bool IsValid(ValidationContext context, CommissionRule? rule) return false; } - if (rule.CommissionRangeConfigs.Any( - r => r is { Type: CommissionType.Percentage, CommissionAmount: < -10 or > 10 })) + if (rule.CommissionRangeConfigs.Any(r => + r is { Type: CommissionType.Percentage, CommissionAmount: < -10 or > 10 })) { context.AddFailure( "For 'Percentage' CommissionType, the CommissionAmount should be between -10 and 10. Commissions over 1000% are not allowed."); @@ -32,21 +33,19 @@ public override bool IsValid(ValidationContext context, CommissionRule? rule) return false; } - if (rule.CommissionRangeConfigs[0].MaxCommission != 0 && rule.CommissionRangeConfigs[0].MaxCommission < + if (rule.CommissionRangeConfigs[0].MaxCommission == 0 || rule.CommissionRangeConfigs[0].MaxCommission >= rule.CommissionRangeConfigs[0].MinCommission) { - context.AddFailure("MaxCommission should be greater than or equal to MinCommission."); - return false; + return true; //check } - return true; //check + context.AddFailure("MaxCommission should be greater than or equal to MinCommission."); + return false; } - else - { - var rangeValidator = new CommissionRangeValidator(); - var rangeValidatorResult = rangeValidator.IsValid(context, rule); - return true && rangeValidatorResult; - } + var rangeValidator = new CommissionRangeValidator(); + var rangeValidatorResult = rangeValidator.IsValid(context, rule); + + return rangeValidatorResult; } -} +} \ No newline at end of file From ce1e52775ec4021ecbaa279234dc7d5227ef5e96 Mon Sep 17 00:00:00 2001 From: Haik Date: Sat, 18 Oct 2025 21:20:27 +0400 Subject: [PATCH 2/2] version update --- src/SharedKernel/SharedKernel.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SharedKernel/SharedKernel.csproj b/src/SharedKernel/SharedKernel.csproj index b6bf9b2..c5db731 100644 --- a/src/SharedKernel/SharedKernel.csproj +++ b/src/SharedKernel/SharedKernel.csproj @@ -8,7 +8,7 @@ Readme.md Pandatech MIT - 1.8.3 + 1.8.4 Pandatech.SharedKernel Pandatech Shared Kernel Library Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar