Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SharedKernel/SharedKernel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Authors>Pandatech</Authors>
<Copyright>MIT</Copyright>
<Version>1.8.3</Version>
<Version>1.8.4</Version>
<PackageId>Pandatech.SharedKernel</PackageId>
<Title>Pandatech Shared Kernel Library</Title>
<PackageTags>Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using SharedKernel.ValidatorAndMediatR.Validators.Files;

namespace SharedKernel.ValidatorAndMediatR.Validators;

public sealed class CommissionRuleValidator<T> : PropertyValidator<T, CommissionRule?>
{
public override string Name => "CommissionRuleValidator";
Expand All @@ -16,8 +17,8 @@ public override bool IsValid(ValidationContext<T> 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.");
Expand All @@ -32,21 +33,19 @@ public override bool IsValid(ValidationContext<T> 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<T>();
var rangeValidatorResult = rangeValidator.IsValid(context, rule);

return true && rangeValidatorResult;
}
var rangeValidator = new CommissionRangeValidator<T>();
var rangeValidatorResult = rangeValidator.IsValid(context, rule);

return rangeValidatorResult;
}
}
}