Skip to content

Commit

Permalink
Removed the hard-coded validation message id
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuck committed Jan 11, 2022
1 parent b3d36aa commit dd5790d
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ private static String GetErrorMessage(Result result)

#endregion
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ namespace YuckQi.Domain.Validation.Extensions
{
public static class AbstractValidatorExtensions
{
private const String AbstractValidatorFailedMessageId = "YQDV.01";

public static Result<T> GetResult<T>(this AbstractValidator<T> validator, T item)
public static Result<T> GetResult<T>(this AbstractValidator<T> validator, T item, String failedValidationMessageId)
{
var result = validator.Validate(item);
if (result == null)
Expand All @@ -19,14 +17,12 @@ public static Result<T> GetResult<T>(this AbstractValidator<T> validator, T item
if (result.IsValid)
return new Result<T>(item);

return new Result<T>(default, GetResultDetail(result));
return new Result<T>(default, GetResultDetail(result, failedValidationMessageId));
}

private static IReadOnlyCollection<ResultDetail> GetResultDetail(ValidationResult result)
private static IReadOnlyCollection<ResultDetail> GetResultDetail(ValidationResult result, String failedValidationMessageId)
{
return result?.Errors
.Select(t => new ResultDetail(ResultCode.InvalidRequestDetail, new ResultMessage(AbstractValidatorFailedMessageId, t.ErrorMessage), t.PropertyName))
.ToList();
return result?.Errors.Select(t => new ResultDetail(ResultCode.InvalidRequestDetail, new ResultMessage(failedValidationMessageId, t.ErrorMessage), t.PropertyName)).ToList();
}
}
}
}
2 changes: 1 addition & 1 deletion src/YuckQi.Domain.Validation/Result.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ public Result(T payload, IReadOnlyCollection<ResultDetail> detail = null) : base

#endregion
}
}
}
2 changes: 1 addition & 1 deletion src/YuckQi.Domain.Validation/ResultCode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ public ResultCode(String code)

#endregion
}
}
}
2 changes: 1 addition & 1 deletion src/YuckQi.Domain.Validation/ResultDetail.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ public ResultDetail(ResultCode code, ResultMessage message, String property = nu

#endregion
}
}
}
2 changes: 1 addition & 1 deletion src/YuckQi.Domain.Validation/ResultMessage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ public ResultMessage(String id, String text = null)

#endregion
}
}
}
2 changes: 1 addition & 1 deletion src/YuckQi.Domain.Validation/ResultType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ public enum ResultType
Warning = 1,
Error = 2
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Kevin J Lambert</Authors>
<Version>0.5.0</Version>
<Version>1.0.0</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Description>A .NET library providing domain validation fundamentals.</Description>
</PropertyGroup>
Expand Down

0 comments on commit dd5790d

Please sign in to comment.